Final Updated Software

ishanashastri · Jun 14, 2017 · 84c301c · 84c301c
1 parent 3844678
commit 84c301c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 31 deletions.
diff --git a/src/JavaFXGUI/EnterStudentTab.java b/src/JavaFXGUI/EnterStudentTab.java
@@ -279,17 +279,10 @@ private void moveOn(boolean signIn, Student student){
 		EnterInfoTab tab3;
 		boolean outin = false;
 		int j = 0;
-		for(int i = 0;i<data.get("outin").getOutInList().size();i++){
-			System.out.println("outin: "+ data.get("outin").getOutInList().get(i));
-		}
 		for (int i =0; i < data.get("outin").getStudentList().size(); i++){
-			System.out.println(data.get("outin").getStudentList().get(i));
-
 			if (student.equals(data.get("outin").getStudentList().get(i))){
-				if(!data.get("outin").getOutInList().contains(student)){
-					j = i;
-					outin=true;
-				}
+				j = i;
+				outin=true;
 			}
 		}
 
@@ -299,7 +292,6 @@ private void moveOn(boolean signIn, Student student){
 			String time = formatter.format(todayTime);
 
 			data.get("outin").getStudentList().get(j).setArrTime(time);
-			System.out.println(data.get("outin").getStudentList().get(j).getArrTime());
 
 			LocalDate todayDate = LocalDate.now();
 			String date = todayDate.toString();

diff --git a/src/backend/Student.java b/src/backend/Student.java
@@ -89,11 +89,7 @@ public String getReason() {
 
 
 	public void setReason(String reason) {
-//		if(this.reason != null){
-//			this.reason += ", " +reason;			
-//		}else{
-			this.reason=reason;	
-//		}
+		this.reason=reason;
 	}
 
 
@@ -110,14 +106,7 @@ public String getTime(){
 	}
 
 	public void setTime(String t){
-//		if(!this.time.contains("None")){
-//			System.out.println("time: " + this.time + " --> " + t);
-//			time += ", " + t;
-//		}else{
-//			System.out.println("time: " + this.time);
-			this.time=t;
-//			System.out.println("time: " + this.time + " --> " + t);
-//		}
+		this.time=t;
 	}
 	public String getDate(){
 		return date;
@@ -132,15 +121,10 @@ public void setExcused(String excused) {
 		this.excused = excused;
 	}
 	public void setArrTime(String arrTime) {
-//		if(this.arrTime.contains("None")){
-			this.arrTime = arrTime;
-//		}else{
-//			this.arrTime += ", " + arrTime;	
-//		} 
-//			System.out.println("time: " + this.arrTime + " --> " + arrTime);
+		this.arrTime = arrTime;
 	}
 	public String getArrTime() {
-		return arrTime;
+		return this.arrTime;
 	}
 
 	public int compareTo(Student o) {

diff --git a/src/backend/StudentList.java b/src/backend/StudentList.java
@@ -107,7 +107,8 @@ public ArrayList<String> getIDList(){
 	public ArrayList<Student> getStudentList(){
 		return new ArrayList<Student>(nameMap.values());
 	}
-	/**	 
+
+ 	/**	 
 	 * Gets size of the StudentList
 	 * @param other Student to be checked
 	 * @return	Returns if Student is in the StudentList.