diff --git a/myDB/seg0/c6b0.dat b/myDB/seg0/c6b0.dat new file mode 100644 index 0000000..52cc5de Binary files /dev/null and b/myDB/seg0/c6b0.dat differ diff --git a/myDB/seg0/c6c1.dat b/myDB/seg0/c6c1.dat new file mode 100644 index 0000000..0909f54 Binary files /dev/null and b/myDB/seg0/c6c1.dat differ diff --git a/myDB/seg0/c6d0.dat b/myDB/seg0/c6d0.dat new file mode 100644 index 0000000..de30561 Binary files /dev/null and b/myDB/seg0/c6d0.dat differ diff --git a/myDB/seg0/c6e1.dat b/myDB/seg0/c6e1.dat new file mode 100644 index 0000000..45a74df Binary files /dev/null and b/myDB/seg0/c6e1.dat differ diff --git a/myDB/seg0/d670.dat b/myDB/seg0/d670.dat new file mode 100644 index 0000000..9dea66e Binary files /dev/null and b/myDB/seg0/d670.dat differ diff --git a/myDB/seg0/d681.dat b/myDB/seg0/d681.dat new file mode 100644 index 0000000..1f3aa76 Binary files /dev/null and b/myDB/seg0/d681.dat differ diff --git a/myDB/seg0/d690.dat b/myDB/seg0/d690.dat new file mode 100644 index 0000000..39ba0e2 Binary files /dev/null and b/myDB/seg0/d690.dat differ diff --git a/myDB/seg0/d6a1.dat b/myDB/seg0/d6a1.dat new file mode 100644 index 0000000..e1a1ccf Binary files /dev/null and b/myDB/seg0/d6a1.dat differ diff --git a/src/main/java/edu/wpi/cs3733/D22/teamZ/controllers/MedicalEquipmentDelivery.java b/src/main/java/edu/wpi/cs3733/D22/teamZ/controllers/MedicalEquipmentDelivery.java index 132bc03..7ebc255 100644 --- a/src/main/java/edu/wpi/cs3733/D22/teamZ/controllers/MedicalEquipmentDelivery.java +++ b/src/main/java/edu/wpi/cs3733/D22/teamZ/controllers/MedicalEquipmentDelivery.java @@ -28,10 +28,13 @@ public class MedicalEquipmentDelivery { @FXML private Label objectBodyText; @FXML private Label roomNumberLabel; @FXML private Label equipmentLabel; + @FXML private Label setSubmitStatus; @FXML private TextField enterRoomNumber; @FXML private TextField enterFloorNumber; @FXML private TextField enterNodeType; + @FXML private TextField enterStaffAssigned; @FXML private ChoiceBox equipmentDropDown; + @FXML private ChoiceBox statusDropDown; private ObservableList locationList; private ObservableList equipmentList; @@ -65,8 +68,10 @@ public void initialize() { System.out.println(model.getNodeID()); } + // examples equipmentDropDown.setItems(FXCollections.observableArrayList("Bed", "IV", "Pillow")); - // //example + statusDropDown.setItems(FXCollections.observableArrayList("Pending", "Approved", "Denied")); + statusDropDown.setValue("Pending"); } @FXML @@ -82,7 +87,9 @@ public void onResetButtonClicked(ActionEvent event) throws IOException { enterRoomNumber.clear(); enterFloorNumber.clear(); enterNodeType.clear(); + enterStaffAssigned.clear(); equipmentDropDown.setValue(null); + statusDropDown.setValue(null); } @FXML @@ -90,7 +97,9 @@ public void onSubmitButtonClicked(ActionEvent actionEvent) { System.out.println("Room Number: " + enterRoomNumber.getText()); System.out.println("Floor Number: " + enterFloorNumber.getText()); System.out.println("nodeType: " + enterNodeType.getText()); + System.out.println("staff assigned: " + enterStaffAssigned.getText()); System.out.println("Equipment Selected: " + equipmentDropDown.getValue()); + System.out.println("Status Selected: " + statusDropDown.getValue()); MedEquipReq lastestReq = equipmentList.get(equipmentList.size() - 1); String id = lastestReq.getRequestID(); @@ -101,15 +110,26 @@ public void onSubmitButtonClicked(ActionEvent actionEvent) { temp.setStatus("Processing"); // default temp.setEquipment(equipmentDropDown.getValue().toString()); temp.setHandler("Jake"); // temp - temp.setIssuer("Pat"); // temp - temp.setCurrentLoc("FDEPT00101"); // temp + temp.setIssuer(enterStaffAssigned.getText()); + temp.setCurrentLoc("zDEPT00101"); // temp - // FDEPT00102 + /** + * Example: zDEPT00101 z as lowercase team letter DEPT as nodeType 001 as Room Number 01 as + * floor number (L2, L1, 01, 02, 03) + */ String target = "z" + enterNodeType.getText() + enterRoomNumber.getText() + enterFloorNumber.getText(); temp.setTargetLoc(target); - im1.addMedEquipReq(temp); + try { + im1.addMedEquipReq(temp); + setSubmitStatus.setText("Request Sent"); + System.out.println("Submitted Medical Equipment Delivery Request"); + } catch (Exception e) { + System.out.println("Submission Failed"); + setSubmitStatus.setText("Submission Failed"); + e.printStackTrace(); + } } @FXML @@ -117,8 +137,12 @@ private void validateButton() { if (!enterRoomNumber.getText().trim().isEmpty() && !enterFloorNumber.getText().trim().isEmpty() && !enterNodeType.getText().trim().isEmpty() - && !equipmentDropDown.getSelectionModel().isEmpty()) { + && !enterStaffAssigned.getText().trim().isEmpty() + && !equipmentDropDown.getSelectionModel().isEmpty() + && !statusDropDown.getSelectionModel().isEmpty()) { submitButton.setDisable(false); + } else { + submitButton.setDisable(true); } } } diff --git a/src/main/resources/edu/wpi/cs3733/D22/teamZ/views/MedicalEquipmentDelivery.fxml b/src/main/resources/edu/wpi/cs3733/D22/teamZ/views/MedicalEquipmentDelivery.fxml index ba0feda..4a25d23 100644 --- a/src/main/resources/edu/wpi/cs3733/D22/teamZ/views/MedicalEquipmentDelivery.fxml +++ b/src/main/resources/edu/wpi/cs3733/D22/teamZ/views/MedicalEquipmentDelivery.fxml @@ -9,9 +9,13 @@ - + + + + + @@ -65,21 +69,11 @@ - - - - - - - - - -