Solver Reports: Course Request Alternatives Statistics

- added Course Request Alternatives Statistics report, an experimental report comparing course requests and advisor recommendations with and without alternatives
- only available to user roles with Student Sectioning Solver Admin Reports role

Author: tomas-muller

JavaSource/org/unitime/timetable/gwt/resources/StudentSectioningMessages.java

@@ -3812,4 +3812,7 @@ public interface StudentSectioningMessages extends Messages {
 
 	@DefaultMessage("Not-Assigned Associated Course Issues")
 	String reportDependentCourseIssues();
+	
+	@DefaultMessage("Course Request Alternatives Statistics")
+	String reportCourseRequestAltStats();
 }

JavaSource/org/unitime/timetable/onlinesectioning/advisors/AdvisorGetCourseRequests.java

@@ -353,7 +353,7 @@ else if (reservation instanceof LearningCommunityReservation)
 		return request;
 	}
 
-	protected static void fillCourseRequests(CourseRequestInterface request, List<AdvisorCourseRequest> acrs) {
+	public static void fillCourseRequests(CourseRequestInterface request, List<AdvisorCourseRequest> acrs) {
 		int last = -1;
 		CourseRequestInterface.Request r = null;
 		Set<Integer> skip = new HashSet<Integer>();

JavaSource/org/unitime/timetable/security/permissions/StudentSchedulingPermissions.java

@@ -77,6 +77,9 @@ public boolean check(UserContext user, Session source) {
 	@PermissionForRight(Right.StudentSectioningSolverReports)
 	public static class StudentSectioningSolverReports extends StudentSectioningSolverDashboard {}
 
+	@PermissionForRight(Right.StudentSectioningSolverAdminReports)
+	public static class StudentSectioningSolverAdminReports extends StudentSectioningSolverReports {}
+	
 	@PermissionForRight(Right.StudentSectioningSolverSave)
 	public static class StudentSectioningSolverSave extends StudentScheduling {}
 

JavaSource/org/unitime/timetable/security/rights/Right.java

@@ -337,6 +337,7 @@ public enum Right {
     StudentSectioningSolverLog(Session.class),
     StudentSectioningSolverDashboard(Session.class),
     StudentSectioningSolverReports(Session.class),
+    StudentSectioningSolverAdminReports(Session.class),
     StudentSectioningSolutionExportXml(Session.class),
     StudentSectioningSolverPublish(Session.class),
 

JavaSource/org/unitime/timetable/server/sectioning/CourseRequestAltStats.java

@@ -47,6 +47,7 @@
 import org.unitime.timetable.reports.studentsct.UnasignedCourseRequests;
 import org.unitime.timetable.reports.studentsct.UnusedReservations;
 import org.unitime.timetable.security.SessionContext;
+import org.unitime.timetable.security.rights.Right;
 import org.unitime.timetable.solver.service.SolverService;
 import org.unitime.timetable.solver.studentsct.StudentSolverProxy;
 
@@ -102,17 +103,23 @@ public static enum ReportType {
 		SECTIONING_ISSUES_ALL(SCT_MSG.reportSectioningIssuesAllCourses(), SectioningIssuesReport.class.getName(), "all", "true"),
 		RESERVATIONS(SCT_MSG.reportReservations(), Reservations.class.getName()),
 		DEPENDENT_OFFERINGS_ISSUES(SCT_MSG.reportDependentCourseIssues(), DependentCourseIssues.class.getName()),
+		CRS_ALTS(true, SCT_MSG.reportCourseRequestAltStats(), CourseRequestAltStats.class.getName()),
 		;
 
 		String iName, iImplementation;
 		String[] iParameters;
+		boolean iAdmin;
+		ReportType(boolean admin, String name, String implementation, String... params) {
+			iAdmin = admin; iName = name; iImplementation = implementation; iParameters = params;
+		}
 		ReportType(String name, String implementation, String... params) {
-			iName = name; iImplementation = implementation; iParameters = params;
+			this(false, name, implementation, params);
 		}
 
 		public String getName() { return iName; }
 		public String getImplementation() { return iImplementation; }
 		public String[] getParameters() { return iParameters; }
+		public boolean isAdmin() { return iAdmin; }
 		public ReportTypeInterface toReportTypeInterface() {
 			return new ReportTypeInterface(name(), iName, iImplementation, true, iParameters);
 		}
@@ -121,8 +128,10 @@ public ReportTypeInterface toReportTypeInterface() {
 	@Override
 	public GwtRpcResponseList<ReportTypeInterface> execute(SectioningReportTypesRpcRequest request, SessionContext context) {
 		GwtRpcResponseList<ReportTypeInterface> ret = new GwtRpcResponseList<ReportTypeInterface>();
+		boolean includeAdmins = context.hasPermission(Right.StudentSectioningSolverAdminReports);
 		for (ReportType type: ReportType.values())
-			ret.add(type.toReportTypeInterface());
+			if (!type.isAdmin() || includeAdmins)
+				ret.add(type.toReportTypeInterface());
 
 		if (!request.isOnline()) {
 			StudentSolverProxy solver = studentSectioningSolverService.getSolver();

JavaSource/org/unitime/timetable/server/sectioning/SectioningReportTypesBackend.java

@@ -45,6 +45,13 @@
 				<line>Skip revalidation for a course that was made not offered (avoid null exception).</line>
 			</description>
 		</item>
+		<item>
+			<name>Solver Reports: Course Request Alternatives Statistics</name>
+			<description>
+				<line>Added Course Request Alternatives Statistics report, an experimental report comparing course requests and advisor recommendations with and without alternatives.</line>
+				<line>Only available to user roles with Student Sectioning Solver Admin Reports role.</line>
+			</description>
+		</item>
 	</category>
 	<category>
 		<title>Event Management</title>