From 8877c9f27177944a8a1feb5ab6076a9a32bd9e4e Mon Sep 17 00:00:00 2001 From: jeffrey Date: Sun, 3 Dec 2017 11:16:31 -0500 Subject: [PATCH 1/3] Fixed password bug --- .../controller/ResetEmployeePasswordDialogController.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java b/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java index c43d26b..a53c47a 100644 --- a/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java +++ b/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java @@ -56,12 +56,7 @@ public class ResetEmployeePasswordDialogController implements Initializable { @Override public void initialize(URL url, ResourceBundle rb) { // Configure text change listeners for the two fields - newPasswordField.setOnKeyPressed( - e -> onNewPasswordFieldUpdated() - ); - confirmPasswordField.setOnKeyPressed(e -> - onConfirmPasswordFieldUpdated() - ); + } /** From df8c114626553cf2a6db774e93ee229a8f05fbea Mon Sep 17 00:00:00 2001 From: jeffrey Date: Sun, 3 Dec 2017 11:20:30 -0500 Subject: [PATCH 2/3] Fixed format to not make Chris mad --- .../controller/ResetEmployeePasswordDialogController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java b/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java index a53c47a..ac4b132 100644 --- a/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java +++ b/src/main/java/com/gitrekt/resort/controller/ResetEmployeePasswordDialogController.java @@ -55,8 +55,7 @@ public class ResetEmployeePasswordDialogController implements Initializable { */ @Override public void initialize(URL url, ResourceBundle rb) { - // Configure text change listeners for the two fields - + } /** From bfa806b3e430a8be937178e5c210b4a5b8b38405 Mon Sep 17 00:00:00 2001 From: jeffrey Date: Sun, 3 Dec 2017 12:11:30 -0500 Subject: [PATCH 3/3] Implement adding feedback to database --- .../LeaveFeedbackScreenController.java | 42 +++++++++++++------ .../resources/fxml/LeaveFeedbackScreen.fxml | 6 +-- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/gitrekt/resort/controller/LeaveFeedbackScreenController.java b/src/main/java/com/gitrekt/resort/controller/LeaveFeedbackScreenController.java index a2904bc..724844b 100644 --- a/src/main/java/com/gitrekt/resort/controller/LeaveFeedbackScreenController.java +++ b/src/main/java/com/gitrekt/resort/controller/LeaveFeedbackScreenController.java @@ -1,44 +1,62 @@ package com.gitrekt.resort.controller; +import com.gitrekt.resort.model.entities.GuestFeedback; +import com.gitrekt.resort.model.services.GuestFeedbackService; import java.io.IOException; import java.net.URL; import java.util.ResourceBundle; import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; -import javafx.scene.Parent; -import javafx.scene.Scene; +import javafx.scene.control.Alert; +import javafx.scene.control.Alert.AlertType; import javafx.stage.Stage; import javafx.scene.control.Button; +import javafx.scene.control.ButtonType; +import javafx.scene.control.TextArea; +import javafx.scene.control.TextField; /** * FXML Controller class for the leave feedback screen. */ public class LeaveFeedbackScreenController implements Initializable { - - @FXML - private Button submitButton; + + @FXML + private TextArea feedbackTextArea; + + @FXML + private TextField guestEmailTextField; @FXML - private Button cancelButton; + private Button submitButton; @Override public void initialize(URL url, ResourceBundle rb) { // TODO } - + public void onCancelClicked() { ScreenManager.getInstance().switchToScreen( - "/fxml/GuestHomeScreen.fxml" + "/fxml/GuestHomeScreen.fxml" ); } - + /** * Action button for when submit button is clicked. - * @throws IOException + * + * @throws IOException */ public void onSubmitClicked() throws IOException { Stage stage = (Stage) submitButton.getScene().getWindow(); - //TODO Add feedback to database + if (!feedbackTextArea.getText().equals("") && !guestEmailTextField.getText().equals("")) { + GuestFeedbackService guestfeedbackservice = new GuestFeedbackService(); + guestfeedbackservice.createNewGuestFeedback(new GuestFeedback(feedbackTextArea.getText(), guestEmailTextField.getText())); + Alert a = new Alert(AlertType.INFORMATION); + a.setTitle("THANK YOU!"); + a.setHeaderText("Thanks for your feeback"); + a.showAndWait(); + if (a.getResult() == ButtonType.OK) { + onCancelClicked(); + } + } } } diff --git a/src/main/resources/fxml/LeaveFeedbackScreen.fxml b/src/main/resources/fxml/LeaveFeedbackScreen.fxml index 0b0211b..bf944c1 100644 --- a/src/main/resources/fxml/LeaveFeedbackScreen.fxml +++ b/src/main/resources/fxml/LeaveFeedbackScreen.fxml @@ -10,7 +10,7 @@ - + - +