Batch Student Scheduling: Section Times

- added ability to load arranged hours (no time) classes with a time (listing the date pattern but no time) and rooms (that are required by the class)
- this allows the effective date pattern and required room to show on arranged hours classes on the solver dashboard
- can be disabled by setting the solver parameter Load.ArrangedHoursPlacements to false (defaults to true)

Author: tomas-muller

3rd_party/sources/cpsolver-1.3-SNAPSHOT-sources.jar

@@ -954,7 +954,7 @@ public String[] getValues(StudentGroup group, StudentSectioningModel model, Assi
             			if (e != null && e.isCourseRequest()) {
             				for (Section section: e.getSections()) {
             					if (section.isOnline()) onlineClass ++;
-            					if (section.getTime() == null) arrClass ++;
+            					if (!section.hasTime()) arrClass ++;
             					allClass ++;
             				}
             			}

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

@@ -256,6 +256,7 @@ private static enum IgnoreNotAssigned { all, other, none }
     private boolean iUseAdvisorWaitLists = false;
     private Date iClassesPastDate = null;
     private int iClassesPastDateIndex = 0;
+    private boolean iLoadArrangedHoursPlacements = true;
 
     public StudentSectioningDatabaseLoader(StudentSectioningModel model, org.cpsolver.ifs.assignment.Assignment<Request, Enrollment> assignment) {
         super(model, assignment);
@@ -408,6 +409,7 @@ public StudentSectioningDatabaseLoader(StudentSectioningModel model, org.cpsolve
         	iStudentHoldsCheckProvider = Customization.StudentHoldsCheckProvider.getProvider();
 
         iUseAdvisorWaitLists = model.getProperties().getPropertyBoolean("Load.UseAdvisorWaitLists", iUseAdvisorWaitLists);
+        iLoadArrangedHoursPlacements = model.getProperties().getPropertyBoolean("Load.ArrangedHoursPlacements", iLoadArrangedHoursPlacements);
     }
 
     public void load() {
@@ -847,6 +849,31 @@ private Offering loadOffering(InstructionalOffering io, Hashtable<Long, Course>
                     			datePatternName(a.getDatePattern(), p.getTimeLocation()),
                     			p.getTimeLocation().getWeekCode());
                     }
+                    if (p == null && iLoadArrangedHoursPlacements) {
+                    	DatePattern dp = c.effectiveDatePattern();
+                    	if (dp != null) {
+                    		TimeLocation tl = new TimeLocation(0, 0, 0, 0, 0.0, dp.getUniqueId(), datePatternName(dp, null), dp.getPatternBitSet(), 0);
+                    		List<RoomLocation> rooms = new ArrayList<RoomLocation>();
+                    		for (Iterator<?> it = c.effectivePreferences(RoomPref.class).iterator(); it.hasNext(); ) {
+                    			RoomPref rp = (RoomPref)it.next();
+                    			if (PreferenceLevel.sRequired.equals(rp.getPrefLevel().getPrefProlog())) {
+                    				Location room = rp.getRoom();
+                    				RoomLocation rl = new RoomLocation(
+                    						room.getUniqueId(),
+                    						room.getLabel(),
+                    						(room instanceof Room? ((Room)room).getBuilding().getUniqueId() : null),
+                    						0,
+                    						room.getCapacity().intValue(),
+                    						room.getCoordinateX(),
+                    						room.getCoordinateY(),
+                    						room.isIgnoreTooFar().booleanValue(),
+                    						null);
+                    				rooms.add(rl);
+                    			}
+                    		}
+                    		p = new Placement(null, tl, rooms);
+                    	}
+                    }
                     Section section = new Section(c.getUniqueId().longValue(), getSectionLimit(c, true), (c.getClassSuffix() == null ? c.getSectionNumberString() : c.getClassSuffix()), subpart, p,
                     		getInstructors(c), parentSection);
                     if (iCheckEnabledForScheduling && !c.isEnabledForStudentScheduling())
@@ -2207,6 +2234,12 @@ private String datePatternName(DatePattern dp, TimeLocation time) {
     	if ("never".equals(iDatePatternFormat)) return dp.getName();
     	if ("extended".equals(iDatePatternFormat) && dp.getType() != DatePattern.sTypeExtended) return dp.getName();
     	if ("alternate".equals(iDatePatternFormat) && dp.getType() == DatePattern.sTypeAlternate) return dp.getName();
+    	if (time == null) {
+    		Formats.Format<Date> dpf = Formats.getDateFormat(Formats.Pattern.DATE_PATTERN);
+    		Date first = dp.getStartDate();
+    		Date last = dp.getEndDate();
+    		return dpf.format(first) + (first.equals(last) ? "" : " - " + dpf.format(last));
+    	}
     	if (time.getWeekCode().isEmpty()) return time.getDatePatternName();
     	Calendar cal = Calendar.getInstance(Locale.US); cal.setLenient(true);
     	cal.setTime(iDatePatternFirstDate);