Student Scheduling Solver Dashboard: Dependent Courses

- show the "Not-assigned associated course {0}." message when applicable while showing student details (List of Classes)
  (set the dependent course relations to allow for correct evaluation of the condition)

Author: tomas-muller

JavaSource/org/unitime/timetable/onlinesectioning/basic/GetAssignment.java

@@ -756,6 +756,7 @@ public int compare(Enrollment o1, Enrollment o2) {
 						Hashtable<CourseRequest, TreeSet<Section>> overlapingSections = new Hashtable<CourseRequest, TreeSet<Section>>();
 						Assignment<Request, Enrollment> assignment = new AssignmentMap<Request, Enrollment>();
 						CourseRequest crq = SectioningRequest.convert(assignment, r, server, wlMode, helper);
+						SectioningRequest.setDependentCourses(crq, server);
 						Collection<Enrollment> avEnrls = crq.getAvaiableEnrollmentsSkipSameTime(assignment);
 						for (Iterator<Enrollment> e = avEnrls.iterator(); e.hasNext();) {
 							Enrollment enrl = e.next();

JavaSource/org/unitime/timetable/onlinesectioning/solver/SectioningRequest.java

@@ -21,8 +21,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.cpsolver.coursett.model.RoomLocation;
@@ -59,6 +61,7 @@
 import org.unitime.timetable.onlinesectioning.OnlineSectioningServer;
 import org.unitime.timetable.onlinesectioning.basic.GetInfo;
 import org.unitime.timetable.onlinesectioning.basic.GetAssignment.CourseSection;
+import org.unitime.timetable.onlinesectioning.model.XCourse;
 import org.unitime.timetable.onlinesectioning.model.XCourseId;
 import org.unitime.timetable.onlinesectioning.model.XCourseRequest;
 import org.unitime.timetable.onlinesectioning.model.XEnrollment;
@@ -450,6 +453,37 @@ public boolean sameLastName(Section current, Course course) {
 		return false;
 	}
 
+	public static void setDependentCourses(CourseRequest cr, OnlineSectioningServer server) {
+		if (cr == null || server == null) return;
+		XStudent student = server.getStudent(cr.getStudent().getId());
+		if (student == null) return;
+		Map<Long, Long> parentCourses = new HashMap<Long, Long>();
+		for (XRequest r: student.getRequests()) {
+			if (r instanceof XCourseRequest) {
+				for (XCourseId c: ((XCourseRequest)r).getCourseIds()) {
+					XCourse course = server.getCourse(c.getCourseId());
+					if (course != null && course.getParentCourseId() != null)
+	        			parentCourses.put(course.getCourseId(), course.getParentCourseId());
+				}
+			}
+		}
+		if (!parentCourses.isEmpty()) {
+			Map<Long, Course> courseTable = new HashMap<Long, Course>();
+			for (Request r: cr.getStudent().getRequests()) {
+				if (r instanceof CourseRequest) {
+					for (Course course: ((CourseRequest)r).getCourses())
+						courseTable.put(course.getId(), course);
+				}
+			}
+			for (Map.Entry<Long, Long> e: parentCourses.entrySet()) {
+				Course course = courseTable.get(e.getKey());
+				Course parent = courseTable.get(e.getValue());
+				if (course != null && parent != null)
+					course.setParent(parent);
+			}
+		}
+	}
+	
 	public static CourseRequest convert(Assignment<Request, Enrollment> assignment, XCourseRequest request, OnlineSectioningServer server, WaitListMode wlMode, OnlineSectioningHelper helper) {
 		XCourseId dropCourse = (request.isWaitlist(wlMode) ? request.getWaitListSwapWithCourseOffering() : null);
 		return convert(assignment, request, dropCourse, server, wlMode, helper);

WebContent/help/Release-Notes.xml

@@ -38,6 +38,15 @@
 			</description>
 		</item>
 	</category>
+	<category>
+		<title>Student Scheduling</title>
+		<item>
+			<name>Solver Dashboard: Dependent Courses</name>
+			<description>
+				<line>Show the "Not-assigned associated course {0}." message when applicable while showing student details (List of Classes).</line>
+			</description>
+		</item>
+	</category>
 </release>
 
 <release>