From 1def73b90a502c30023abaf9a9a3d2e11660449d Mon Sep 17 00:00:00 2001
From: Geoffrey POUZET <chteufleur@kingpenguin.tk>
Date: Sat, 24 Oct 2020 14:39:14 +0200
Subject: [PATCH] Add confirmation popup on delete care or behavior.

---
 src/main/resources/messages.properties        |  6 +-
 src/main/resources/messages_en.properties     |  6 +-
 src/main/resources/messages_fr.properties     |  6 +-
 .../webapp/vue/animal_cares_and_behaviors.jsp | 57 +++++++++++++++++--
 src/main/webapp/vue/animal_list.jsp           |  4 +-
 5 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 9c8c872..4719dd8 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -31,5 +31,7 @@ authentication.label.password=Password:
 authentication.placeholder.password=Password
 authentication.button.submit=Login
 animal_list.delete.modal_body=Do you want to delete this animal?
-animal_list.delete.modal_button_yes=Yes
-animal_list.delete.modal_button_no=No
+modal_button.delete=Delete
+modal_button.cancel=Cancel
+animal_cares_and_behaviors.delete.modal_body.behavior=Do you want to delete this behavior?
+animal_cares_and_behaviors.delete.modal_body.care=Do you want to delete this care?
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 46350fc..e59be89 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -31,5 +31,7 @@ authentication.label.password=Password:
 authentication.placeholder.password=Password
 authentication.button.submit=Login
 animal_list.delete.modal_body=Do you want to delete this animal?
-animal_list.delete.modal_button_yes=Yes
-animal_list.delete.modal_button_no=No
+modal_button.delete=Delete
+modal_button.cancel=Cancel
+animal_cares_and_behaviors.delete.modal_body.behavior=Do you want to delete this behavior?
+animal_cares_and_behaviors.delete.modal_body.care=Do you want to delete this care?
diff --git a/src/main/resources/messages_fr.properties b/src/main/resources/messages_fr.properties
index 4636052..7080044 100644
--- a/src/main/resources/messages_fr.properties
+++ b/src/main/resources/messages_fr.properties
@@ -31,5 +31,7 @@ authentication.label.password=Mot de passe :
 authentication.placeholder.password=Mot de passe
 authentication.button.submit=Connexion
 animal_list.delete.modal_body=Voulez-vous vraiment supprimer cet animal ?
-animal_list.delete.modal_button_yes=Oui
-animal_list.delete.modal_button_no=Non
+modal_button.delete=Supprimer
+modal_button.cancel=Annuler
+animal_cares_and_behaviors.delete.modal_body.behavior=Voulez-vous vraiment supprimer ce comportement ?
+animal_cares_and_behaviors.delete.modal_body.care=Voulez-vous vraiment supprimer ce soin ?
diff --git a/src/main/webapp/vue/animal_cares_and_behaviors.jsp b/src/main/webapp/vue/animal_cares_and_behaviors.jsp
index a6b4c24..48cf5e0 100644
--- a/src/main/webapp/vue/animal_cares_and_behaviors.jsp
+++ b/src/main/webapp/vue/animal_cares_and_behaviors.jsp
@@ -49,6 +49,7 @@
                                     <div class="col-lg-12">
                                         ${care.getName()}
                                         <form class="pull-right" action="${animalDeleteCareURL}/${care.getId()}" method="POST">
+                                            <input value="${care.getName()}" hidden />
                                             <button class="btn btn-danger" type="submit" data-toggle="tooltip" data-placement="bottom" title="Suppression"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
                                         </form>
                                     </div>
@@ -81,6 +82,7 @@
                                     <div class="col-lg-12">
                                         ${consentBehavior.getName()}
                                         <form class="pull-right" action="${animalDeleteConsentBehaviorURL}/${consentBehavior.getId()}" method="POST">
+                                            <input value="${consentBehavior.getName()}" hidden />
                                             <button class="btn btn-danger" type="submit" data-toggle="tooltip" data-placement="bottom" title="Suppression"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
                                         </form>
                                     </div>
@@ -104,11 +106,56 @@
 
             <%@ include file="base/footer.jsp" %>
         </div>
-    </body>
 
-    <script type="text/javascript">
-        $(document).ready(function () {
-            $('[data-toggle="tooltip"]').tooltip();
-        });
+
+        <div id="modal_delete_animal_care_or_behavior" class="modal fade" role="dialog">
+            <div class="modal-dialog">
+
+                <!-- Modal content-->
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        <h4 id="modal_delete_animal_care_or_behavior_title" class="modal-title"></h4>
+                    </div>
+                    <div class="modal-body">
+                        <p id="modal_delete_animal_care_or_behavior_body"></p>
+                    </div>
+                    <div class="modal-footer">
+                        <form id="modal_delete_animal_care_or_behavior_validate_delete" class="pull-right" action="" method="POST">
+                            <button type="button" class="btn btn-default" data-dismiss="modal"><fmt:message key="modal_button.cancel"></fmt:message></button>
+                            <button type="submit" class="btn btn-danger"><fmt:message key="modal_button.delete"></fmt:message></button>
+                            </form>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </body>
+
+        <script type="text/javascript">
+            $(document).ready(function () {
+                $('[data-toggle="tooltip"]').tooltip();
+
+                $("form").submit(function (event) {
+                    if ($(this).attr('id') !== 'modal_delete_animal_care_or_behavior_validate_delete') {
+                        var formUrl = $(this).attr('action');
+                        if (formUrl.startsWith('${animalDeleteCareURL}') || formUrl.startsWith('${animalDeleteConsentBehaviorURL}')) {
+                            // Only for deleting care or behavior forms
+                            var careOrBehaviorName = $(this).find('input')[0].value;
+                            $('#modal_delete_animal_care_or_behavior_title').text(careOrBehaviorName);
+                            $('#modal_delete_animal_care_or_behavior_validate_delete').attr('action', formUrl);
+                            if (formUrl.startsWith('${animalDeleteCareURL}')) {
+                                $('#modal_delete_animal_care_or_behavior_body').text('<fmt:message key="animal_cares_and_behaviors.delete.modal_body.care"></fmt:message>');
+                            } else if (formUrl.startsWith('${animalDeleteConsentBehaviorURL}')) {
+                                $('#modal_delete_animal_care_or_behavior_body').text('<fmt:message key="animal_cares_and_behaviors.delete.modal_body.behavior"></fmt:message>');
+                            }
+                            $('#modal_delete_animal_care_or_behavior').modal({
+                                show: true
+                            });
+                            event.preventDefault();
+                        }
+                    }
+                });
+            });
     </script>
 </html>
diff --git a/src/main/webapp/vue/animal_list.jsp b/src/main/webapp/vue/animal_list.jsp
index eac05e7..5c79f27 100644
--- a/src/main/webapp/vue/animal_list.jsp
+++ b/src/main/webapp/vue/animal_list.jsp
@@ -111,9 +111,9 @@
                         </div>
                         <div class="modal-footer">
                             <form id="modal_delete_animal_validate_delete" class="pull-right" action="" method="POST">
-                            <button type="submit" class="btn btn-danger"><fmt:message key="animal_list.delete.modal_button_yes"></fmt:message></button>
+                                <button type="button" class="btn btn-default" data-dismiss="modal"><fmt:message key="modal_button.cancel"></fmt:message></button>
+                                <button type="submit" class="btn btn-danger"><fmt:message key="modal_button.delete"></fmt:message></button>
                             </form>
-                            <button type="button" class="btn btn-default" data-dismiss="modal"><fmt:message key="animal_list.delete.modal_button_no"></fmt:message></button>
                         </div>
                     </div>