Add/Edit Room: Room Sharing

- added an ability to list all departments as available for room sharing (instead of those that are being used, i.e., departments that have a manager, a subject area, or another room)
- set unitime.roomDepts.usedDepartmentsOnly to false to enable (defaults to true, only show departments that are being used)

Author: tomas-muller

JavaSource/org/unitime/timetable/defaults/ApplicationProperty.java

@@ -3805,6 +3805,12 @@ public enum ApplicationProperty {
 	@Description("Instructional Offerings: show subject area titles in the Subject filter")
 	@Since(4.9)
 	OfferingsFilterSubjectTitle("unitime.offering.subjectFilterShowTitles"),
+	
+	@Type(Boolean.class)
+	@DefaultValue("true")
+	@Description("Rooms: list only used departments as available for room sharing (i.e., departments that have a manager, a subject area, or another room).")
+	@Since(4.9)
+	RoomDeptUsedDeptsOnly("unitime.roomDepts.usedDepartmentsOnly"),
 	;
 
 	String iKey;

JavaSource/org/unitime/timetable/server/rooms/RoomPropertiesBackend.java

@@ -141,7 +141,8 @@ public RoomPropertiesInterface execute(RoomPropertiesRequest request, SessionCon
 				response.addExamType(new ExamTypeInterface(type.getUniqueId(), type.getReference(), type.getLabel(), type.getType() == ExamType.sExamTypeFinal));
 		}
 
-		for (Department d: Department.getUserDepartments(context.getUser())) {
+		boolean usedOnly = ApplicationProperty.RoomDeptUsedDeptsOnly.isTrue();
+		for (Department d: Department.getUserDepartments(context.getUser(), usedOnly)) {
 			DepartmentInterface department = new DepartmentInterface();
 			department.setId(d.getUniqueId());
 			department.setDeptCode(d.getDeptCode());
@@ -155,7 +156,7 @@ public RoomPropertiesInterface execute(RoomPropertiesRequest request, SessionCon
 			department.setCanEditRoomSharing(context.hasPermission(d, Right.EditRoomDepartments));
 			response.addDepartment(department);
 		}
-		response.setNrDepartments(Department.findAllBeingUsed(response.getAcademicSessionId()).size());
+		response.setNrDepartments(usedOnly ? Department.findAllBeingUsed(response.getAcademicSessionId()).size() : Department.findAll(response.getAcademicSessionId()).size());
 
 		response.setHorizontal(context.getUser() == null ? false : CommonValues.HorizontalGrid.eq(context.getUser().getProperty(UserProperty.GridOrientation)));
 		response.setGridAsText(context.getUser() == null ? false : CommonValues.TextGrid.eq(context.getUser().getProperty(UserProperty.GridOrientation)));

JavaSource/org/unitime/timetable/server/rooms/RoomSharingBackend.java

@@ -136,9 +136,10 @@ public RoomSharingModel loadRoomSharing(Location location, boolean includeRoomPr
 		}
 
 		boolean deptIndependent = context.getUser().getCurrentAuthority().hasRight(Right.DepartmentIndependent);
+		boolean usedOnly = ApplicationProperty.RoomDeptUsedDeptsOnly.isTrue();
 		if (location == null) {
 			Long neutralId = (includeRoomPreferences ? PreferenceLevel.getPreferenceLevel(PreferenceLevel.sNeutral).getUniqueId() : null);
-			for (Department d: Department.findAllBeingUsed(context.getUser().getCurrentAcademicSessionId())) {
+			for (Department d: (usedOnly ? Department.findAllBeingUsed(context.getUser().getCurrentAcademicSessionId()) : Department.findAll(context.getUser().getCurrentAcademicSessionId()))) {
 				Long prefId = null;
 				if (includeRoomPreferences && (deptIndependent || context.getUser().getCurrentAuthority().hasQualifier(d)))
 					prefId = neutralId;
@@ -168,7 +169,7 @@ public int compare(RoomDept rd1, RoomDept rd2) {
 					d.getDeptCode(), d.getName() + (d.isExternalManager() ? " (EXT: " + d.getExternalMgrLabel() + ")" : ""), editable, prefId));
 		}
 
-		for (Department d: Department.findAllBeingUsed(context.getUser().getCurrentAcademicSessionId())) {
+		for (Department d: (usedOnly ? Department.findAllBeingUsed(context.getUser().getCurrentAcademicSessionId()) : Department.findAll(context.getUser().getCurrentAcademicSessionId()))) {
 			Long prefId = null;
 			if (includeRoomPreferences && (deptIndependent || context.getUser().getCurrentAuthority().hasQualifier(d))) {
 				prefId = neutralId;

WebContent/help/Release-Notes.xml

@@ -43,6 +43,14 @@
 				<line>Added an ability to not show the subject area titles in the filter (when unitime.offering.subjectFilterShowTitles is set to false).</line>
 			</description>
 		</item>
+		<item>
+			<name>Add/Edit Room: Room Sharing</name>
+			<description>
+				<line>Added an ability to list all departments as available for room sharing (instead of those that are being used, i.e., departments that have a manager, a subject area, or another room).
+					<line>Set unitime.roomDepts.usedDepartmentsOnly to false to enable (defaults to true, only show departments that are being used).</line>
+				</line>
+			</description>
+		</item>
 	</category>
 	<category>
 		<title>Examination Timetabling</title>