0.4.1 release

comp110 · Jan 11, 2018 · 791a5a3 · 791a5a3
1 parent cbc45f1
commit 791a5a3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/bin/comp110/Storage.class b/bin/comp110/Storage.class
diff --git a/releases/ShiftOverflow_v0.4.0DEMO.jar → releases/ShiftOverflow_v0.4.1.jar b/releases/ShiftOverflow_v0.4.0DEMO.jar → releases/ShiftOverflow_v0.4.1.jar
diff --git a/src/comp110/Storage.java b/src/comp110/Storage.java
@@ -60,7 +60,7 @@ public String get_password(){
     }
 
     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";
+        return this.m_application_directory + DEFAULT_LOCAL_REPO_FOLDER + "/data/spring-18/staff/" + onyen + ".csv";
     }
 
     public String get_schedule_json_folder(){
@@ -76,7 +76,7 @@ public String get_shift_overflow_version_filename(){
     }
 
     public String get_path_to_onyen_csv_directory(){
-        return this.m_application_directory + DEFAULT_LOCAL_REPO_FOLDER + "/data/fall-17/staff/";
+        return this.m_application_directory + DEFAULT_LOCAL_REPO_FOLDER + "/data/spring-18/staff/";
     }
 
     public void get_files(){

diff --git a/src/ui/ScheduleBox.java b/src/ui/ScheduleBox.java
@@ -0,0 +1,25 @@
+package ui;
+
+import javafx.geometry.Insets;
+import javafx.scene.layout.Border;
+import javafx.scene.layout.BorderStroke;
+import javafx.scene.layout.BorderStrokeStyle;
+import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextFlow;
+
+public class ScheduleBox extends TextFlow {
+
+
+	public ScheduleBox(Text text, boolean isBottom) {
+		super(text);
+		if (isBottom) {
+			this.setBorder(new Border(new BorderStroke(Color.BLACK, Color.BLACK, Color.BLACK, Color.BLACK,
+						            BorderStrokeStyle.NONE, BorderStrokeStyle.NONE, BorderStrokeStyle.SOLID, BorderStrokeStyle.NONE,
+						            CornerRadii.EMPTY, new BorderWidths(0, 0, 5, 0), Insets.EMPTY)));
+		}
+	}
+
+}
diff --git a/src/ui/UI.java b/src/ui/UI.java
@@ -35,7 +35,7 @@ public class UI extends Application {
 	private ScheduleStage _scheduleStage;
 	private ViewSwapsStage _viewSwapsStage; 
 
-	private static final String VERSION = "0.4.0";
+	private static final String VERSION = "0.4.1";
 
 
 	@Override