From 94f1e24d3676db4df3eb07b42c88e71c17b8f80c Mon Sep 17 00:00:00 2001
From: Arthur ZHU <arthur.zhu38@gmail.com>
Date: Tue, 26 Apr 2022 20:21:56 +0200
Subject: [PATCH] ajout bouton retirer sur les formulaires

---
 app/entreprises/forms.py                        |  2 +-
 app/static/css/entreprises.css                  |  5 +++++
 .../entreprises/ajout_correspondants.html       | 17 ++++++++++++++++-
 app/templates/entreprises/envoi_offre_form.html | 17 ++++++++++++++++-
 app/templates/entreprises/form.html             |  6 +++---
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/entreprises/forms.py b/app/entreprises/forms.py
index 33b5c22de..a16190070 100644
--- a/app/entreprises/forms.py
+++ b/app/entreprises/forms.py
@@ -339,7 +339,7 @@ class CorrespondantsCreationForm(FlaskForm):
 
         correspondant_list = []
         for entry in self.correspondants.entries:
-            if entry.nom.data.strip() and entry.prenom.data.strip():
+            if entry.nom.data and entry.prenom.data:
                 if (
                     entry.nom.data.strip(),
                     entry.prenom.data.strip(),
diff --git a/app/static/css/entreprises.css b/app/static/css/entreprises.css
index 436288666..0ede866cb 100644
--- a/app/static/css/entreprises.css
+++ b/app/static/css/entreprises.css
@@ -40,6 +40,11 @@
     *background-color: #151515;
 }
 
