Student Scheduling: Student Campus

- added student campus to AreaClassificationMajor
UniTime · Jan 23, 2024 · 9e9b6b9 · 9e9b6b9
1 parent 1573987
commit 9e9b6b9
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 0 deletions.
diff --git a/src/org/cpsolver/studentsct/StudentSectioningXMLLoader.java b/src/org/cpsolver/studentsct/StudentSectioningXMLLoader.java
@@ -1028,6 +1028,7 @@ protected Student loadStudent(Element studentEl, Map<Long, Offering> offeringTab
                             requestEl.attributeValue("concentration"), requestEl.attributeValue("concentrationName"),
                             requestEl.attributeValue("degree"), requestEl.attributeValue("degreeName"),
                             requestEl.attributeValue("program"), requestEl.attributeValue("programName"),
+                            requestEl.attributeValue("campus"), requestEl.attributeValue("campusName"),
                             requestEl.attributeValue("weight") == null ? null : Double.valueOf(requestEl.attributeValue("weight"))));
                 else
                     student.getAreaClassificationMajors().add(new AreaClassificationMajor(
@@ -1037,6 +1038,7 @@ protected Student loadStudent(Element studentEl, Map<Long, Offering> offeringTab
                             requestEl.attributeValue("concentration"), requestEl.attributeValue("concentrationName"),
                             requestEl.attributeValue("degree"), requestEl.attributeValue("degreeName"),
                             requestEl.attributeValue("program"), requestEl.attributeValue("programName"),
+                            requestEl.attributeValue("campus"), requestEl.attributeValue("campusName"),
                             requestEl.attributeValue("weight") == null ? null : Double.valueOf(requestEl.attributeValue("weight"))));
             } else if ("group".equals(requestEl.getName())) {
                 student.getGroups().add(new StudentGroup(requestEl.attributeValue("type"), requestEl.attributeValue("reference"), requestEl.attributeValue("name")));

diff --git a/src/org/cpsolver/studentsct/StudentSectioningXMLSaver.java b/src/org/cpsolver/studentsct/StudentSectioningXMLSaver.java
@@ -717,6 +717,10 @@ protected void saveStudent(Element studentEl, Student student) {
                     acmEl.addAttribute("programName", acm.getProgramName());
                 if (acm.getWeight() != 1.0)
                     acmEl.addAttribute("weight", String.valueOf(acm.getWeight()));
+                if (acm.getCampus() != null)
+                    acmEl.addAttribute("campus", acm.getCampus());
+                if (acm.getCampusName() != null && iShowNames)
+                    acmEl.addAttribute("campusName", acm.getCampusName());
             }
             for (AreaClassificationMajor acm : student.getAreaClassificationMinors()) {
                 Element acmEl = studentEl.addElement("acm");
@@ -746,6 +750,10 @@ protected void saveStudent(Element studentEl, Student student) {
                     acmEl.addAttribute("programName", acm.getProgramName());
                 if (acm.getWeight() != 1.0)
                     acmEl.addAttribute("weight", String.valueOf(acm.getWeight()));
+                if (acm.getCampus() != null)
+                    acmEl.addAttribute("campus", acm.getCampus());
+                if (acm.getCampusName() != null && iShowNames)
+                    acmEl.addAttribute("campusName", acm.getCampusName());
             }
             for (StudentGroup g : student.getGroups()) {
                 Element grEl = studentEl.addElement("group");

diff --git a/src/org/cpsolver/studentsct/model/AreaClassificationMajor.java b/src/org/cpsolver/studentsct/model/AreaClassificationMajor.java
@@ -32,6 +32,7 @@ public class AreaClassificationMajor {
     private Double iWeight;
     private String iDegree, iDegreeName;
     private String iProgram, iProgramName;
+    private String iCampus, iCampusName;
 
     /**
      * Constructor
@@ -219,6 +220,49 @@ public AreaClassificationMajor(
         iProgramName = programName;
         iWeight = weight;
     }
+
+    /**
+     * Constructor
+     * 
+     * @param areaCode academic area abbreviation
+     * @param areaName academic area name
+     * @param classificationCode academic classificationCode
+     * @param classificationName academic classificationName
+     * @param majorCode major code
+     * @param majorName major name
+     * @param concentrationCode concentration (optional)
+     * @param concentrationName concentration (optional)
+     * @param degreeCode degree (optional)
+     * @param degreeName degree (optional)
+     * @param programCode program (optional)
+     * @param programName program (optional)
+     * @param weight weight (optional)
+     */
+    public AreaClassificationMajor(
+            String areaCode, String areaName,
+            String classificationCode, String classificationName,
+            String majorCode, String majorName,
+            String concentrationCode, String concentrationName,
+            String degreeCode, String degreeName,
+            String programCode, String programName,
+            String campus, String campusName,
+            Double weight) {
+        iArea = areaCode;
+        iAreaName = areaName;
+        iClassification = classificationCode;
+        iClassificationName = classificationName;
+        iMajor = majorCode;
+        iMajorName = majorName;
+        iConcentration = concentrationCode;
+        iConcentrationName = concentrationName;
+        iDegree = degreeCode;
+        iDegreeName = degreeName;
+        iProgram = programCode;
+        iProgramName = programName;
+        iCampus = campus;
+        iCampusName = campusName;
+        iWeight = weight;
+    }
 
     /** Academic area 
      * @return academic area abbreviation
@@ -304,6 +348,20 @@ public String getProgramName() {
         return iProgramName;
     }
 
+    /** Campus (optional)
+     * @return campus name
+     **/
+    public String getCampus() {
+        return iCampus;
+    }
+
+    /** Campus (optional)
+     * @return campus name
+     **/
+    public String getCampusName() {
+        return iCampusName;
+    }
+
     /** Weight (optional, defaults to 1.0)
      */
     public double getWeight() { return iWeight == null ? 1.0 : iWeight.doubleValue(); }