Room Utilization and Occupancy

Modified Room Utilization and Occupancy Report Data Helpers to allow data to be broken down by class section and room controlling department.
UniTime · Jul 31, 2024 · 2f775f8 · 2f775f8
1 parent 4752f8a
commit 2f775f8
Show file tree

Hide file tree

Showing 5 changed files with 502 additions and 56 deletions.
diff --git a/JavaSource/org/unitime/timetable/gwt/resources/GwtMessages.java b/JavaSource/org/unitime/timetable/gwt/resources/GwtMessages.java
@@ -6963,12 +6963,24 @@ public interface GwtMessages extends Messages {
 	@DefaultMessage("Utilization_Type")
 	String utilSqlUtilizationType();
 
-	@DefaultMessage("Department")
+	@DefaultMessage("Course_Department")
 	String utilSqlDepartment();
 
 	@DefaultMessage("Subject")
 	String utilSqlSubject();
 
+	@DefaultMessage("Course_Number")
+	String utilSqlCourseNbr();
+
+	@DefaultMessage("Instr_Type")
+	String utilSqlItype();
+
+	@DefaultMessage("Section")
+	String utilSqlSection();
+
+	@DefaultMessage("Room_Controling_Dept")
+	String utilSqlRoomDept();
+
 	@DefaultMessage("Size_Group")
 	String utilSqlRangeOfSizes();
 

diff --git a/JavaSource/org/unitime/timetable/util/OccupancyHelper.java b/JavaSource/org/unitime/timetable/util/OccupancyHelper.java
@@ -119,8 +119,9 @@ protected String getBaseQueryAdditionalSelectColumns() {
 	@Override
 	public String getPivotedQuery(ArrayList<Integer> allDays, ArrayList<Integer> weekDays, Integer saturday,
 			String campus, String year, String term, ArrayList<Object> headerRow,
-			boolean includeDayOfWkTimeOfDayInHeaderRow, boolean includeSubjectArea, boolean includeDept) {
-		return getPivotedBaseSummaryQuery(allDays, weekDays, saturday, campus, year, term, headerRow, includeDayOfWkTimeOfDayInHeaderRow, includeSubjectArea, includeDept);
+			boolean includeDayOfWkTimeOfDayInHeaderRow, boolean includeSubjectArea, boolean includeDept, 
+			boolean includeSection, boolean includeRoomControlingDepartment) {
+		return getPivotedBaseSummaryQuery(allDays, weekDays, saturday, campus, year, term, headerRow, includeDayOfWkTimeOfDayInHeaderRow, includeSubjectArea, includeDept, includeSection, includeRoomControlingDepartment);
 	}
 
 	@Override