From 0cafc0b1841b3f3d24fe1af44f17def9fe85036a Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 16 Jan 2024 12:36:20 +0100
Subject: [PATCH] Ajoute timepicker partout. Utilise pour evaluation_edit. Fix
 #829

---
 app/models/evaluations.py                     | 18 ++++----------
 app/scodoc/TrivialFormulator.py               |  5 ++++
 app/scodoc/html_sco_header.py                 | 24 ++++++++++++++-----
 app/scodoc/sco_evaluation_edit.py             |  9 +++----
 app/scodoc/sco_moduleimpl_status.py           |  1 +
 .../assiduites/pages/ajout_assiduite_etud.j2  | 15 +-----------
 .../assiduites/pages/ajout_assiduites.j2      | 13 +---------
 .../pages/ajout_justificatif_etud.j2          | 15 +-----------
 app/templates/assiduites/pages/choix_date.j2  |  9 -------
 app/templates/sco_page.j2                     |  3 +++
 app/templates/sco_timepicker.j2               | 12 ++++++++++
 11 files changed, 49 insertions(+), 75 deletions(-)
 create mode 100644 app/templates/sco_timepicker.j2

diff --git a/app/models/evaluations.py b/app/models/evaluations.py
index 3dcac667..0c7d1213 100644
--- a/app/models/evaluations.py
+++ b/app/models/evaluations.py
@@ -584,20 +584,10 @@ def check_convert_evaluation_args(moduleimpl: "ModuleImpl", data: dict):
     if date_debut and date_fin:
         duration = data["date_fin"] - data["date_debut"]
         if duration.total_seconds() < 0 or duration > MAX_EVALUATION_DURATION:
-            raise ScoValueError("Heures de l'évaluation incohérentes !")
-    # # --- heures
-    # heure_debut = data.get("heure_debut", None)
-    # if heure_debut and not isinstance(heure_debut, datetime.time):
-    #     if date_format == "dmy":
-    #         data["heure_debut"] = heure_to_time(heure_debut)
-    #     else:  # ISO
-    #         data["heure_debut"] = datetime.time.fromisoformat(heure_debut)
-    # heure_fin = data.get("heure_fin", None)
-    # if heure_fin and not isinstance(heure_fin, datetime.time):
-    #     if date_format == "dmy":
-    #         data["heure_fin"] = heure_to_time(heure_fin)
-    #     else:  # ISO
-    #         data["heure_fin"] = datetime.time.fromisoformat(heure_fin)
+            raise ScoValueError(
+                "Heures de l'évaluation incohérentes !",
+                dest_url="javascript:history.back();",
+            )
 
 
 def heure_to_time(heure: str) -> datetime.time:
diff --git a/app/scodoc/TrivialFormulator.py b/app/scodoc/TrivialFormulator.py
index de061800..944566a0 100644
--- a/app/scodoc/TrivialFormulator.py
+++ b/app/scodoc/TrivialFormulator.py
@@ -685,6 +685,11 @@ class TF(object):
                     '<input type="text" name="%s" size="10" value="%s" class="datepicker">'
                     % (field, values[field])
                 )
