C20-SoftEng · NewellClark · Mar 2, 2020 · Mar 2, 2020 · Mar 2, 2020 · Mar 2, 2020
diff --git a/.gitignore b/.gitignore
@@ -160,5 +160,7 @@ gradle-app.setting
 
 # End of https://www.gitignore.io/api/java,macos,gradle,intellij+all
 hospitalDB
-
 /gargoyle_food_request_db/
+/flowerAPI_DB/
+/myDB/
+/giftServiceDB/
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,16 @@ dependencies {
             [group: 'javax.mail', name: 'mail', version: '1.4.1'],
             [group: 'edu.wpi.cs3733.d18.teamG', name: 'FoodRequest', version:'1.0.0'],
             [group: 'org.twitter4j', name: 'twitter4j-core', version: '4.0.1'],
-            [group: 'com.github.dvdme', name: 'ForecastIOLib', version: '1.5.2']
+            [group: 'com.github.dvdme', name: 'ForecastIOLib', version: '1.5.2'],
+            [group: 'edu.wpi.cs3733.c20.teamS', name: 'GiftRequest', version:'1.0.2'],
+            [group: 'com.fazecast', name: 'jSerialComm', version:'2.6.0'],
+            [group: 'com.neuronrobotics', name: 'nrjavaserial', version: '3.7.5.1'],
+            [group: 'edu.wpi.cs3733.c20.teamS', name: 'GiftRequest', version:'1.0.2'],
+            [group: 'edu.wpi.cs3733.c20.teamR', name: 'AppointmentRequest', version:'1.6.9'],
+            [group: 'edu.wpi.cs3733.c20.teamU', name: 'FlowerRequestS', version:'1.0.1'],
+            [group: 'edu.wpi.cs3733.c20.teamV', name: 'TeamVInterpreterRequest', version:'1.1.0'],
+            [group: 'edu.wpi.cs3733.c20.teamT', name: 'ReligiousServiceAPI', version:'1.0.1'],
+            [group: 'io.github.typhon0', name: 'AnimateFX', version: '1.2.0']
     )
 
     compileOnly(
@@ -78,8 +87,8 @@ jacocoTestCoverageVerification {
                 minimum = 1.0
             }
             excludes = [
-              'edu.wpi.teamname.App',
-              'edu.wpi.teamname.Main'
+                    'edu.wpi.teamname.App',
+                    'edu.wpi.teamname.Main'
             ]
         }
 

