Updated software

ishanashastri · Jun 9, 2017 · 7e72889 · 7e72889
1 parent 226e5aa
commit 7e72889
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 35 deletions.
diff --git a/src/JavaFXGUI/EnterInfoTab.java b/src/JavaFXGUI/EnterInfoTab.java
@@ -89,15 +89,13 @@ public EnterInfoTab(MenuTabPane par, EnterStudentTab prev, String title,
 		int page = -1; 
 		String stringData = "";
 		while(file.hasNext()){
-
 			stringData = file.nextLine();
-			System.out.println(stringData);
-			infoOptionSelect.removeChoiceBox();
+			System.out.println(stringData+ ", " + v + ", " + version);
+
 			if (stringData.equals("+++")){
-				v ++;
-				infoOptionSelect.removeChoiceBox();
+				v++;
 			}
-			else if (stringData.equals("++")&& version == v){
+			else if (stringData.equals("++") && version == v){
 				page++;
 				stringData = file.nextLine();
 				if (stringData.contains("Submit Button")){
@@ -107,37 +105,32 @@ else if (stringData.equals("++")&& version == v){
 				else{
 					infoOptionSelect.addPage(stringData);
 				}
-				infoOptionSelect.removeChoiceBox();
 			}
 			else if (stringData.equals("++++")){
-				v++;
 				stringData=file.nextLine();
 				if (stringData.contains("Submit Button")){
 					String[] stringDatas = stringData.split(", ");
 					infoOptionSelect.addSubmitButton(page);
 					infoOptionSelect.addPage(stringDatas[1]);
 
-					String title1 = stringDatas[1];
-					ArrayList<String> data1 = new ArrayList<String>();
+					ArrayList<String> data = new ArrayList<String>();
 					stringData = file.nextLine();
 					while(!stringData.equals("Title 2")){
-						data1.add(stringData);
+						data.add(stringData);
 						stringData = file.nextLine();
 					}
-					String title2 = file.nextLine();
 					stringData = file.nextLine();
 					ArrayList<String> data2 = new ArrayList<String>();
 					while(!stringData.equals("End")){
 						data2.add(stringData);
 						stringData=file.nextLine();
-					}
-					infoOptionSelect.splitScreen(page+1, title1, title2, data1, data2, infoOptionSelect);
-				}
-				infoOptionSelect.removeChoiceBox();
+					}																																																																																			
+					infoOptionSelect.splitScreen(page+1, data);
+				}//infoOptionSelect.removeChoiceBox();
+
 			}
 			else if (version == v){
 				infoOptionSelect.addButton(page, stringData, stringData);
-				infoOptionSelect.removeChoiceBox();
 			}
 		}	
 		file.close();

diff --git a/src/JavaFXGUI/OptionSelect.java b/src/JavaFXGUI/OptionSelect.java
@@ -210,23 +210,21 @@ else if (buttonList.get(page).size() == 1){
 		buttonVBox.getChildren().add(optionHBoxArray.get(page));
 
 	}
-	public void splitScreen(int page, String title1, String title2, ArrayList<String> data1, ArrayList<String> data2, OptionSelect o){
+	public void splitScreen(int page, ArrayList<String> data){
 		ArrayList<OptionButton> left = new ArrayList<OptionButton>();
-		for(int i =0;i<data1.size()-1;i++){
-			OptionButton opt = new OptionButton(data1.get(i), data1.get(i), page);
+		for(int i =0;i<data.size()-1;i++){
+			OptionButton opt = new OptionButton(data.get(i), data.get(i), page);
 			left.add(opt);
 		}
 		buttonList.get(page).addAll(left) ;	
 		option.add("");
-
-		buttonVBox.getChildren().remove(optionHBoxArray.get(page));
 
 		updateState(0);	
-		addChoiceBox(false,o);
+		addChoiceBox(false);
 		buttonVBox.getChildren().remove(optionHBoxArray.get(page));
-
+		System.out.println("split screen");
 	}
-	public void addChoiceBox(boolean rem, OptionSelect o){
+	public void addChoiceBox(boolean rem){
 		RadioButton h = new RadioButton("Health Room");
 		h.getStyleClass().add("RadioButton");
 		RadioButton p = new RadioButton("Parent");
@@ -246,25 +244,27 @@ public void addChoiceBox(boolean rem, OptionSelect o){
 			submitButton.requestFocus();
 		});
 
-		HBox hb = new HBox(70); 
+		HBox hb = new HBox(60);
 		hb.getChildren().addAll(l,h,p); 
 		hb.setAlignment(Pos.CENTER);
 
 		buttonVBox.getChildren().add(hb);
-		System.out.println("called1");
-		
+		System.out.println("add choices");
+//		System.out.println(buttonVBox.getChildren().contains(hb));
 		submitButton.requestFocus();
 		if(rem){
-			removeChoiceBox();
+			System.out.println(buttonVBox.getChildren().contains(hb));
+			buttonVBox.getChildren().remove(hb);
+			System.out.println("removed " + buttonVBox.getChildren().contains(hb));
 		}
-		System.out.println(buttonVBox.getChildren().contains(hb));
 	}
 	public void removeChoiceBox(){
-//		if(buttonVBox.getChildren().contains(optionHBoxArray)){
+		System.out.println("before: " + buttonVBox.getChildren().contains(hb));
+		if(buttonVBox.getChildren().contains(hb)){
 			buttonVBox.getChildren().remove(hb);
-//		}
-			System.out.println("remove: " +buttonVBox.getChildren().contains(hb));
-		System.out.println("called");
+		}
+		System.out.println("remove choices");
+		System.out.println("removed: " + buttonVBox.getChildren().contains(hb));
 	}
 	/**
 	 * This is called by the ButtonHandler to add information to the Data.

diff --git a/src/data/email.config b/src/data/email.config
@@ -1,3 +1,3 @@
 2
 [email protected]
-[email protected]
+[email protected]
diff --git a/src/data/options.sip b/src/data/options.sip
@@ -7,6 +7,7 @@ Unexcused
 Religious Reason
 Transportation
 College Visit
++++
 ++++
 Submit Button, Enter reason for leaving:
 Sick