+.btn-remove {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
 .fiche-entreprise .btn {
     margin-top: 5px;
     margin-bottom: 5px;
diff --git a/app/templates/entreprises/ajout_correspondants.html b/app/templates/entreprises/ajout_correspondants.html
index be8e5cc81..18070b7fc 100644
--- a/app/templates/entreprises/ajout_correspondants.html
+++ b/app/templates/entreprises/ajout_correspondants.html
@@ -35,6 +35,14 @@
     </div>
 
     <script>
+        let allCorrepondantsFieldWrapper = document.getElementById('correspondants');
+        let allCorrepondantsForm = allCorrepondantsFieldWrapper.getElementsByTagName('li');
+        for(let i = 0; i < allCorrepondantsForm.length; i++) {
+            let form_id = allCorrepondantsForm[i].getElementsByTagName('table')[0].id
+            if(form_id.split('-')[1] != 0)
+                allCorrepondantsForm[i].insertAdjacentHTML('beforeend', `<div class="btn btn-default btn-remove" onclick="deleteForm('${form_id}')">Retirer ce correspondant</div>`)
+        }
+
         window.onload = function(e) {
             let addCorrespondantFieldBtn = document.getElementById('add-correspondant-field');
             addCorrespondantFieldBtn.addEventListener('click', function(e){
@@ -48,9 +56,16 @@
                 }
                 let newFieldName = `correspondants-${Math.max(...correspondantInputIds) + 1}`;
                 allCorrepondantsFieldWrapper.insertAdjacentHTML('beforeend',`
-                <li><label for="${newFieldName}">Correspondants-${Math.max(...correspondantInputIds) + 1}</label> <table id="${newFieldName}"><tr><th><label for="${newFieldName}-civilite">Civilité (*)</label></th><td><select class="form-control" id="${newFieldName}-civilite" name="${newFieldName}-civilite" required><option value="H">Monsieur</option><option value="F">Madame</option></select></td></tr><tr><th><label for="${newFieldName}-nom">Nom (*)</label></th><td><input class="form-control" id="${newFieldName}-nom" name="${newFieldName}-nom" required type="text" value=""></td></tr><tr><th><label for="${newFieldName}-prenom">Prénom (*)</label></th><td><input class="form-control" id="${newFieldName}-prenom" name="${newFieldName}-prenom" required type="text" value=""></td></tr><tr><th><label for="${newFieldName}-telephone">Téléphone (*)</label></th><td><input class="form-control" id="${newFieldName}-telephone" name="${newFieldName}-telephone" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-mail">Mail (*)</label></th><td><input class="form-control" id="${newFieldName}-mail" name="${newFieldName}-mail" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-poste">Poste</label></th><td><input class="form-control" id="${newFieldName}-poste" name="${newFieldName}-poste" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-service">Service</label></th><td><input class="form-control" id="${newFieldName}-service" name="${newFieldName}-service" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-origine">Origine</label></th><td><input class="form-control" id="${newFieldName}-origine" name="${newFieldName}-origine" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-notes">Notes</label></th><td><input class="form-control" id="${newFieldName}-notes" name="${newFieldName}-notes" type="text" value=""></td></tr></table><input id="${newFieldName}-csrf_token" name="${newFieldName}-csrf_token" type="hidden" value=${csrf_token}></li>
+                <li><label for="${newFieldName}">Correspondants-${Math.max(...correspondantInputIds) + 1}</label><table id="${newFieldName}"><tr><th><label for="${newFieldName}-civilite">Civilité (*)</label></th><td><select class="form-control" id="${newFieldName}-civilite" name="${newFieldName}-civilite" required><option value="H">Monsieur</option><option value="F">Madame</option></select></td></tr><tr><th><label for="${newFieldName}-nom">Nom (*)</label></th><td><input class="form-control" id="${newFieldName}-nom" name="${newFieldName}-nom" required type="text" value=""></td></tr><tr><th><label for="${newFieldName}-prenom">Prénom (*)</label></th><td><input class="form-control" id="${newFieldName}-prenom" name="${newFieldName}-prenom" required type="text" value=""></td></tr><tr><th><label for="${newFieldName}-telephone">Téléphone (*)</label></th><td><input class="form-control" id="${newFieldName}-telephone" name="${newFieldName}-telephone" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-mail">Mail (*)</label></th><td><input class="form-control" id="${newFieldName}-mail" name="${newFieldName}-mail" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-poste">Poste</label></th><td><input class="form-control" id="${newFieldName}-poste" name="${newFieldName}-poste" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-service">Service</label></th><td><input class="form-control" id="${newFieldName}-service" name="${newFieldName}-service" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-origine">Origine</label></th><td><input class="form-control" id="${newFieldName}-origine" name="${newFieldName}-origine" type="text" value=""></td></tr><tr><th><label for="${newFieldName}-notes">Notes</label></th><td><input class="form-control" id="${newFieldName}-notes" name="${newFieldName}-notes" type="text" value=""></td></tr></table><input id="${newFieldName}-csrf_token" name="${newFieldName}-csrf_token" type="hidden" value=${csrf_token}><div class="btn btn-default btn-remove" onclick="deleteForm('${newFieldName}')">Retirer ce correspondant</div></li>
                 `);
             });
         }
+
+        function deleteForm(x) {
+            var li_form = document.querySelector(`label[for=${x}]`).closest('li');
+            if (li_form) {
+                li_form.remove()
+            }
+        }
     </script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/entreprises/envoi_offre_form.html b/app/templates/entreprises/envoi_offre_form.html
index ca5ba131e..6ead6477d 100644
--- a/app/templates/entreprises/envoi_offre_form.html
+++ b/app/templates/entreprises/envoi_offre_form.html
@@ -36,6 +36,14 @@
     </div>
     
     <script>
+        let allResponsablesFieldWrapper = document.getElementById('responsables');
+        let allResponsablesField = allResponsablesFieldWrapper.getElementsByTagName('li');
+        for(let i = 0; i < allResponsablesField.length; i++) {
+            let form_id = allResponsablesField[i].getElementsByTagName('input')[0].id
+            if(form_id.split('-')[1] != 0)
+                allResponsablesField[i].insertAdjacentHTML('beforeend', `<div class="btn btn-default btn-remove" onclick="deleteForm('${form_id}')">Retirer</div>`)
+        }
+
         window.onload = function(e) {
             var responsables_options = {
                 script: "/ScoDoc/entreprises/responsables?",
@@ -63,10 +71,17 @@
                 }
                 let newFieldName = `responsables-${Math.max(...responsableInputIds) + 1}`;
                 allResponsablesFieldWrapper.insertAdjacentHTML('beforeend',`
-                <li><label for="${newFieldName}">Responsable (*)</label> <input class="form-control" id="${newFieldName}" name="${newFieldName}" type="text" value="" placeholder="Tapez le nom du responsable de formation"></li> 
+                <li><label for="${newFieldName}">Responsable (*)</label><input class="form-control" id="${newFieldName}" name="${newFieldName}" type="text" value="" placeholder="Tapez le nom du responsable de formation"><div class="btn btn-default btn-remove" onclick="deleteForm('${newFieldName}')">Retirer</div></li> 
                 `);
                 var as_r = new bsn.AutoSuggest(newFieldName, responsables_options);
             });
         }
+
+        function deleteForm(x) {
+            var li_form = document.querySelector(`label[for=${x}]`).closest('li');
+            if (li_form) {
+                li_form.remove()
+            }
+        }
     </script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/entreprises/form.html b/app/templates/entreprises/form.html
index fe51a97b4..067f4a508 100644
--- a/app/templates/entreprises/form.html
+++ b/app/templates/entreprises/form.html
@@ -23,15 +23,15 @@
     <script>
         {# pour les formulaires offre #}
         var champ_depts = document.getElementById("depts")
-        if (champ_depts !== null) {
+        if (champ_depts) {
             var closest_form_control = champ_depts.closest(".form-control")
             closest_form_control.classList.remove("form-control")
         }
 
-        if(document.getElementById("expiration_date") !== null && document.getElementById("expiration_date").value === "")
+        if(document.getElementById("expiration_date") && document.getElementById("expiration_date").value === "")
             expiration()
 
-        if(document.getElementById("type_offre") !== null)
+        if(document.getElementById("type_offre"))
             document.getElementById("type_offre").addEventListener("change", expiration);
 
         function expiration() {