SessionInfo.addClass(CRN) breaks it. fix schedule line 82.

codingsnippets · Mar 17, 2013 · c213671 · c213671
1 parent b578e46
commit c213671
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/branch/proto/Schedule.java b/branch/proto/Schedule.java
@@ -66,16 +66,22 @@ public String getInstructor() {
         return this.Instructor;
     }
 
-    public String getWeekday() {
-        return this.Weekday;
+    public String getTimeslot() {
+        return this.Start_time + " - " + this.End_time + " " + this.Weekday;
     }
 
     public String getCoursename() {
         return this.Subject+this.Course_no.toString();
     }
 
-    public ArrayList<Integer> getTimes(){
-    	return this.Times;
+    public ArrayList<Integer> getTimes() {
+    	if (this.Times != null) {
+    		return this.Times;
+    	}
+    	else {
+    		//TODO actually create times if it doesn't exist
+    		return new ArrayList<Integer>();
+    	}
     }
 	/**
 	 * The <code>toCsv</code> function creates a string of comma separated

diff --git a/branch/proto/UserHistory.java b/branch/proto/UserHistory.java
@@ -117,9 +117,9 @@ public void actionPerformed(ActionEvent e) {
 		submit.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {				
 				sessioninfo = DragonCourseScheduler.updateMajor(sessioninfo, getMajorCode());//what is the major value?
-				sessioninfo = DragonCourseScheduler.setTerms(sessioninfo, getTerms());
 				sessioninfo = DragonCourseScheduler.updateHistory(sessioninfo, PreviousClassesField.getText());
 				sessioninfo = DragonCourseScheduler.updateConcentrations(sessioninfo, getTrackList());// please fill in concentration info
+				sessioninfo = DragonCourseScheduler.setTerms(sessioninfo, getTerms());
 
 				setVisible(false);
 			}