diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py index afaa44edc..9414a26bf 100644 --- a/app/scodoc/sco_edit_ue.py +++ b/app/scodoc/sco_edit_ue.py @@ -25,9 +25,7 @@ # ############################################################################## -"""Ajout/Modification/Suppression UE - -""" +"""Ajout/Modification/Suppression UE""" import re diff --git a/app/static/css/scodoc97.css b/app/static/css/scodoc97.css index 3b6d3c78b..3c22c11f0 100644 --- a/app/static/css/scodoc97.css +++ b/app/static/css/scodoc97.css @@ -243,9 +243,10 @@ print { /*Mobile Navbar*/ #logo-scodoc { - --size: 48px; + /* base image : logo_rectangle.png 527x192 */ + --size: 64px; + height: calc(var(--size) / 2.744); width: var(--size); - height: var(--size); margin: 4px; cursor: pointer; } @@ -260,7 +261,7 @@ print { /* From https://css.glass */ background: rgba(255, 255, 255, 0.2); - border-radius: 16px; + border-radius: 0 0 16px 16px; box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1); backdrop-filter: blur(5px); -webkit-backdrop-filter: blur(5px); @@ -269,4 +270,10 @@ print { body { position: relative; +} + +.no-scroll { + overflow: hidden !important; + margin: 0 !important; + height: 100vh !important; } \ No newline at end of file diff --git a/app/static/css/scodoc9_mobile.css b/app/static/css/scodoc9_mobile.css new file mode 100644 index 000000000..d4b8c521f --- /dev/null +++ b/app/static/css/scodoc9_mobile.css @@ -0,0 +1,98 @@ +/* == Gestion des styles pour les mobiles == */ + +@media screen and (max-width: 768px) { + + /* <== Module Assiduité ==> */ + #ajout-assiduite-etud .description>textarea, + #ajout-justificatif-etud .raison>textarea { + width: 90%; + } + + #modimpl, + #moduleimpl_select { + max-width: 200px; + } + + #timeline { + flex-wrap: wrap-reverse; + } + + .time-buttons { + display: flex; + justify-content: space-evenly; + } + + #timeline .inputs { + flex-direction: row; + justify-content: space-evenly; + width: 100%; + padding: 8px; + } + + #timeline .inputs>input { + width: 100%; + text-align: center; + } + + .timeline-container .period-handle::before { + width: 40px !important; + height: 100% !important; + content: ""; + display: block; + background-color: red; + border-radius: 12px; + opacity: 0.5; + position: absolute; + top: 0; + + mix-blend-mode: color-dodge; + + } + + .timeline-container .period-handle.left::before { + transform: translateX(-50%); + left: 0; + } + + .timeline-container .period-handle.right::before { + transform: translateX(50%); + right: 0; + } + + .selectors .infos { + flex-direction: column; + } + + .selectors .infos .date-input { + display: flex; + flex-direction: row; + justify-content: space-evenly; + } + + .mass-selection { + flex-wrap: wrap; + } + + .etud_row { + grid-template-columns: 2% 20% auto 25% !important; + max-width: 350px; + gap: 8px; + } + + .etud_row .assiduites_bar { + grid-column: 4 !important; + grid-row: 1; + } + + .etud_row .btns_field.single { + grid-column: 3 !important; + grid-row: 1; + } + + .rbtn::before { + --size: 35px; + width: var(--size) !important; + height: var(--size) !important; + } + +} \ No newline at end of file diff --git a/app/static/icons/logo_rectangle.png b/app/static/icons/logo_rectangle.png new file mode 100644 index 000000000..99ab0a8fb Binary files /dev/null and b/app/static/icons/logo_rectangle.png differ diff --git a/app/templates/assiduites/pages/ajout_assiduite_etud.j2 b/app/templates/assiduites/pages/ajout_assiduite_etud.j2 index aa017568d..561f18cc7 100644 --- a/app/templates/assiduites/pages/ajout_assiduite_etud.j2 +++ b/app/templates/assiduites/pages/ajout_assiduite_etud.j2 @@ -95,8 +95,8 @@ div.submit > input { {{ render_field_errors(form, 'est_just') }} {# Description #} -
-
{{ form.description.label }}
+
+ {{ form.description.label }} {{ form.description() }} {{ render_field_errors(form, 'description') }}
diff --git a/app/templates/assiduites/pages/ajout_justificatif_etud.j2 b/app/templates/assiduites/pages/ajout_justificatif_etud.j2 index eafe71949..3aeba96a3 100644 --- a/app/templates/assiduites/pages/ajout_justificatif_etud.j2 +++ b/app/templates/assiduites/pages/ajout_justificatif_etud.j2 @@ -106,7 +106,7 @@ div.submit > input { {{ render_field_errors(form, 'etat') }}
{# Raison #} -
+
{% if (not justif) or can_view_justif_detail %}
{{ form.raison.label }}
{{ form.raison() }} diff --git a/app/templates/assiduites/pages/bilan_etud.j2 b/app/templates/assiduites/pages/bilan_etud.j2 index 74586c5ff..a2dafcd76 100644 --- a/app/templates/assiduites/pages/bilan_etud.j2 +++ b/app/templates/assiduites/pages/bilan_etud.j2 @@ -76,6 +76,7 @@ Bilan assiduité de {{sco.etud.nomprenom}} id="stats_date_debut" value="{{date_debut}}"> +
diff --git a/app/templates/assiduites/pages/calendrier_assi_etud.j2 b/app/templates/assiduites/pages/calendrier_assi_etud.j2 index 33275ba16..f5610ad76 100644 --- a/app/templates/assiduites/pages/calendrier_assi_etud.j2 +++ b/app/templates/assiduites/pages/calendrier_assi_etud.j2 @@ -15,12 +15,15 @@ Calendrier de l'assiduité

Assiduité de {{sco.etud.html_link_fiche()|safe}}

- - - + + +
@@ -86,15 +89,6 @@ Calendrier de l'assiduité max-width: var(--sco-content-max-width); } - .calendrier { - display: flex; - justify-content: center; - overflow-x: scroll; - border: 1px solid #444; - border-radius: 12px; - margin-bottom: 12px; - } - .assi_case { display: flex; width: 100%; diff --git a/app/templates/assiduites/pages/signal_assiduites_group.j2 b/app/templates/assiduites/pages/signal_assiduites_group.j2 index b939944a7..dc2ae4124 100644 --- a/app/templates/assiduites/pages/signal_assiduites_group.j2 +++ b/app/templates/assiduites/pages/signal_assiduites_group.j2 @@ -115,12 +115,18 @@ padding: 5px; border-radius: 5px; text-decoration: none; + z-index: 100; } html{ scroll-behavior: smooth !important; } + .date-input{ + display: flex; + gap: 4px; + } + {% endblock styles %} @@ -152,20 +158,22 @@
Groupes : {{grp|safe}}
-
- - +
+ +
+ +
+
-
{{timeline|safe}} -
+
diff --git a/app/templates/assiduites/widgets/tableau.j2 b/app/templates/assiduites/widgets/tableau.j2 index 77f6d8384..b03704093 100644 --- a/app/templates/assiduites/widgets/tableau.j2 +++ b/app/templates/assiduites/widgets/tableau.j2 @@ -58,7 +58,7 @@ {% if total_pages > 1 %} @@ -235,7 +235,30 @@ max-width: fit-content; } - .pagination li{ + .pagination li>*{ cursor: pointer; + + /*Style pour les boutons de pagination*/ + border: 1px solid #ccc; + background-color: #f1f1f1; + padding: 8px 16px; + font-size: 16px; + border-radius: 4px; + margin: 8px 1px; + + } + .pagination li:hover >a, .pagination li.active>*{ + /*Style pour les boutons actifs*/ + background-color: var(--sco-color-ues); + color: white !important; + + } + + .pagination li.disabled>*{ + /*Style pour les boutons désactivés*/ + opacity: 0.5; + cursor: default; + pointer-events: none; + user-select: none; } diff --git a/app/templates/assiduites/widgets/timeline.j2 b/app/templates/assiduites/widgets/timeline.j2 index eaac2b845..e16045f04 100644 --- a/app/templates/assiduites/widgets/timeline.j2 +++ b/app/templates/assiduites/widgets/timeline.j2 @@ -3,7 +3,7 @@
-
+
@@ -12,8 +12,6 @@
\ No newline at end of file