From 68361ac92b06039de906749ff9241a081eaebaf3 Mon Sep 17 00:00:00 2001
From: Thomas Forgione <thomas@forgione.fr>
Date: Fri, 30 Aug 2024 14:17:42 +0200
Subject: [PATCH] Delete modal for delete object

---
 archive.py            |  1 -
 db.py                 |  1 -
 templates/object.html | 36 ++++++++++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/archive.py b/archive.py
index a3377d8..28ac5ec 100644
--- a/archive.py
+++ b/archive.py
@@ -382,7 +382,6 @@ class ZipSender(ArchiveSender):
 
                         current_byte += len(bytes)
                         yield bytes
-                        time.sleep(1)
 
             central_directory_size = 0
             centra_directory_offset = current_byte
diff --git a/db.py b/db.py
index e29a497..c79c9f8 100755
--- a/db.py
+++ b/db.py
@@ -244,7 +244,6 @@ class Object:
     def all_by_project(db: sqlite3.Connection) -> list[Project]:
         objects = [x.full(db) for x in Object.all(db)]
         objects_by_projects = itertools.groupby(objects, lambda x: x.project)
-        # print(dict(objects_by_projects))
         return list(map(lambda x: Project(x[0], list(x[1])), objects_by_projects))
 
     def add_acquisition(self, calibration_id: int, db: sqlite3.Connection) -> Acquisition:
diff --git a/templates/object.html b/templates/object.html
index b64936a..e3fc765 100644
--- a/templates/object.html
+++ b/templates/object.html
@@ -42,7 +42,7 @@
             </div>
             {% endif %}
             <div class="control">
-                <a href="/object/delete/{{ object.id }}" class="button is-danger">Supprimer cet objet</a>
+                <span id="delete-object" class="button is-danger">Supprimer cet objet</a>
             </div>
         </div>
 
@@ -64,25 +64,49 @@
                 <button class="modal-close is-large" aria-label="close"></button>
             </div>
         {% endif %}
+        <div id="delete-modal" class="modal">
+            <div class="modal-background"></div>
+                <div class="modal-content">
+                    <div class="has-text-centered mb-3">Voulez-vous vraiment supprimer l'objet ?</div>
+                    <div class="field is-grouped is-grouped-centered">
+                        <div class="control">
+                            <button class="button custom-modal-close">Annuler</a>
+                        </div>
+                        <div class="control">
+                            <a href="/object/delete/{{ object.id }}" class="button is-danger">Supprimer cet objet</a>
+                        </div>
+                    </div>
+            </div>
+            <button class="modal-close is-large" aria-label="close"></button>
+        </div>
     </div>
 </section>
 {% endblock content %}
 
 {% block extrajs %}{% if calibration.state < CalibrationState.IsValidated %}
 <script>
-    let modal = document.getElementById('calibration-modal');
     document.getElementById('scan').addEventListener('click', () => {
+        let modal = document.getElementById('calibration-modal');
         modal.classList.add('is-active');
     });
-    (document.querySelectorAll('.modal-background, .modal-close, .modal-card-head .delete, .modal-card-foot .button') || []).forEach((close) => {
-        close.addEventListener('click', () => {
-            modal.classList.remove('is-active');
-        });
+
+    document.getElementById('delete-object').addEventListener('click', () => {
+        let modal = document.getElementById('delete-modal');
+        modal.classList.add('is-active');
     });
+
     document.getElementById('use-last-calibration-button').addEventListener('click', async () => {
         let resp = await fetch('/api/use-last-calibration');
         await resp.text();
         window.location.href = '/scan/{{ object.id }}';
     });
+
+    (document.querySelectorAll('.modal-background, .modal-close, .custom-modal-close, .modal-card-head .delete, .modal-card-foot .button') || []).forEach((close) => {
+        close.addEventListener('click', () => {
+            for (let modal of document.querySelectorAll('#calibration-modal, #delete-modal')) {
+                modal.classList.remove('is-active');
+            }
+        });
+    });
 </script>
 {% endif %}{% endblock %}