+            elif input_type == "time":  # JavaScript widget for date input
+                lem.append(
+                    f"""<input type="text" name="{field}" maxlength="5" size="5" value="{
+                        values[field]}" class="timepicker">"""
+                )
             elif input_type == "text_suggest":
                 lem.append(
                     '<input type="text" name="%s" id="%s" size="%d" %s'
diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py
index 886f0cf4..2e06370a 100644
--- a/app/scodoc/html_sco_header.py
+++ b/app/scodoc/html_sco_header.py
@@ -189,7 +189,12 @@ def sco_header(
     # jQuery UI
     # can modify loaded theme here
     H.append(
-        f'<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/css/smoothness/jquery-ui-1.10.4.custom.min.css" />\n'
+        f"""
+        <link type="text/css" rel="stylesheet"
+            href="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/css/smoothness/jquery-ui-1.10.4.custom.min.css" />
+        <link type="text/css" rel="stylesheet"
+            href="{scu.STATIC_DIR}/libjs/timepicker-1.3.5/jquery.timepicker.min.css" />
+        """
     )
     if init_google_maps:
         # It may be necessary to add an API key:
@@ -219,19 +224,26 @@ def sco_header(
 
     # jQuery
     H.append(
-        f"""<script src="{scu.STATIC_DIR}/jQuery/jquery.js"></script>
-    <script src="{scu.STATIC_DIR}/libjs/jquery.field.min.js"></script>"""
+        f"""
+    <script src="{scu.STATIC_DIR}/jQuery/jquery.js"></script>
+    <script src="{scu.STATIC_DIR}/libjs/jquery.field.min.js"></script>
+    """
     )
     # qTip
     if init_qtip:
         H.append(
             f"""<script src="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
-        <link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.css" />"""
+        <link type="text/css" rel="stylesheet"
+            href="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
+        """
         )
 
     H.append(
-        f"""<script src="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
-        <script src="{scu.STATIC_DIR}/js/scodoc.js"></script>"""
+        f"""<script
+        src="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
+        <script src="{scu.STATIC_DIR}/libjs/timepicker-1.3.5/jquery.timepicker.min.js"></script>
+        <script src="{scu.STATIC_DIR}/js/scodoc.js"></script>
+        """
     )
     if init_google_maps:
         H.append(
diff --git a/app/scodoc/sco_evaluation_edit.py b/app/scodoc/sco_evaluation_edit.py
index 9e0c487f..9b5c716f 100644
--- a/app/scodoc/sco_evaluation_edit.py
+++ b/app/scodoc/sco_evaluation_edit.py
@@ -178,9 +178,7 @@ def evaluation_create_form(
             {
                 "title": "Heure de début",
                 "explanation": "heure du début de l'épreuve",
-                "input_type": "menu",
-                "allowed_values": heures,
-                "labels": heures,
+                "input_type": "time",
             },
         ),
         (
@@ -188,9 +186,7 @@ def evaluation_create_form(
             {
                 "title": "Heure de fin",
                 "explanation": "heure de fin de l'épreuve",
-                "input_type": "menu",
-                "allowed_values": heures,
-                "labels": heures,
+                "input_type": "time",
             },
         ),
     ]
@@ -335,6 +331,7 @@ def evaluation_create_form(
             + "\n"
             + tf[1]
             + render_template("scodoc/help/evaluations.j2", is_apc=is_apc)
+            + render_template("sco_timepicker.j2")
             + html_sco_header.sco_footer()
         )
     elif tf[0] == -1:
diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py
index d3f83c28..5f01a3bf 100644
--- a/app/scodoc/sco_moduleimpl_status.py
+++ b/app/scodoc/sco_moduleimpl_status.py
@@ -167,6 +167,7 @@ def _ue_coefs_html(coefs_lst) -> str:
                     {'background-color: ' + ue.color + ';' if ue.color else ''}
                     "><div>{coef}</div>{ue.acronyme}</div>"""
                     for ue, coef in coefs_lst
+                    if coef > 0
                 ]
             )
             + "</div>"
diff --git a/app/templates/assiduites/pages/ajout_assiduite_etud.j2 b/app/templates/assiduites/pages/ajout_assiduite_etud.j2
index cdc3dc7c..260ba5e4 100644
--- a/app/templates/assiduites/pages/ajout_assiduite_etud.j2
+++ b/app/templates/assiduites/pages/ajout_assiduite_etud.j2
@@ -6,7 +6,6 @@
 
 {% block styles %}
     {{super()}}
-    <link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.css"/>
     <link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/assiduites.css">
 {% endblock %}
 
@@ -114,19 +113,7 @@ div.submit > input {
 
 {% block scripts %}
 {{ super() }}
-<script src="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.js"></script>
 <script src="{{scu.STATIC_DIR}}/js/assiduites.js"></script>
 <script src="{{scu.STATIC_DIR}}/js/etud_info.js"></script>
-<script>
-$('.timepicker').timepicker({
-    timeFormat: 'HH:mm',
-    interval: {{ scu.get_assiduites_time_config("assi_tick_time") }},
-    minTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
-    maxTime: "{{ scu.get_assiduites_time_config("assi_afternoon_time") }}",
-    startTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
-    dynamic: false,
-    dropdown: true,
-    scrollbar: false
-});
-</script>
+{% include "sco_timepicker.j2" %}
 {% endblock scripts %}
diff --git a/app/templates/assiduites/pages/ajout_assiduites.j2 b/app/templates/assiduites/pages/ajout_assiduites.j2
index 9326d930..85b7697a 100644
--- a/app/templates/assiduites/pages/ajout_assiduites.j2
+++ b/app/templates/assiduites/pages/ajout_assiduites.j2
@@ -97,19 +97,8 @@
         color: var(--color-error);
     }
 </style>
+{% include "sco_timepicker.j2" %}
 <script>
-    $('.timepicker').timepicker({
-        timeFormat: 'HH:mm',
-        interval: {{ scu.get_assiduites_time_config("assi_tick_time") }},
-        minTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
-        maxTime: "{{ scu.get_assiduites_time_config("assi_afternoon_time") }}",
-        defaultTime: 'now',
-        startTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
-        dynamic: false,
-        dropdown: true,
-        scrollbar: false
-    });
-
     function validateFields() {
         const field = document.querySelector('.assi-form')
         const { deb, fin } = getDates()
diff --git a/app/templates/assiduites/pages/ajout_justificatif_etud.j2 b/app/templates/assiduites/pages/ajout_justificatif_etud.j2
index 6848cf2a..61bd3197 100644
--- a/app/templates/assiduites/pages/ajout_justificatif_etud.j2
+++ b/app/templates/assiduites/pages/ajout_justificatif_etud.j2
@@ -5,7 +5,6 @@ Si justif, edit #}
 
 {% block styles %}
     {{super()}}
-    <link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.css"/>
     <link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/assiduites.css">
 {% endblock %}
 
@@ -126,21 +125,9 @@ div.submit > input {
 
 {% block scripts %}
 {{ super() }}
-<script src="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.js"></script>
 <script src="{{scu.STATIC_DIR}}/js/assiduites.js"></script>
 <script src="{{scu.STATIC_DIR}}/js/etud_info.js"></script>
-<script>
-$('.timepicker').timepicker({
-    timeFormat: 'HH:mm',
-    interval: {{ scu.get_assiduites_time_config("assi_tick_time") }},
-    minTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
-    maxTime: "{{ scu.get_assiduites_time_config("assi_afternoon_time") }}",
-    startTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
-    dynamic: false,
-    dropdown: true,
-    scrollbar: false
-});
-</script>
+{% include "sco_timepicker.j2" %}
 <script>
 document.addEventListener("DOMContentLoaded", function() {
     // Suppression d'un fichier justificatif
diff --git a/app/templates/assiduites/pages/choix_date.j2 b/app/templates/assiduites/pages/choix_date.j2
index d743ac15..684dddd2 100644
--- a/app/templates/assiduites/pages/choix_date.j2
+++ b/app/templates/assiduites/pages/choix_date.j2
@@ -1,11 +1,6 @@
 {% extends "sco_page.j2" %}
 {% import 'wtf.j2' as wtf %}
 
-{% block styles %}
-    {{super()}}
-    <link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.css"/>
-{% endblock %}
-
 {% block app_content %}
     {% for err_msg in form.error_messages %}
         <div class="wtf-error-messages">
@@ -24,7 +19,3 @@
     </form>
 
 {% endblock app_content %}
-{% block scripts %}
-{{ super() }}
-<script src="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.js"></script>
-{% endblock scripts %}
\ No newline at end of file
diff --git a/app/templates/sco_page.j2 b/app/templates/sco_page.j2
index 67ab61b3..f2bc9425 100644
--- a/app/templates/sco_page.j2
+++ b/app/templates/sco_page.j2
@@ -5,6 +5,8 @@
 {{super()}}
 <link type="text/css" rel="stylesheet"
     href="{{scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/css/smoothness/jquery-ui-1.10.4.custom.min.css" />
+<link type="text/css" rel="stylesheet"
+            href="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.css" />
 <link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/scodoc.css">
 <link href="{{scu.STATIC_DIR}}/css/menu.css" rel="stylesheet" type="text/css" />
 <link href="{{scu.STATIC_DIR}}/css/gt_table.css" rel="stylesheet" type="text/css" />
@@ -45,6 +47,7 @@
 <script src="{{scu.STATIC_DIR}}/jQuery/jquery-migrate-1.2.0.min.js"></script>
 <script src="{{scu.STATIC_DIR}}/libjs/jquery.field.min.js"></script>
 <script src="{{scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
+<script src="{{scu.STATIC_DIR}}/libjs/timepicker-1.3.5/jquery.timepicker.min.js"></script>
 <script src="{{scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
 
 <script src="{{scu.STATIC_DIR}}/js/scodoc.js"></script>
diff --git a/app/templates/sco_timepicker.j2 b/app/templates/sco_timepicker.j2
new file mode 100644
index 00000000..de0e0123
--- /dev/null
+++ b/app/templates/sco_timepicker.j2
@@ -0,0 +1,12 @@
+<script>
+$('.timepicker').timepicker({
+    timeFormat: 'HH:mm',
+    interval: {{ scu.get_assiduites_time_config("assi_tick_time") }},
+    minTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
+    maxTime: "{{ scu.get_assiduites_time_config("assi_afternoon_time") }}",
+    startTime: "{{ scu.get_assiduites_time_config("assi_morning_time") }}",
+    dynamic: false,
+    dropdown: true,
+    scrollbar: false
+});
+</script>