From 78d72d2d54a32005e34f60a6db42dfdfee0c3f69 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 13 Nov 2023 11:30:26 +0100 Subject: [PATCH] EDT: ajuste taille calendrier et plage horaire. --- app/static/css/edt.css | 11 +++++++++++ app/templates/formsemestre/edt.j2 | 6 +++--- app/views/notes_formsemestre.py | 8 +++++++- sco_version.py | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/static/css/edt.css b/app/static/css/edt.css index 79a3430b0..b0990d8f1 100644 --- a/app/static/css/edt.css +++ b/app/static/css/edt.css @@ -14,3 +14,14 @@ color: red; background-color: yellow; } + +.toastui-calendar-timegrid { + height: 100% !important; + min-height: auto !important; +} +.toastui-calendar-time{ + height: calc(100% - 44px) !important; +} +.toastui-calendar-week-view-day-names, .toastui-calendar-time { + overflow: hidden !important; +} diff --git a/app/templates/formsemestre/edt.j2 b/app/templates/formsemestre/edt.j2 index dc752a5d3..b6ee3ad90 100644 --- a/app/templates/formsemestre/edt.j2 +++ b/app/templates/formsemestre/edt.j2 @@ -13,7 +13,7 @@

Expérimental: emploi du temps

-
+
{% endblock app_content %} @@ -55,8 +55,8 @@ document.addEventListener('DOMContentLoaded', function() { week: { dayNames: [ "Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"], eventView: ['time'], - hourStart: 7, // TODO préférence - hourEnd:24, // TODO préférence + hourStart: {{ hour_start }}, + hourEnd: {{ hour_end }}, showNowIndicator: true, startDayOfWeek: 1, taskView: false, diff --git a/app/views/notes_formsemestre.py b/app/views/notes_formsemestre.py index 84d1509a7..4abfcb0a9 100644 --- a/app/views/notes_formsemestre.py +++ b/app/views/notes_formsemestre.py @@ -38,7 +38,7 @@ from app.decorators import ( permission_required, ) from app.forms.formsemestre import change_formation, edit_modimpls_codes_apo -from app.models import Formation, FormSemestre +from app.models import Formation, FormSemestre, ScoDocSiteConfig from app.scodoc import sco_formations, sco_formation_versions from app.scodoc.sco_permissions import Permission from app.views import notes_bp as bp @@ -158,8 +158,14 @@ def formsemestre_edit_modimpls_codes(formsemestre_id: int): def formsemestre_edt(formsemestre_id: int): """Expérimental: affiche emploi du temps du semestre""" formsemestre = FormSemestre.get_formsemestre(formsemestre_id) + cfg = ScoDocSiteConfig.query.filter_by(name="assi_morning_time").first() + hour_start = cfg.value.split(":")[0].lstrip(" 0") if cfg else "7" + cfg = ScoDocSiteConfig.query.filter_by(name="assi_afternoon_time").first() + hour_end = cfg.value.split(":")[0].lstrip(" 0") if cfg else "18" return render_template( "formsemestre/edt.j2", formsemestre=formsemestre, + hour_start=hour_start, + hour_end=hour_end, sco=ScoData(formsemestre=formsemestre), ) diff --git a/sco_version.py b/sco_version.py index 08f5d05eb..1fd49c111 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.6.52" +SCOVERSION = "9.6.53" SCONAME = "ScoDoc"