From 5f0ac236d70d69141429e487c476c47dd14c799f Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 31 May 2023 12:25:40 +0200 Subject: [PATCH] =?UTF-8?q?More=20debug=20info=20(save=5Fnote=20:=20myst?= =?UTF-8?q?=C3=A8re)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/notes.py | 2 +- app/scodoc/sco_saisie_notes.py | 6 +++++- app/static/js/saisie_notes.js | 1 + sco_version.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/notes.py b/app/models/notes.py index 0f82e28654..04ceb1c0f0 100644 --- a/app/models/notes.py +++ b/app/models/notes.py @@ -56,7 +56,7 @@ class NotesNotes(db.Model): "pour debug" from app.models.evaluations import Evaluation - return f"""<{self.__class__.__name__} {self.id} v={self.value} {self.date.isoformat() + return f"""<{self.__class__.__name__} {self.id} etudid={self.etudid} v={self.value} {self.date.isoformat() } {Evaluation.query.get(self.evaluation_id) if self.evaluation_id else "X" }>""" diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py index 6c470777e9..594ee20b58 100644 --- a/app/scodoc/sco_saisie_notes.py +++ b/app/scodoc/sco_saisie_notes.py @@ -583,8 +583,12 @@ def notes_add( existing_note = NotesNotes.query.filter_by( evaluation_id=evaluation_id, etudid=etudid ).first() + sco_cache.EvaluationCache.delete(evaluation_id) + notes_db = sco_evaluation_db.do_evaluation_get_all_notes( + evaluation_id + ) raise ScoBugCatcher( - f"dup: existing={existing_note} value={value}" + f"dup: existing={existing_note} etudid={repr(etudid)} value={value} in_db={etudid in notes_db}" ) from exc changed = True else: diff --git a/app/static/js/saisie_notes.js b/app/static/js/saisie_notes.js index 0936b3d7aa..208368ca8a 100644 --- a/app/static/js/saisie_notes.js +++ b/app/static/js/saisie_notes.js @@ -51,6 +51,7 @@ function save_note(elem, v, etudid) { 'comment': document.getElementById('formnotes_comment').value }, function (result) { + $('#sco_msg').hide(); if (result['nbchanged'] > 0) { sco_message("enregistré"); elem.className = "note_saved"; diff --git a/sco_version.py b/sco_version.py index 9f0f321e4d..5043b4d8ea 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.4.78" +SCOVERSION = "9.4.79" SCONAME = "ScoDoc"