I think multi-schedule now works!!

Author: Jeffrey-Young

bin/comp110/Parser.class

@@ -12,7 +12,6 @@ public Leads(Staff staff) {
 	}
 
 	public void add(String onyen) {
-		System.out.print(onyen);
 		Employee e = _staff.getEmployeeByOnyen(onyen);
 		if (e != null) {
 			super.add(e);

bin/comp110/Schedule.class

@@ -25,7 +25,7 @@ public class Parser {
 
 	// functions
 	public Parser() {
-		
+
 	}
 
 	public Employee parseEmployee(String file) throws Exception {
@@ -81,8 +81,9 @@ public Employee parseEmployee(String file) throws Exception {
 		return new Employee(name, onyen, capacity, gender.equals("M") ? false : true, level, availability);
 	}
 
-	public List<Schedule> parseSchedules(String scheduleFolderPath, String staff_dir, String leadsFile) throws Exception {
-		
+	public List<Schedule> parseSchedules(String scheduleFolderPath, String staff_dir, String leadsFile)
+			throws Exception {
+
 		List<Schedule> schedules = new ArrayList<Schedule>();
 
 		// read in the json file
@@ -105,18 +106,21 @@ public List<Schedule> parseSchedules(String scheduleFolderPath, String staff_dir
 				json = scanner.nextLine();
 			} catch (Exception e) {
 				System.err.println(e.toString());
-				throw new Exception("Parser::parseSchedule(): Error reading schedule file= "+ scheduleJson.getAbsolutePath());
+				throw new Exception(
+						"Parser::parseSchedule(): Error reading schedule file= " + scheduleJson.getAbsolutePath());
 			}
 			scanner.close();
 
 			// 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);
+				throw new Exception(
+						"Parser::parseSchedule(): Error parsing json file ito jsonweek. File=" + scheduleFolderPath);
 			}
-			if (jsonweek.getShifts() == null){
+			if (jsonweek.getShifts() == null) {
 				// some problem parsing json
-				throw new Exception("Parser::parseSchedule(): Error parsing json file ito jsonweek. File=" + scheduleFolderPath);
+				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
@@ -140,25 +144,34 @@ public List<Schedule> parseSchedules(String scheduleFolderPath, String staff_dir
 						Employee employee = this.getEmployeeByOnyen(onyen, staff);
 						if (employee == null) {
 							throw new Exception(
-									"Parser::parseSchedule(): No Employee in Staff for Onyen in Schdeule. Onyen=" + onyen);
+									"Parser::parseSchedule(): No Employee in Staff for Onyen in Schdeule. Onyen="
+											+ onyen);
 						}
 						// 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
+			schedules.add(new Schedule(staff, week, leads,
+					scheduleJson.getName().substring(9, scheduleJson.getName().length()).split("\\.")[0])); // grab
+																											// just
+																											// the
+																											// date
+																											// portion
+																											// of
+																											// file
+																											// name
 		}
-		
+
 		if (schedules.size() == 0) {
-			throw new Exception ("Parser::parseSchedule(): No schedules found to load in: " + scheduleFolderPath);
+			throw new Exception("Parser::parseSchedule(): No schedules found to load in: " + scheduleFolderPath);
 		} else {
 			return schedules;
 		}
 	}
-	
-	public void writeFile(Employee employee, String filename) throws Exception{
+
+	public void writeFile(Employee employee, String filename) throws Exception {
 
 		// check if employee is null first
 		if (employee == null) {
@@ -168,7 +181,7 @@ public void writeFile(Employee employee, String filename) throws Exception{
 		// write to file
 		PrintWriter fw = null;
 		try {
-			System.out.println("Writing Schedule to" + filename);
+			// System.out.println("Writing Schedule to" + filename);
 			fw = new PrintWriter(filename);
 			StringBuilder sb = new StringBuilder();
 
@@ -216,20 +229,20 @@ public void writeFile(Employee employee, String filename) throws Exception{
 			fw.close();
 		} catch (Exception e) {
 			// unable to open file
-			if (fw != null){
+			if (fw != null) {
 				fw.close();
 			}
 			throw new Exception("Parser::writeFile(): Unable to open file for writing. File=" + filename);
 		}
 	}
 
-	private Staff parseStaff(String dir) throws Exception{
+	private Staff parseStaff(String dir) throws Exception {
 		// create staff object
 		Staff staff = new Staff();
 
 		// get a file object to the directory containing all the csv's
 		File csvDirectory = new File(dir);
-		
+
 		// create an employee from each csv
 		for (File csv : csvDirectory.listFiles()) {
 			Employee employee = null;
@@ -256,7 +269,7 @@ private Employee getEmployeeByOnyen(String onyen, Staff staff) {
 		// not able to find employee
 		return null;
 	}
-	
+
 	private Leads parseLeads(String leadsFile, Staff staff) throws Exception {
 		BufferedReader reader = null;
 		Leads leads = new Leads(staff);
@@ -279,41 +292,42 @@ private Leads parseLeads(String leadsFile, Staff staff) throws Exception {
 	}
 
 	public void writeScheduleToJson(List<Schedule> schedules, String path) throws Exception {
-		if (schedules.size() == 0){
+		if (schedules.size() == 0) {
 			throw new Exception("Parser::writeScheduleToJson(): Schedule list is empty");
 		}
-		if (path.equals("") || path == null){
+		if (path.equals("") || path == null) {
 			throw new Exception("Parser::writeScheduleToJson(): Path is invalid");
 		}
-		
+
 		// create gson object
 		for (Schedule schedule : schedules) {
-			try{
+			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);
-				}
+				JsonWeek jsonWeek = schedule.getWeek().toJsonWeek();
+				File f = new File(path + "schedule_" + schedule.getDatesValid() + ".json");
+				BufferedOutputStream writer = new BufferedOutputStream(new FileOutputStream(f), 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) {
 		BufferedReader reader = null;
 		try {
 			reader = new BufferedReader(new FileReader(versionPath));
 		} catch (FileNotFoundException e) {
-			return ""; //if we can't find the file just carry on
+			return ""; // if we can't find the file just carry on
 		}
 		String currentVersion = null;
 		try {
 			currentVersion = reader.readLine();
 			reader.close();
-		} catch (IOException e) { //This should never happen 
+		} catch (IOException e) { // This should never happen
 			System.err.println("lol this should never happen");
 			e.printStackTrace();
 		}

bin/tests/ParserTest.class

@@ -47,7 +47,9 @@ public Schedule copy() {
 		return new Schedule(this.m_staff.copy(), this.m_week.copy(), this.m_leads.copy(), this.m_datesValid);
 	}
 
-	private void computeShiftLeads() {
+	public void computeShiftLeads() {
+		// before computing we should invalidate any existing
+		invalidateShiftLeads();
 		for (int day = 0; day < m_week.getShifts().length; day++) {
 			for (int hour = 0; hour < m_week.getShifts()[day].length; hour++) {
 				Employee lead = null;
@@ -66,5 +68,13 @@ private void computeShiftLeads() {
 			}
 		}
 	}
+	
+	private void invalidateShiftLeads() {
+		for (int day = 0; day < m_week.getShifts().length; day++) {
+			for (int hour = 0; hour < m_week.getShifts()[day].length; hour++) {
+				m_week.getShift(day, hour).setLead(null);
+			}
+		}
+	}
 
 }

src/comp110/Leads.java

@@ -1,6 +1,9 @@
 package tests;
 
 import static org.junit.Assert.*;
+
+import java.util.List;
+
 import org.junit.*;
 
 import comp110.Employee;
@@ -40,7 +43,7 @@ public void parseEmployee_test() {
 	public void parseSchedule_test() {
 		Parser p = new Parser();
 		try {
-			Schedule s = p.parseSchedules("testData/schedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
+			List<Schedule> s = p.parseSchedules("testData/schedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
 			Shift test1 = new Shift(0, 1, 0);
 			Shift test2 = new Shift(0, 2, 0);
 			Shift test3 = new Shift(1, 5, 0); 
@@ -89,7 +92,7 @@ public void parseSchedule_test() {
 			test7.add(cphamlet);
 			test7.add(sunmiche);
 
-			Shift[][] shift = s.getWeek().getShifts();
+			Shift[][] shift = s.get(0).getWeek().getShifts();
 
 			assertEquals(shift[0][1].equals(test1), true);
 			assertEquals(shift[0][2].equals(test2), true);
@@ -131,9 +134,9 @@ public void writeFile_test() {
 	public void writeScheduleToJson_Test() {
 		Parser p = new Parser();
 		try {
-			Schedule s = p.parseSchedules("testData/schedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
+			List<Schedule> s = p.parseSchedules("testData/schedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
 			p.writeScheduleToJson(s, "testData/testSchedule.json");
-			Schedule result = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
+			List<Schedule> result = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
 			assertEquals(s.equals(result), true);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -170,9 +173,9 @@ public void writeRepeatedFiles(){
 	public void writeRepeatedSchedules(){
 		Parser p = new Parser();
 		try {
-			Schedule s = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
+			List<Schedule> s = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
 			p.writeScheduleToJson(s, "testData/testSchedule.json");
-			Schedule result = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
+			List<Schedule> result = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");
 			for(int i = 0; i < 20; i++){
 				p.writeScheduleToJson(result, "testData/testSchedule.json");
 				result = p.parseSchedules("testData/testSchedule.json", "data/spring-17/staff", "data/fall-17/leads.csv");

src/comp110/Parser.java

@@ -303,8 +303,6 @@ private void handleCheck(ActionEvent event) {
     // now that the schedule has changed we can let the person save
     _saveAvailabilityButton.setDisable(false);
     int[][] updatedAvailability = _ui.getCurrentEmployee().getAvailability();
-    // System.out.println("Day: " + check.getDay() + " Hour: " +
-    // check.getHour());
     HBox parent = (HBox) check.getParent();
     if (check.isSelected()) {
       parent.setBackground(new Background(new BackgroundFill(Color.GREEN, null, null)));