Skip to content

Commit

Permalink
Split screen implemented
Browse files Browse the repository at this point in the history
  • Loading branch information
ishanashastri committed Jun 11, 2017
1 parent 5217442 commit a0b5e07
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 69 deletions.
53 changes: 0 additions & 53 deletions src/JavaFXGUI/AnimatedLabel.java

This file was deleted.

18 changes: 2 additions & 16 deletions src/JavaFXGUI/EnterInfoTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ public class EnterInfoTab extends Tab{
private Student student;
private HashMap<String, StudentList> data;
private AnimatedAlertBox alert;
private VBox summaryLeftVBox;
private OptionSelect infoOptionSelect;
private ArrayList<AnimatedLabel> summariesOptions;
/**
* Initializes the Tab. The Tab reads from a file "src/data/options.sip" for a list
* of the options of the OptionSelect carousel.
Expand All @@ -54,27 +52,15 @@ public EnterInfoTab(MenuTabPane par, EnterStudentTab prev, String title,

alert = new AnimatedAlertBox("Please select all options.", true);

summaryLeftVBox = new VBox();
summaryLeftVBox.getStyleClass().add("summaryVBox");
summaryLeftVBox.setSpacing(20);
summaryLeftVBox.setMaxWidth(300);
summaryLeftVBox.setPrefWidth(300);


infoOptionSelect = new OptionSelect(700, 550, this, student);

int version = 0;
if (goingIn){
version = 0;
for (int i = 0; i < data.get("outin").getStudentList().size(); i++){
if (student.equals(data.get("outin").getStudentList().get(i))){
if(student.getCount()%2!=0){
version = 1;
}else{
version = 0;
}
}

version = 1;
}
}
}
else{
Expand Down

0 comments on commit a0b5e07

Please sign in to comment.