Feature/track support staff appointment percentage

src/main/java/edu/ucdavis/dss/ipa/api/components/course/CourseViewController.java

@@ -129,6 +129,9 @@ public SectionGroup updateSectionGroup(@PathVariable long sectionGroupId, @Reque
 		originalSectionGroup.setTeachingAssistantAppointments(sectionGroup.getTeachingAssistantAppointments());
 		originalSectionGroup.setReaderAppointments(sectionGroup.getReaderAppointments());
 
+		originalSectionGroup.setTaAppointmentPercentage(sectionGroup.getTaAppointmentPercentage());
+		originalSectionGroup.setReaderAppointmentPercentage(sectionGroup.getReaderAppointmentPercentage());
+
 		return sectionGroupService.save(originalSectionGroup);
 	}
 

src/main/java/edu/ucdavis/dss/ipa/api/deserializers/SectionGroupDeserializer.java

@@ -48,6 +48,14 @@ public Object deserialize(JsonParser jsonParser, DeserializationContext deserial
 			sg.setReaderAppointments(node.get("readerAppointments").floatValue());
 		}
 
+		if (node.has("taAppointmentPercentage") && node.hasNonNull("taAppointmentPercentage")) {
+			sg.setTaAppointmentPercentage(node.get("taAppointmentPercentage").intValue());
+		}
+
+		if (node.has("readerAppointmentPercentage") && node.hasNonNull("readerAppointmentPercentage")) {
+			sg.setReaderAppointmentPercentage(node.get("readerAppointmentPercentage").intValue());
+		}
+
 		if (node.has("showTheStaff")) {
 			sg.setShowTheStaff(node.get("showTheStaff").booleanValue());
 		}

src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroup.java

@@ -33,7 +33,7 @@ public class SectionGroup extends BaseEntity {
 	private List<TeachingAssignment> teachingAssignments = new ArrayList<TeachingAssignment>();
 	private List<Activity> activities = new ArrayList<Activity>();
 	private String termCode;
-	private Integer plannedSeats;
+	private Integer plannedSeats, taAppointmentPercentage, readerAppointmentPercentage;
 	private Float teachingAssistantAppointments, readerAppointments;
 	private Boolean showTheStaff = false;
 
@@ -191,4 +191,14 @@ public Float getReaderAppointments() {
 	public void setReaderAppointments(Float readerAppointments) {
 		this.readerAppointments = readerAppointments;
 	}
+
+	@JsonProperty
+	public Integer getTaAppointmentPercentage() { return taAppointmentPercentage; }
+
+	public void setTaAppointmentPercentage(Integer taAppointmentPercentage) { this.taAppointmentPercentage = taAppointmentPercentage; }
+
+	@JsonProperty
+	public Integer getReaderAppointmentPercentage() { return readerAppointmentPercentage; }
+
+	public void setReaderAppointmentPercentage(Integer readerAppointmentPercentage) { this.readerAppointmentPercentage = readerAppointmentPercentage; }
 }

src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCost.java

@@ -23,7 +23,7 @@
 public class SectionGroupCost extends BaseEntity {
     private long id;
     private BudgetScenario budgetScenario;
-    private Integer sectionCount;
+    private Integer sectionCount, taAppointmentPercentage, readerAppointmentPercentage;
     private Long enrollment;
     private Instructor instructor;
     private Instructor originalInstructor;
@@ -64,6 +64,10 @@ public void setTaCount(Float taCount) {
         this.taCount = taCount;
     }
 
+    public Integer getTaAppointmentPercentage() { return taAppointmentPercentage; }
+
+    public void setTaAppointmentPercentage(Integer taAppointmentPercentage) { this.taAppointmentPercentage = taAppointmentPercentage; }
+
     public Integer getSectionCount() {
         return sectionCount;
     }
@@ -80,6 +84,10 @@ public void setReaderCount(Float readerCount) {
         this.readerCount = readerCount;
     }
 
+    public Integer getReaderAppointmentPercentage() { return readerAppointmentPercentage; }
+
+    public void setReaderAppointmentPercentage(Integer readerAppointmentPercentage) { this.readerAppointmentPercentage = readerAppointmentPercentage; }
+
     public BigDecimal getCost() {
         return cost;
     }

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java

@@ -169,11 +169,21 @@ public SectionGroupCost updateFromSectionGroup(SectionGroup sectionGroup, Budget
             sectionGroupCost.setTaCount(sectionGroup.getTeachingAssistantAppointments());
         }
 
+        if (sectionGroupCost.getTaAppointmentPercentage() != sectionGroup.getTaAppointmentPercentage()) {
+            updateRequired = true;
+            sectionGroupCost.setTaAppointmentPercentage(sectionGroup.getReaderAppointmentPercentage());
+        }
+
         if (sectionGroupCost.getReaderCount() != sectionGroup.getReaderAppointments()) {
             updateRequired = true;
             sectionGroupCost.setReaderCount(sectionGroup.getReaderAppointments());
         }
 
+        if (sectionGroupCost.getReaderAppointmentPercentage() != sectionGroup.getReaderAppointmentPercentage()) {
+            updateRequired = true;
+            sectionGroupCost.setReaderAppointmentPercentage(sectionGroup.getReaderAppointmentPercentage());
+        }
+
         Instructor instructor = null;
         InstructorType instructorType = null;
 

src/main/resources/db/migration/V228__Add_AppointmentPercentage_To_SectionGroups.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `SectionGroups` ADD COLUMN `TaAppointmentPercentage` INT(11) NULL;
+ALTER TABLE `SectionGroups` ADD COLUMN `ReaderAppointmentPercentage` INT(11) NULL;
+ALTER TABLE `SectionGroupCosts` ADD COLUMN `TaAppointmentPercentage` INT(11) NULL;
+ALTER TABLE `SectionGroupCosts` ADD COLUMN `ReaderAppointmentPercentage` INT(11) NULL;