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 +10 -1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ff92a8f61e - Show all commits

4
app/templates/assiduites/widgets/differee.j2
View File

@ -274,6 +274,7 @@
<script> <script>
const assi_etat_defaut = "{{assi_etat_defaut}}"; const assi_etat_defaut = "{{assi_etat_defaut}}";
const periode_defaut = {{periode_defaut}};
{% if scu.is_assiduites_module_forced(request.args.get('formsemestre_id', None)) %} {% if scu.is_assiduites_module_forced(request.args.get('formsemestre_id', None)) %}
window.forceModule = true; window.forceModule = true;
{% else %} {% else %}
@ -293,6 +294,7 @@
function createColumn(dateStart = "", dateEnd = "", moduleimpl_id = "") { function createColumn(dateStart = "", dateEnd = "", moduleimpl_id = "") {
// TODO Choix dates : utiliser même chose que page ajout_assiduite_etud
let table = document.getElementById("studentTable"); let table = document.getElementById("studentTable");
let th = document.createElement("div"); let th = document.createElement("div");
th.classList.add("th", "error"); th.classList.add("th", "error");
@ -452,7 +454,7 @@
const el = element.parentElement.querySelector("#dateEnd"); const el = element.parentElement.querySelector("#dateEnd");
const el2 = element.parentElement.querySelector("#dateStart"); const el2 = element.parentElement.querySelector("#dateStart");
const newDate = new Date(el2.valueAsDate) const newDate = new Date(el2.valueAsDate)
.add(2, "hours"); .add(periode_defaut, "hours");
el.valueAsDate = newDate; el.valueAsDate = newDate;
const colid = element.parentElement.parentElement.getAttribute('col'); const colid = element.parentElement.parentElement.getAttribute('col');

7
app/views/assiduites.py
View File

@ -2078,10 +2078,17 @@ def _differee(
dept_id=g.scodoc_dept_id, dept_id=g.scodoc_dept_id,
) )
periode_defaut = sco_preferences.get_preference(
"periode_defaut",
formsemestre_id=formsemestre_id,
dept_id=g.scodoc_dept_id,
)
return render_template( return render_template(
"assiduites/widgets/differee.j2", "assiduites/widgets/differee.j2",
etudiants=etudiants, etudiants=etudiants,
assi_etat_defaut=assi_etat_defaut, assi_etat_defaut=assi_etat_defaut,
periode_defaut=periode_defaut,
forcer_module=forcer_module, forcer_module=forcer_module,
moduleimpl_select=moduleimpl_select, moduleimpl_select=moduleimpl_select,
date=date, date=date,