Skip to content
Snippets Groups Projects
Commit ff4a0cb2 authored by srosse's avatar srosse
Browse files

FXOLAT-282: better error handling in the button "Team room utilisation"

parent abe3c565
No related branches found
No related tags found
No related merge requests found
......@@ -133,7 +133,8 @@ public class ViteroManager extends BasicManager implements UserDataDeletable {
this.viteroModule = module;
}
public List<ViteroBooking> getBookingByDate(Date start, Date end) {
public List<ViteroBooking> getBookingByDate(Date start, Date end)
throws VmsNotAvailableException {
try {
BookingServiceStub bookingWs = getBookingWebService();
BookingServiceStub.GetBookingListByDateRequest dateRequest = new BookingServiceStub.GetBookingListByDateRequest();
......@@ -146,8 +147,10 @@ public class ViteroManager extends BasicManager implements UserDataDeletable {
Booking[] bookings = bookingList.getBooking();
return convert(bookings);
} catch(AxisFault f) {
String msg = f.getFaultDetailElement().toString();
logError(msg, f);
int code = handleAxisFault(f);
switch(code) {
default: logAxisError("Cannot get the list of bookings by date.", f);
}
return Collections.emptyList();
} catch (RemoteException e) {
logError("Cannot get bookings by date", e);
......
......@@ -172,13 +172,17 @@ public class ViteroBookingsEditController extends FormBasicController {
protected void occupiedRooms(UserRequest ureq) {
removeAsListenerAndDispose(bookingController);
roomsOverviewController = new ViteroRoomsOverviewController(ureq, getWindowControl());
listenTo(roomsOverviewController);
removeAsListenerAndDispose(cmc);
cmc = new CloseableModalController(getWindowControl(), translate("close"), roomsOverviewController.getInitialComponent(), true, translate("roomsOverview"));
listenTo(cmc);
cmc.activate();
try {
roomsOverviewController = new ViteroRoomsOverviewController(ureq, getWindowControl());
listenTo(roomsOverviewController);
removeAsListenerAndDispose(cmc);
cmc = new CloseableModalController(getWindowControl(), translate("close"), roomsOverviewController.getInitialComponent(), true, translate("roomsOverview"));
listenTo(cmc);
cmc.activate();
} catch (VmsNotAvailableException e) {
showError(VmsNotAvailableException.I18N_KEY);
}
}
protected void deleteBooking(UserRequest ureq, ViteroBooking booking) {
......
......@@ -35,6 +35,7 @@ import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.controller.BasicController;
import com.frentix.olat.vitero.manager.ViteroManager;
import com.frentix.olat.vitero.manager.VmsNotAvailableException;
import com.frentix.olat.vitero.model.ViteroBooking;
/**
......@@ -51,7 +52,8 @@ public class ViteroRoomsOverviewController extends BasicController {
private final TableController tableCtr;
private final ViteroManager viteroManager;
public ViteroRoomsOverviewController(UserRequest ureq, WindowControl wControl) {
public ViteroRoomsOverviewController(UserRequest ureq, WindowControl wControl)
throws VmsNotAvailableException {
super(ureq, wControl);
viteroManager = (ViteroManager)CoreSpringFactory.getBean("viteroManager");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment