diff --git a/app/templates/but/bulletin.html b/app/templates/but/bulletin.html
index 727a144d78..27146ed4a9 100644
--- a/app/templates/but/bulletin.html
+++ b/app/templates/but/bulletin.html
@@ -22,9 +22,10 @@
.dateInscription,
.numerosEtudiant,
.dateNaissance{
- display: none;
+ display: none;
}`;
releve.shadowRoot.appendChild(style);
- })
+ });
+ document.querySelector("html").style.scrollBehavior = "smooth";
{% endblock %}
\ No newline at end of file
diff --git a/app/templates/create_dept.html b/app/templates/create_dept.html
new file mode 100644
index 0000000000..4e3f8a4679
--- /dev/null
+++ b/app/templates/create_dept.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
+
+{% block app_content %}
+
Créer un département
+
+
+
+ {{ wtf.quick_form(form) }}
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/scodoc.html b/app/templates/scodoc.html
index c0e1edddaf..2aaf9e22ca 100644
--- a/app/templates/scodoc.html
+++ b/app/templates/scodoc.html
@@ -22,6 +22,9 @@
Aucun département défini !
{% endfor %}
+ {% if current_user.is_administrator() %}
+
créer un nouveau département
+ {% endif %}
diff --git a/app/views/scodoc.py b/app/views/scodoc.py
index c098f0347d..815de175d6 100644
--- a/app/views/scodoc.py
+++ b/app/views/scodoc.py
@@ -53,11 +53,13 @@ from wtforms.fields.simple import BooleanField, StringField, TextAreaField, Hidd
from wtforms.validators import ValidationError, DataRequired, Email, EqualTo
import app
+from app.forms.main import config_forms
+from app.forms.main.create_dept import CreateDeptForm
from app.models import Departement, Identite
+from app.models import departements
from app.models import FormSemestre, FormSemestreInscription
-from app.models import ScoDocSiteConfig
import sco_version
-from app.scodoc import sco_logos, sco_config_form
+from app.scodoc import sco_logos
from app.scodoc import sco_find_etud
from app.scodoc import sco_utils as scu
from app.decorators import (
@@ -67,7 +69,6 @@ from app.decorators import (
permission_required_compat_scodoc7,
permission_required,
)
-from app.scodoc.sco_config_form import configuration
from app.scodoc.sco_exceptions import AccessDenied
from app.scodoc.sco_logos import find_logo
from app.scodoc.sco_permissions import Permission
@@ -99,6 +100,24 @@ def index_dept(scodoc_dept):
return redirect(url_for("scolar.index_html", scodoc_dept=scodoc_dept))
+@bp.route("/ScoDoc/create_dept", methods=["GET", "POST"])
+@admin_required
+def create_dept():
+ """Form création département"""
+ form = CreateDeptForm()
+ if request.method == "POST" and form.cancel.data: # cancel button
+ return redirect(url_for("scodoc.index"))
+ if form.validate_on_submit():
+ departements.create_dept(form.acronym.data)
+ flash(f"Département {form.acronym.data} créé.")
+ return redirect(url_for("scodoc.index"))
+ return render_template(
+ "create_dept.html",
+ form=form,
+ title="Création d'un nouveau département",
+ )
+
+
@bp.route("/ScoDoc/table_etud_in_accessible_depts", methods=["POST"])
@login_required
def table_etud_in_accessible_depts():
@@ -134,7 +153,7 @@ def get_etud_dept():
last_etud = None
last_date = None
for etud in etuds:
- inscriptions = FormsemestreInscription.query.filter_by(etudid=etud.id).all()
+ inscriptions = FormSemestreInscription.query.filter_by(etudid=etud.id).all()
for ins in inscriptions:
date_fin = FormSemestre.query.get(ins.formsemestre_id).date_fin
if (last_date is None) or date_fin > last_date:
@@ -207,7 +226,7 @@ def configuration():
auth_name = str(current_user)
if not current_user.is_administrator():
raise AccessDenied("invalid user (%s) must be SuperAdmin" % auth_name)
- return sco_config_form.configuration()
+ return config_forms.configuration()
SMALL_SIZE = (200, 200)
diff --git a/sco_version.py b/sco_version.py
index 811be2497e..bc906576bb 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
-SCOVERSION = "9.1.13"
+SCOVERSION = "9.1.16"
SCONAME = "ScoDoc"
diff --git a/scodoc.py b/scodoc.py
index 482501e0eb..94c8a7f09c 100755
--- a/scodoc.py
+++ b/scodoc.py
@@ -27,6 +27,7 @@ from app.models import Formation, UniteEns, Module
from app.models import FormSemestre, FormSemestreInscription
from app.models import ModuleImpl, ModuleImplInscription
from app.models import Identite
+from app.models import departements
from app.models.evaluations import Evaluation
from app.scodoc.sco_etud import identite_create
from app.scodoc.sco_permissions import Permission
@@ -306,11 +307,7 @@ def delete_dept(dept): # delete-dept
@click.argument("dept")
def create_dept(dept): # create-dept
"Create new departement"
- d = models.Departement(acronym=dept)
- p1 = ScoPreference(name="DeptName", value=dept, departement=d)
- db.session.add(p1)
- db.session.add(d)
- db.session.commit()
+ _ = departements.create_dept(dept)
return 0