From d9446b69335a58e813860c93498a4a164b6a1966 Mon Sep 17 00:00:00 2001 From: mc33 Date: Mon, 10 Feb 2025 08:29:23 +0000 Subject: [PATCH] =?UTF-8?q?debug=20suivi=20=C3=A9tudiant=20+=20ajout=20du?= =?UTF-8?q?=20required=20sur=20sRef?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- studenteval/admin.py | 4 ++-- studenteval/models.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/studenteval/admin.py b/studenteval/admin.py index 72c406a..c43832d 100644 --- a/studenteval/admin.py +++ b/studenteval/admin.py @@ -77,10 +77,10 @@ class _cl_Student_eval_admin(SummernoteModelAdmin): fieldsets = ( ('Informations générales', { - 'fields': ('Student','nEval_Type','dtDate') + 'fields': ('Student','nEval_Type','dtDate','sRef') }), ("Information propre à l'intervention ou exercice", { - 'fields': ('sRef','sInter_Desc', 'nInter_Nature', 'nInter_Priority', 'nInter_Complexity', 'nStudent_Role') + 'fields': (,'sInter_Desc', 'nInter_Nature', 'nInter_Priority', 'nInter_Complexity', 'nStudent_Role') }), ("Appréciation de l'étudiant/stagiaire", { 'fields': ("nEval_Mode", "sDesc_neg", 'sDesc_pos', "sDesc_global") diff --git a/studenteval/models.py b/studenteval/models.py index 48e12b9..1dae4c6 100644 --- a/studenteval/models.py +++ b/studenteval/models.py @@ -66,7 +66,7 @@ class cl_Student_eval(models.Model): #Information sur le suivi nEval_Type = models.CharField('Type de suivi', max_length=1, choices=EVAL_TYPE, default=0) dtDate = models.DateField("Date concernée", default=timezone.now) - sRef = models.CharField("N° de référence / FIP", max_length=120, blank=True,) + sRef = models.CharField("N° de référence / FIP / Date de la journée", max_length=120) nEval_Mode = models.CharField('Mode de suivi ', max_length=1, choices=EVAL_MODE, default=0) sDesc_neg = models.TextField("Points à améliorer") sDesc_pos = models.TextField("Points positifs") @@ -99,10 +99,11 @@ class cl_Student_eval(models.Model): def get_ref_of_eval(self): sRet = "" - if int(self.nEval_Type) == 1: - sRet = self.sRef - elif int(self.nEval_Type) == 2: + if int(self.nEval_Type) == 2: sRet = self.dtDate.strftime("%d.%b.%Y") + else: + sRet = self.sRef + #print(sRet)