diff --git a/giftServiceDB/README_DO_NOT_TOUCH_FILES.txt b/giftServiceDB/README_DO_NOT_TOUCH_FILES.txt
@@ -0,0 +1,9 @@
+
+# *************************************************************************
+# ***              DO NOT TOUCH FILES IN THIS DIRECTORY!                ***
+# *** FILES IN THIS DIRECTORY AND SUBDIRECTORIES CONSTITUTE A DERBY     ***
+# *** DATABASE, WHICH INCLUDES THE DATA (USER AND SYSTEM) AND THE       ***
+# *** FILES NECESSARY FOR DATABASE RECOVERY.                            ***
+# *** EDITING, ADDING, OR DELETING ANY OF THESE FILES MAY CAUSE DATA    ***
+# *** CORRUPTION AND LEAVE THE DATABASE IN A NON-RECOVERABLE STATE.     ***
+# *************************************************************************
diff --git a/giftServiceDB/db.lck b/giftServiceDB/db.lck
diff --git a/giftServiceDB/log/README_DO_NOT_TOUCH_FILES.txt b/giftServiceDB/log/README_DO_NOT_TOUCH_FILES.txt
@@ -0,0 +1,8 @@
+
+# *************************************************************************
+# ***              DO NOT TOUCH FILES IN THIS DIRECTORY!                ***
+# *** FILES IN THIS DIRECTORY ARE USED BY THE DERBY DATABASE RECOVERY   ***
+# *** SYSTEM. EDITING, ADDING, OR DELETING FILES IN THIS DIRECTORY      ***
+# *** WILL CAUSE THE DERBY RECOVERY SYSTEM TO FAIL, LEADING TO          ***
+# *** NON-RECOVERABLE CORRUPT DATABASES.                                ***
+# *************************************************************************
diff --git a/giftServiceDB/log/log.ctrl b/giftServiceDB/log/log.ctrl
diff --git a/giftServiceDB/log/log1.dat b/giftServiceDB/log/log1.dat
diff --git a/giftServiceDB/log/logmirror.ctrl b/giftServiceDB/log/logmirror.ctrl
diff --git a/giftServiceDB/seg0/README_DO_NOT_TOUCH_FILES.txt b/giftServiceDB/seg0/README_DO_NOT_TOUCH_FILES.txt
@@ -0,0 +1,8 @@
+
+# *************************************************************************
+# ***              DO NOT TOUCH FILES IN THIS DIRECTORY!                ***
+# *** FILES IN THIS DIRECTORY ARE USED BY THE DERBY DATABASE TO STORE   *** 
+# *** USER AND SYSTEM DATA. EDITING, ADDING, OR DELETING FILES IN THIS  ***
+# *** DIRECTORY WILL CORRUPT THE ASSOCIATED DERBY DATABASE AND MAKE     ***
+# *** IT NON-RECOVERABLE.                                               ***
+# *************************************************************************
diff --git a/giftServiceDB/seg0/c10.dat b/giftServiceDB/seg0/c10.dat
diff --git a/giftServiceDB/seg0/c101.dat b/giftServiceDB/seg0/c101.dat
diff --git a/giftServiceDB/seg0/c111.dat b/giftServiceDB/seg0/c111.dat
diff --git a/giftServiceDB/seg0/c121.dat b/giftServiceDB/seg0/c121.dat
diff --git a/giftServiceDB/seg0/c130.dat b/giftServiceDB/seg0/c130.dat
diff --git a/giftServiceDB/seg0/c141.dat b/giftServiceDB/seg0/c141.dat
diff --git a/giftServiceDB/seg0/c150.dat b/giftServiceDB/seg0/c150.dat
diff --git a/giftServiceDB/seg0/c161.dat b/giftServiceDB/seg0/c161.dat
diff --git a/giftServiceDB/seg0/c171.dat b/giftServiceDB/seg0/c171.dat
diff --git a/giftServiceDB/seg0/c180.dat b/giftServiceDB/seg0/c180.dat
diff --git a/giftServiceDB/seg0/c191.dat b/giftServiceDB/seg0/c191.dat
diff --git a/giftServiceDB/seg0/c1a1.dat b/giftServiceDB/seg0/c1a1.dat
diff --git a/giftServiceDB/seg0/c1b1.dat b/giftServiceDB/seg0/c1b1.dat
diff --git a/giftServiceDB/seg0/c1c0.dat b/giftServiceDB/seg0/c1c0.dat
diff --git a/giftServiceDB/seg0/c1d1.dat b/giftServiceDB/seg0/c1d1.dat
diff --git a/giftServiceDB/seg0/c1e0.dat b/giftServiceDB/seg0/c1e0.dat
diff --git a/giftServiceDB/seg0/c1f1.dat b/giftServiceDB/seg0/c1f1.dat
diff --git a/giftServiceDB/seg0/c20.dat b/giftServiceDB/seg0/c20.dat
diff --git a/giftServiceDB/seg0/c200.dat b/giftServiceDB/seg0/c200.dat
diff --git a/giftServiceDB/seg0/c211.dat b/giftServiceDB/seg0/c211.dat
diff --git a/giftServiceDB/seg0/c221.dat b/giftServiceDB/seg0/c221.dat
diff --git a/giftServiceDB/seg0/c230.dat b/giftServiceDB/seg0/c230.dat
diff --git a/giftServiceDB/seg0/c241.dat b/giftServiceDB/seg0/c241.dat
diff --git a/giftServiceDB/seg0/c251.dat b/giftServiceDB/seg0/c251.dat
diff --git a/giftServiceDB/seg0/c260.dat b/giftServiceDB/seg0/c260.dat
diff --git a/giftServiceDB/seg0/c271.dat b/giftServiceDB/seg0/c271.dat
diff --git a/giftServiceDB/seg0/c281.dat b/giftServiceDB/seg0/c281.dat
diff --git a/giftServiceDB/seg0/c290.dat b/giftServiceDB/seg0/c290.dat
diff --git a/giftServiceDB/seg0/c2a1.dat b/giftServiceDB/seg0/c2a1.dat
diff --git a/giftServiceDB/seg0/c2b1.dat b/giftServiceDB/seg0/c2b1.dat
diff --git a/giftServiceDB/seg0/c2c1.dat b/giftServiceDB/seg0/c2c1.dat
diff --git a/giftServiceDB/seg0/c2d0.dat b/giftServiceDB/seg0/c2d0.dat
diff --git a/giftServiceDB/seg0/c2e1.dat b/giftServiceDB/seg0/c2e1.dat
diff --git a/giftServiceDB/seg0/c2f0.dat b/giftServiceDB/seg0/c2f0.dat
diff --git a/giftServiceDB/seg0/c300.dat b/giftServiceDB/seg0/c300.dat
diff --git a/giftServiceDB/seg0/c31.dat b/giftServiceDB/seg0/c31.dat
diff --git a/giftServiceDB/seg0/c311.dat b/giftServiceDB/seg0/c311.dat
diff --git a/giftServiceDB/seg0/c321.dat b/giftServiceDB/seg0/c321.dat
diff --git a/giftServiceDB/seg0/c331.dat b/giftServiceDB/seg0/c331.dat
diff --git a/giftServiceDB/seg0/c340.dat b/giftServiceDB/seg0/c340.dat
diff --git a/giftServiceDB/seg0/c351.dat b/giftServiceDB/seg0/c351.dat
diff --git a/giftServiceDB/seg0/c361.dat b/giftServiceDB/seg0/c361.dat
diff --git a/giftServiceDB/seg0/c371.dat b/giftServiceDB/seg0/c371.dat
diff --git a/giftServiceDB/seg0/c380.dat b/giftServiceDB/seg0/c380.dat
diff --git a/giftServiceDB/seg0/c391.dat b/giftServiceDB/seg0/c391.dat
diff --git a/giftServiceDB/seg0/c3a1.dat b/giftServiceDB/seg0/c3a1.dat
diff --git a/giftServiceDB/seg0/c3b1.dat b/giftServiceDB/seg0/c3b1.dat
diff --git a/giftServiceDB/seg0/c3c0.dat b/giftServiceDB/seg0/c3c0.dat
diff --git a/giftServiceDB/seg0/c3d1.dat b/giftServiceDB/seg0/c3d1.dat
diff --git a/giftServiceDB/seg0/c3e1.dat b/giftServiceDB/seg0/c3e1.dat
diff --git a/giftServiceDB/seg0/c3f1.dat b/giftServiceDB/seg0/c3f1.dat
diff --git a/giftServiceDB/seg0/c400.dat b/giftServiceDB/seg0/c400.dat
diff --git a/giftServiceDB/seg0/c41.dat b/giftServiceDB/seg0/c41.dat
diff --git a/giftServiceDB/seg0/c411.dat b/giftServiceDB/seg0/c411.dat
diff --git a/giftServiceDB/seg0/c421.dat b/giftServiceDB/seg0/c421.dat
diff --git a/giftServiceDB/seg0/c430.dat b/giftServiceDB/seg0/c430.dat
diff --git a/giftServiceDB/seg0/c441.dat b/giftServiceDB/seg0/c441.dat
diff --git a/giftServiceDB/seg0/c451.dat b/giftServiceDB/seg0/c451.dat
diff --git a/giftServiceDB/seg0/c461.dat b/giftServiceDB/seg0/c461.dat
diff --git a/giftServiceDB/seg0/c470.dat b/giftServiceDB/seg0/c470.dat
diff --git a/giftServiceDB/seg0/c481.dat b/giftServiceDB/seg0/c481.dat
diff --git a/giftServiceDB/seg0/c51.dat b/giftServiceDB/seg0/c51.dat
diff --git a/giftServiceDB/seg0/c60.dat b/giftServiceDB/seg0/c60.dat
diff --git a/giftServiceDB/seg0/c71.dat b/giftServiceDB/seg0/c71.dat
diff --git a/giftServiceDB/seg0/c81.dat b/giftServiceDB/seg0/c81.dat
diff --git a/giftServiceDB/seg0/c90.dat b/giftServiceDB/seg0/c90.dat
diff --git a/giftServiceDB/seg0/ca1.dat b/giftServiceDB/seg0/ca1.dat
diff --git a/giftServiceDB/seg0/cb1.dat b/giftServiceDB/seg0/cb1.dat
diff --git a/giftServiceDB/seg0/cc0.dat b/giftServiceDB/seg0/cc0.dat
diff --git a/giftServiceDB/seg0/cd1.dat b/giftServiceDB/seg0/cd1.dat
diff --git a/giftServiceDB/seg0/ce1.dat b/giftServiceDB/seg0/ce1.dat
diff --git a/giftServiceDB/seg0/cf0.dat b/giftServiceDB/seg0/cf0.dat
diff --git a/giftServiceDB/service.properties b/giftServiceDB/service.properties
@@ -0,0 +1,23 @@
+#D:\Classes\Software Engineering\Repository\Project-Team-S-master\giftServiceDB
+# ********************************************************************
+# ***                Please do NOT edit this file.                 ***
+# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
+# ********************************************************************
+#Sat Feb 29 16:39:02 EST 2020
+SysschemasIndex2Identifier=225
+SyscolumnsIdentifier=144
+SysconglomeratesIndex1Identifier=49
+SysconglomeratesIdentifier=32
+SyscolumnsIndex2Identifier=177
+SysschemasIndex1Identifier=209
+SysconglomeratesIndex3Identifier=81
+SystablesIndex2Identifier=129
+SyscolumnsIndex1Identifier=161
+derby.serviceProtocol=org.apache.derby.database.Database
+SysschemasIdentifier=192
+derby.storage.propertiesId=16
+SysconglomeratesIndex2Identifier=65
+derby.serviceLocale=en_US
+SystablesIdentifier=96
+SystablesIndex1Identifier=113
+#--- last line, don't put anything after this line ---
diff --git a/libs/jSerialComm-2.6.0.jar b/libs/jSerialComm-2.6.0.jar
diff --git a/src/main/java/edu/wpi/cs3733/c20/teamS/AboutMeController.java b/src/main/java/edu/wpi/cs3733/c20/teamS/AboutMeController.java
@@ -5,14 +5,22 @@
 import edu.wpi.cs3733.c20.teamS.serviceRequests.InterpreterServiceRequest;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 import javafx.event.ActionEvent;
+import javafx.event.Event;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ResourceBundle;
 
 public class AboutMeController {
 
@@ -22,6 +30,13 @@ public class AboutMeController {
     @FXML
     private JFXButton goBack;
 
+    @FXML
+    private JFXButton goCredits;
+
+    @FXML
+    private ImageView imageV;
+
+
 
 
     @FXML
@@ -33,6 +48,35 @@ void BackClicked() {
 
 
 
+    //Open up Credits Page
+    @FXML
+    void goToCredits(){
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/FXML/CreditsPage.fxml"));
+            Parent root = fxmlLoader.load();
+            //Parent  root1 = fxmlLoader.getRoot();
+            Stage window = new Stage();
+            window.initModality(Modality.WINDOW_MODAL);
+            window.setFullScreen(false);
+            window.setScene(new Scene(root));
+            window.setResizable(false);
+            window.show();
+
+            Stage stage = (Stage) goBack.getScene().getWindow();
+            Settings.openWindows.add(window);
+            BaseScreen.puggy.register(window.getScene(), Event.ANY);
+
+            // do what you have to do
+            stage.close();
+
+        } catch (IOException e) {
+            System.out.println("Can't load new window");
+        }
+
+    }
+
+
+
 
 
     public AboutMeController(){}

diff --git a/src/main/java/edu/wpi/cs3733/c20/teamS/App.java b/src/main/java/edu/wpi/cs3733/c20/teamS/App.java
@@ -1,20 +1,8 @@
 package edu.wpi.cs3733.c20.teamS;
 
-import edu.wpi.cs3733.c20.teamS.database.DatabaseController;
-import edu.wpi.cs3733.c20.teamS.database.ServiceData;
-import edu.wpi.cs3733.c20.teamS.serviceRequests.*;
 import javafx.application.Application;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class App extends Application {
 
   @Override
@@ -34,6 +22,5 @@ public void start(Stage primaryStage) throws Exception {
 //    testSet.add(testServiceRequest2);
 //    ActiveServiceRequestScreen testScreen = new ActiveServiceRequestScreen(primaryStage, testSet);
 
-
   }
 }
diff --git a/src/main/java/edu/wpi/cs3733/c20/teamS/BaseScreen.java b/src/main/java/edu/wpi/cs3733/c20/teamS/BaseScreen.java
@@ -0,0 +1,33 @@
+package edu.wpi.cs3733.c20.teamS;
+
+import edu.wpi.cs3733.c20.teamS.emergency.EmergencyScreen;
+import edu.wpi.cs3733.c20.teamS.utilities.FireWatchDog;
+import edu.wpi.cs3733.c20.teamS.utilities.UIWatchPug;
+import javafx.util.Duration;
+
+public abstract class BaseScreen {
+    public static final UIWatchPug puggy;
+    //public static final FireWatchDog fireWatch;
+
+    static {
+        //Stage stage = new Stage();
+        puggy = new UIWatchPug(new Duration(130000),() -> {
+            MainStartScreen.showDialog();
+        });
+
+//        fireWatch = new FireWatchDog(new Duration(1000),()->{
+//           if(SerialPoller.runSensor()){
+//               //System.out.println("Emergency Detected");
+//               EmergencyScreen es = new EmergencyScreen();
+//           }else{
+//               //System.out.println("No emergency");
+//           }
+//
+////           SerialPoller.serial.getInputStream().
+//
+//        });
+    }
+
+    //public void close(){}
+}
+
diff --git a/src/main/java/edu/wpi/cs3733/c20/teamS/CreditsPageController.java b/src/main/java/edu/wpi/cs3733/c20/teamS/CreditsPageController.java
@@ -0,0 +1,45 @@
+package edu.wpi.cs3733.c20.teamS;
+
+import com.jfoenix.controls.JFXButton;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class CreditsPageController {
+
+    @FXML
+    JFXButton goBackButton;
+
+
+    @FXML
+    void GoBack() {
+        Stage stage = (Stage) goBackButton.getScene().getWindow();
+        // do what you have to do
+        stage.close();
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/FXML/AboutMe.fxml"));
+            Parent root = (Parent) fxmlLoader.load();
+            //Parent  root1 = fxmlLoader.getRoot();
+            Stage window = new Stage();
+            window.initModality(Modality.WINDOW_MODAL);
+            window.setFullScreen(false);
+            window.setScene(new Scene(root));
+            window.setResizable(false);
+
+
+            window.show();
+        } catch (IOException e) {
+            System.out.println("Can't load new window");
+        }
+
+    }
+
+    public CreditsPageController(){}
+
+}