From 70cda5a553fe105f8e6c75b47aebb589ce95cf84 Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Wed, 26 Jul 2023 07:32:32 +0200
Subject: [PATCH] =?UTF-8?q?Assiduites=20:=20lisibilit=C3=A9=20conflit=20+?=
 =?UTF-8?q?=20UX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/static/css/assiduites.css                | 2 +-
 app/templates/assiduites/widgets/conflict.j2 | 6 ++++--
 app/templates/assiduites/widgets/prompt.j2   | 5 +++--
 app/views/assiduites.py                      | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/static/css/assiduites.css b/app/static/css/assiduites.css
index f3d1c9d75d..e93f63abb9 100644
--- a/app/static/css/assiduites.css
+++ b/app/static/css/assiduites.css
@@ -315,7 +315,7 @@
     padding: 20px;
     border: 1px solid #888;
     width: 80%;
-    height: 40%;
+    height: 320px;
     position: relative;
     border-radius: 10px;
 
diff --git a/app/templates/assiduites/widgets/conflict.j2 b/app/templates/assiduites/widgets/conflict.j2
index 5642a433d8..c87c3fbc29 100644
--- a/app/templates/assiduites/widgets/conflict.j2
+++ b/app/templates/assiduites/widgets/conflict.j2
@@ -129,6 +129,7 @@
                         </div>
 
                         <div class="action-buttons">
+                            <button id="finish" class="btnPrompt">Terminer la résolution</button>
                             <button id="delete" class="btnPrompt" disabled>Supprimer</button>
                             <button id="split" class="btnPrompt" disabled>Séparer</button>
                             <button id="edit" class="btnPrompt" disabled>Modifier l'état</button>
@@ -157,6 +158,7 @@
             this.deleteBtn.addEventListener('click', () => { this.deleteAssiduiteModal() });
             this.editBtn.addEventListener('click', () => { this.editAssiduiteModal() });
             this.splitBtn.addEventListener('click', () => { this.splitAssiduiteModal() });
+            document.querySelector("#myModal #finish").addEventListener('click', () => { this.close() })
 
             document.querySelector('#myModal .close').addEventListener('click', () => { this.close() })
 
@@ -311,7 +313,7 @@
                 }
             };
 
-            openPromptModal("Entrée demandée", fieldSet, success, () => { }, "#37f05f");
+            openPromptModal("Séparation de l'assiduité sélectionnée", fieldSet, success, () => { }, "#23aa40");
         }
 
         /**
@@ -355,7 +357,7 @@
             };
 
             //Affichage du prompt
-            openPromptModal("Entrée demandée", fieldSet, success, () => { }, "#37f05f");
+            openPromptModal("Modification de l'état de l'assiduité sélectionnée", fieldSet, success, () => { }, "#23aa40");
         }
 
         /**
diff --git a/app/templates/assiduites/widgets/prompt.j2 b/app/templates/assiduites/widgets/prompt.j2
index 991d153d23..7be61d4c08 100644
--- a/app/templates/assiduites/widgets/prompt.j2
+++ b/app/templates/assiduites/widgets/prompt.j2
@@ -149,9 +149,10 @@
     }
 
     .btnPrompt:disabled {
-        opacity: 0.7;
+        color: black;
+        opacity: 0.8;
         background-color: whitesmoke;
-        background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, rgba(81, 81, 81, 0.61) 5px, rgba(81, 81, 81, 0.61) 10px)
+        background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, rgba(81, 81, 81, 0.337) 5px, rgba(81, 81, 81, 0.337) 10px)
     }
 </style>
 
diff --git a/app/views/assiduites.py b/app/views/assiduites.py
index eb5896bce9..77bcc938b5 100644
--- a/app/views/assiduites.py
+++ b/app/views/assiduites.py
@@ -935,6 +935,6 @@ def _get_etuds_dem_def(formsemestre):
         json_str += template.replace("£", str(etud[0])).replace("$", etud[1])
 
     if json_str != "{":
-        json_str = json_str[:-1] + "}"
+        json_str = json_str[:-1]
 
-    return json_str
+    return json_str + "}"