opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +22 -5
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78d72d2d54 - Show all commits

11
app/static/css/edt.css
View File

@ -14,3 +14,14 @@
color: red; color: red;
background-color: yellow; 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;
}

6
app/templates/formsemestre/edt.j2
View File

@ -13,7 +13,7 @@
<div class="tab-content"> <div class="tab-content">
<h2>Expérimental: emploi du temps</h2> <h2>Expérimental: emploi du temps</h2>
<div id="calendar" style="height: 900px;"></div> <div id="calendar" style="height: calc(100vh - 180px);"></div>
</div> </div>
{% endblock app_content %} {% endblock app_content %}
@ -55,8 +55,8 @@ document.addEventListener('DOMContentLoaded', function() {
week: { week: {
dayNames: [ "Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"], dayNames: [ "Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"],
eventView: ['time'], eventView: ['time'],
hourStart: 7, // TODO préférence hourStart: {{ hour_start }},
hourEnd:24, // TODO préférence hourEnd: {{ hour_end }},
showNowIndicator: true, showNowIndicator: true,
startDayOfWeek: 1, startDayOfWeek: 1,
taskView: false, taskView: false,

8
app/views/notes_formsemestre.py
View File

@ -38,7 +38,7 @@ from app.decorators import (
permission_required, permission_required,
) )
from app.forms.formsemestre import change_formation, edit_modimpls_codes_apo 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 import sco_formations, sco_formation_versions
from app.scodoc.sco_permissions import Permission from app.scodoc.sco_permissions import Permission
from app.views import notes_bp as bp 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): def formsemestre_edt(formsemestre_id: int):
"""Expérimental: affiche emploi du temps du semestre""" """Expérimental: affiche emploi du temps du semestre"""
formsemestre = FormSemestre.get_formsemestre(formsemestre_id) 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( return render_template(
"formsemestre/edt.j2", "formsemestre/edt.j2",
formsemestre=formsemestre, formsemestre=formsemestre,
hour_start=hour_start,
hour_end=hour_end,
sco=ScoData(formsemestre=formsemestre), sco=ScoData(formsemestre=formsemestre),
) )

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.52" SCOVERSION = "9.6.53"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"