From 4d9d5293c1a195d07eea598c0a29486e210e88f0 Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Mon, 15 Nov 2021 10:49:16 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/scodoc/sco?= =?UTF-8?q?=5Fundo=5Fnotes.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correction du SELECT pour inclure code_nip --- app/scodoc/sco_undo_notes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py index 9a13d988f..f49e75d1f 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -178,7 +178,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): """ sem = sco_formsemestre.get_formsemestre(formsemestre_id) r = ndb.SimpleDictFetch( - """SELECT i.nom, i.id as etudid, n.*, mod.titre, e.description, e.jour + """SELECT i.nom, code_nip, n.*, mod.titre, e.description, e.jour FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi, notes_modules mod, identite i WHERE mi.id = e.moduleimpl_id From 9e8da925a5e8ca7f3cfef7859e1a43d8350d8b3a Mon Sep 17 00:00:00 2001 From: jeromemartin Date: Mon, 15 Nov 2021 16:00:14 +0100 Subject: [PATCH 2/5] Fix debian package depends --- tools/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/debian/control b/tools/debian/control index fe734c063..fec60a152 100644 --- a/tools/debian/control +++ b/tools/debian/control @@ -4,4 +4,4 @@ Architecture: amd64 Maintainer: Emmanuel Viennet Description: ScoDoc 9 Un logiciel pour le suivi de la scolarité universitaire. -Depends: adduser, curl, gcc, graphviz, libpq-dev, postfix|exim4, cracklib-runtime, libcrack2-dev, python3-dev, python3-venv, python3-pip, python3-wheel, nginx, postgresql, redis, ufw +Depends: adduser, curl, gcc, graphviz, libpq-dev, postfix|exim4, cracklib-runtime, libcrack2-dev, python3-dev, python3-venv, python3-pip, python3-wheel, nginx, postgresql, redis, ufw, systemctl From 9d8b2d5071faf4cb8f87568d3066d62c07708d70 Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Mon, 15 Nov 2021 16:20:22 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/templates/?= =?UTF-8?q?sidebar=5Fdept.html'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Le lien personnalisable (URL de l'"intranet" du département) ne fonctionnait pas. Il y avait un espace de trop dans le nom de la variable testé : OK --- app/templates/sidebar_dept.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/sidebar_dept.html b/app/templates/sidebar_dept.html index 1db820bb1..2baab5219 100644 --- a/app/templates/sidebar_dept.html +++ b/app/templates/sidebar_dept.html @@ -1,7 +1,7 @@

Dépt. {{ prefs["DeptName"] }}

Accueil
{% if prefs["DeptIntranetURL"] %} - + {{ prefs["DeptIntranetTitle"] }} {% endif %}
From 8dc98c64f16e13e9a361b977f2e0b17b018e8ebb Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Tue, 16 Nov 2021 06:07:40 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'tools/configur?= =?UTF-8?q?e-scodoc9.sh'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/configure-scodoc9.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/configure-scodoc9.sh b/tools/configure-scodoc9.sh index fdb5e3b7f..2e2acb1ff 100755 --- a/tools/configure-scodoc9.sh +++ b/tools/configure-scodoc9.sh @@ -74,13 +74,13 @@ fi # ------------ CREATION ENVIRONNEMENT echo echo "Créer (et écraser) le fichier /opt/scodoc-data/.env" -echo " définissant les variables d\'environnement ?" +echo " définissant les variables d'environnement ?" echo "(si vous ne savez pas, répondez oui !)" echo -n 'Générer /opt/scodoc-data/.env ? (y/n) [y] ' read -r ans if [ "$(norm_ans "$ans")" != 'N' ] then - echo -n "Adresse mail de l\'administrateur du site: " + echo -n "Adresse mail de l'administrateur du site: " read SCODOC_ADMIN_MAIL SECRET_KEY=$(python3 -c "import uuid; print(uuid.uuid4().hex)") cat > /opt/scodoc-data/.env < Date: Tue, 16 Nov 2021 06:47:35 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correction des commandes flask --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b80ecd5b5..d7fa447cb 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Certains tests ont besoin d'un département déjà créé, qui n'est pas créé scripts de tests: Lancer au préalable: - flask sco-delete-dept TEST00 && flask sco-create-dept TEST00 + flask delete-dept TEST00 && flask create-dept TEST00 Puis dérouler les tests unitaires: