if (fd == null) {\r
reservedTo.setValue(null);\r
reservedTo.setEnabled(false);\r
- refreshSelectedResources();\r
+ refreshSelectedResources(true);\r
return;\r
} else {\r
reservedTo.setEnabled(true);\r
to.setTime(fd);\r
to.add(Calendar.MILLISECOND, (int) currentGapMillis);\r
reservedTo.setValue(to.getTime());\r
- refreshSelectedResources();\r
+ refreshSelectedResources(true);\r
}\r
});\r
reservedTo.addListener(new ValueChangeListener() {\r
t.add(Calendar.MILLISECOND, (int) DEFAULT_GAP_MILLIS);\r
reservedTo.setValue(t.getTime());\r
}\r
- refreshSelectedResources();\r
+ refreshSelectedResources(true);\r
}\r
});\r
\r
mainTabs.addTab(allLayout, "All reservations", null);\r
mainTabs.addListener(new TabSheet.SelectedTabChangeListener() {\r
public void selectedTabChange(SelectedTabChangeEvent event) {\r
- refreshReservations(false);\r
+ refreshReservations();\r
}\r
});\r
\r
resourcePanel.selectFirstCategory();\r
- refreshReservations(true);\r
+ refreshReservations();\r
+ refreshSelectedResources(true);\r
}\r
\r
public void makeReservation() {\r
"Success!",\r
"You have reserved the resource for the selected period.",\r
Notification.TYPE_WARNING_MESSAGE);\r
- refreshReservations(false);\r
+ refreshReservations();\r
+ refreshSelectedResources(false);\r
} else {\r
getMainWindow().showNotification("Oops!",\r
"Please select a resource (or category) to reserve.",\r
"Not available!",\r
"The selected resource is already reserved for the selected period.",\r
Notification.TYPE_ERROR_MESSAGE);\r
- refreshReservations(false);\r
+ refreshReservations();\r
}\r
}\r
\r
}\r
}\r
\r
- private void refreshReservations(boolean alsoResources) {\r
+ private void refreshReservations() {\r
final Container reservations = db.getReservations(resourcePanel\r
.getSelectedResources());\r
reservedFrom.setContainerDataSource(reservations);\r
reservedTo.setContainerDataSource(reservations);\r
- if (alsoResources) {\r
- refreshSelectedResources();\r
- }\r
final Container allReservations = db.getReservations(null);\r
allTable.setContainerDataSource(allReservations);\r
if (allReservations != null && allReservations.size() > 0) {\r
}\r
}\r
\r
- private void refreshSelectedResources() {\r
+ private void refreshSelectedResources(boolean alertIfNotAvailable) {\r
Item resource = null;\r
try {\r
resource = getActiveResource();\r
} catch (final ResourceNotAvailableException e) {\r
- getMainWindow().showNotification("Not available",\r
- "Please choose another resource or time period.",\r
- Notification.TYPE_HUMANIZED_MESSAGE);\r
- refreshReservations(false);\r
+ if (alertIfNotAvailable) {\r
+ getMainWindow().showNotification("Not available",\r
+ "Please choose another resource or time period.",\r
+ Notification.TYPE_HUMANIZED_MESSAGE);\r
+ }\r
+ refreshReservations();\r
return;\r
}\r
map.clear();\r
\r
public void selectedResourcesChanged(\r
ResourceSelectorPanel.SelectedResourcesChangedEvent event) {\r
- refreshReservations(true);\r
+ refreshReservations();\r
+ refreshSelectedResources(true);\r
}\r
\r
}\r