working towwards multi schedule SO. just need to refactor add/drop

Author: youngjt

bin/comp110/Controller.class

@@ -1,5 +1,7 @@
 package comp110;
 
+import java.util.List;
+
 import javafx.application.Platform;
 import ui.UI;
 
@@ -40,12 +42,12 @@ public void storage_get_files_complete(boolean success, String message) {
 		});
 		// go ahead and give them the schedule immediately for use
 		try {
-			Schedule schedule = this.m_parser.parseSchedule(this.m_storage.get_schedule_json_filename(),
+			List<Schedule> schedules = this.m_parser.parseSchedule(this.m_storage.get_schedule_json_folder(),
 					this.m_storage.get_path_to_onyen_csv_directory(), this.m_storage.get_schedule_leads_filename());
-			this.m_ui.setSchedule(schedule);
+			this.m_ui.setSchedules(schedules);
 		} catch (Exception e) {
 			// tell the ui things suck
-			this.m_ui.setSchedule(null);
+			this.m_ui.setSchedules(null);
 			Platform.runLater(
 					() -> this.m_ui.displayMessage("Controller::storage_get_files_complete(): " + e.toString()));
 		}
@@ -61,10 +63,10 @@ public void uiRequestSchedule() {
 		// an exception
 		// ui needs to be ready to handle null schedule
 		try {
-			Schedule schedule = this.m_parser.parseSchedule(this.m_storage.get_schedule_json_filename(),
+			List<Schedule> schedules = this.m_parser.parseSchedule(this.m_storage.get_schedule_json_folder(),
 					this.m_storage.get_path_to_onyen_csv_directory(), this.m_storage.get_schedule_leads_filename());
-			this.m_ui.setSchedule(schedule);
-			Platform.runLater(() -> this.m_ui.displaySchedule(schedule));
+			this.m_ui.setSchedules(schedules);
+			Platform.runLater(() -> this.m_ui.displaySchedule(schedules));
 		} catch (Exception e) {
 			Platform.runLater(() -> this.m_ui.displayMessage("Controller::uiRequestSchedule(): " + e.toString()));
 		}
@@ -106,9 +108,9 @@ public void uiRequestSaveAvailability(Employee employee, String commit_message)
 		}
 	}
 
-	public void uiRequestChangeSchedule(Schedule schedule, String commit_message) {
+	public void uiRequestChangeSchedule(List<Schedule> schedules, String commit_message) {
 		try {
-			this.m_parser.writeScheduleToJson(schedule, this.m_storage.get_schedule_json_filename());
+			this.m_parser.writeScheduleToJson(schedules, this.m_storage.get_schedule_json_folder());
 			this.m_storage.save_files(commit_message);
 		} catch (Exception e) {
 			this.m_ui.displayMessage("Controller::uiRequestChangeSchedule(): " + e.toString());

bin/comp110/Parser.class

@@ -7,6 +7,8 @@
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Scanner;
 import com.google.gson.Gson;
 import java.io.PrintWriter;
@@ -79,63 +81,75 @@ public Employee parseEmployee(String file) throws Exception {
 		return new Employee(name, onyen, capacity, gender.equals("M") ? false : true, level, availability);
 	}
 
-	public Schedule parseSchedule(String jsonFile, String staff_dir, String leadsFile) throws Exception {
+	public List<Schedule> parseSchedule(String scheduleFolderPath, String staff_dir, String leadsFile) throws Exception {
+		
+		List<Schedule> schedules = new ArrayList<Schedule>();
 
 		// read in the json file
 		Gson gson = new Gson();
 		String json = "";
 
-		Scanner scanner = null;
+		File scheduleFile = null;
 		try {
-			File file = new File(jsonFile);
-			scanner = new Scanner(file);
+			scheduleFile = new File(scheduleFolderPath);
+
+		} catch (Exception e) {
+			throw new Exception("Parser::parseSchedule(): Error reading schedule folder=" + scheduleFolderPath);
+		}
+		
+		for (File scheduleJson : scheduleFile.listFiles()) {
+			Scanner scanner = new Scanner(scheduleFile);
 			scanner.useDelimiter("\\Z");
 			json = scanner.next();
 			scanner.close();
-		} catch (FileNotFoundException e) {
-			throw new Exception("Parser::parseSchedule(): Error reading json file=" + jsonFile);
-		}
 
-		// create the json week object
-		JsonWeek jsonweek = gson.fromJson(json, JsonWeek.class);
-		if (jsonweek == null) {
-			throw new Exception("Parser::parseSchedule(): Error parsing json file ito jsonweek. File=" + jsonFile);
-		}
-		if (jsonweek.getShifts() == null){
-			// some problem parsing json
-			throw new Exception("Parser::parseSchedule(): Error parsing json file ito jsonweek. File=" + jsonFile);
-		}
+			// create the json week object
+			JsonWeek jsonweek = gson.fromJson(json, JsonWeek.class);
+			if (jsonweek == null) {
+				throw new Exception("Parser::parseSchedule(): Error parsing json file ito jsonweek. File=" + scheduleFolderPath);
+			}
+			if (jsonweek.getShifts() == null){
+				// some problem parsing json
+				throw new Exception("Parser::parseSchedule(): Error parsing json file ito jsonweek. File=" + scheduleFolderPath);
+			}
 
-		// now we have the json we need to reconstruct the schedule object
-		// first we will build the staff object
-		Staff staff = null;
-		try {
-			staff = parseStaff(staff_dir);
-		} catch (Exception e) {
-			throw new Exception("Parser::parseSchedule(): " + e.toString());
-		}
+			// now we have the json we need to reconstruct the schedule object
+			// first we will build the staff object
+			Staff staff = null;
+			try {
+				staff = parseStaff(staff_dir);
+			} catch (Exception e) {
+				throw new Exception("Parser::parseSchedule(): " + e.toString());
+			}
 
-		// now build the week object
-		Week week = new Week("Current Schedule");
-
-		// grab a reference to the shifts array
-		Shift[][] shifts = week.getShifts();
-		for (int day = 0; day < NUMBER_DAYS; day++) {
-			for (int hour = 0; hour < NUMBER_HOURS; hour++) {
-				for (int i = 0; i < jsonweek.getShifts()[day][hour].getScheduled().length; i++) {
-					String onyen = jsonweek.getShifts()[day][hour].getScheduled()[i];
-					Employee employee = this.getEmployeeByOnyen(onyen, staff);
-					if (employee == null) {
-						throw new Exception(
-								"Parser::parseSchedule(): No Employee in Staff for Onyen in Schdeule. Onyen=" + onyen);
+			// now build the week object
+			Week week = new Week("Current Schedule");
+
+			// grab a reference to the shifts array
+			Shift[][] shifts = week.getShifts();
+			for (int day = 0; day < NUMBER_DAYS; day++) {
+				for (int hour = 0; hour < NUMBER_HOURS; hour++) {
+					for (int i = 0; i < jsonweek.getShifts()[day][hour].getScheduled().length; i++) {
+						String onyen = jsonweek.getShifts()[day][hour].getScheduled()[i];
+						Employee employee = this.getEmployeeByOnyen(onyen, staff);
+						if (employee == null) {
+							throw new Exception(
+									"Parser::parseSchedule(): No Employee in Staff for Onyen in Schdeule. Onyen=" + onyen);
+						}
+						// add the employee to the shift
+						shifts[day][hour].add(employee);
 					}
-					// add the employee to the shift
-					shifts[day][hour].add(employee);
 				}
 			}
+			Leads leads = this.parseLeads(leadsFile, staff);
+			schedules.add(new Schedule(staff, week, leads, scheduleJson.getName().substring(9, scheduleJson.getName().length()))); // grab just the date portion of file name
+		}
+		
+		if (schedules.size() == 0) {
+			throw new Exception ("Parser::parseSchedule(): No schedules found to load in: " + scheduleFolderPath);
+		} else {
+			return schedules;
 		}
-		Leads leads = this.parseLeads(leadsFile, staff);
-		return new Schedule(staff, week, leads);
 	}
 
 	public void writeFile(Employee employee, String filename) throws Exception{
@@ -258,25 +272,28 @@ private Leads parseLeads(String leadsFile, Staff staff) throws Exception {
 		return leads;
 	}
 
-	public void writeScheduleToJson(Schedule schedule, String path) throws Exception{
-		if (schedule == null){
-			throw new Exception("Parser::writeScheduleToJson(): Schedule is null");
+	public void writeScheduleToJson(List<Schedule> schedules, String path) throws Exception {
+		if (schedules.size() == 0){
+			throw new Exception("Parser::writeScheduleToJson(): Schedule list is empty");
 		}
 		if (path.equals("") || path == null){
 			throw new Exception("Parser::writeScheduleToJson(): Path is invalid");
 		}
 
 		// create gson object
-		try{
-		Gson gson = new Gson();
-			JsonWeek jsonWeek = schedule.getWeek().toJsonWeek();
-			BufferedOutputStream writer = new BufferedOutputStream(new FileOutputStream(new File(path)), 65536);
-			String json = gson.toJson(jsonWeek);
-			writer.write(json.getBytes());
-			writer.close();
-		} catch (Exception e){
-			throw new Exception("Parser::writeScheduleToJson(): Unable to open file=" + path);
+		for (Schedule schedule : schedules) {
+			try{
+				Gson gson = new Gson();
+					JsonWeek jsonWeek = schedule.getWeek().toJsonWeek();
+					BufferedOutputStream writer = new BufferedOutputStream(new FileOutputStream(new File(path + File.pathSeparator + "schedule-" + schedule.getDatesValid() + ".json")), 65536);
+					String json = gson.toJson(jsonWeek);
+					writer.write(json.getBytes());
+					writer.close();
+				} catch (Exception e){
+					throw new Exception("Parser::writeScheduleToJson(): Unable to open file=" + path);
+				}
 		}
+
 	}
 
 	public String parseCurrentVersion(String versionPath) {

bin/comp110/Schedule.class

@@ -12,12 +12,14 @@ public class Schedule implements Serializable {
 	private Staff m_staff;
 	private Week m_week;
 	private Leads m_leads;
+	private String m_datesValid;
 
 	// functions
-	public Schedule(Staff staff, Week week, Leads leads) {
+	public Schedule(Staff staff, Week week, Leads leads, String datesValid) {
 		this.m_staff = staff;
 		this.m_week = week;
 		this.m_leads = leads;
+		this.m_datesValid = datesValid;
 		this.computeShiftLeads();
 	}
 
@@ -32,13 +34,17 @@ public Week getWeek() {
 	public Leads getLeads() {
 		return this.m_leads;
 	}
+	
+	public String getDatesValid() {
+		return this.m_datesValid;
+	}
 
 	public boolean equals(Schedule other) {
 		return this.m_staff.equals(other.m_staff) && this.m_week.equals(other.m_week);
 	}
 
 	public Schedule copy() {
-		return new Schedule(this.m_staff.copy(), this.m_week.copy(), this.m_leads.copy());
+		return new Schedule(this.m_staff.copy(), this.m_week.copy(), this.m_leads.copy(), this.m_datesValid);
 	}
 
 	private void computeShiftLeads() {

bin/comp110/Storage.class

@@ -63,8 +63,8 @@ public String get_availability_csv_filename_from_onyen(String onyen){
         return this.m_application_directory + DEFAULT_LOCAL_REPO_FOLDER + "/data/fall-17/staff/" + onyen + ".csv";
     }
 
-    public String get_schedule_json_filename(){
-        return this.m_application_directory + DEFAULT_LOCAL_REPO_FOLDER + "/data/schedule.json";
+    public String get_schedule_json_folder(){
+        return this.m_application_directory + DEFAULT_LOCAL_REPO_FOLDER + "/data/currentSchedules";
     }
 
     public String get_schedule_leads_filename(){