CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

debug suivi étudiant + ajout du required sur sRef
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m29s
Details

Browse Source
This commit is contained in:
mc33
2025-02-10 08:29:23 +00:00
parent f6128e4f61
commit d9446b6933
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
studenteval/admin.py
View File

@@ -77,10 +77,10 @@ class _cl_Student_eval_admin(SummernoteModelAdmin):
fieldsets = ( fieldsets = (
('Informations générales', { ('Informations générales', {
'fields': ('Student','nEval_Type','dtDate') 'fields': ('Student','nEval_Type','dtDate','sRef')
}), }),
("Information propre à l'intervention ou exercice", { ("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", { ("Appréciation de l'étudiant/stagiaire", {
'fields': ("nEval_Mode", "sDesc_neg", 'sDesc_pos', "sDesc_global") 'fields': ("nEval_Mode", "sDesc_neg", 'sDesc_pos', "sDesc_global")

9
studenteval/models.py
View File

@@ -66,7 +66,7 @@ class cl_Student_eval(models.Model):
#Information sur le suivi #Information sur le suivi
nEval_Type = models.CharField('Type de suivi', max_length=1, choices=EVAL_TYPE, default=0) nEval_Type = models.CharField('Type de suivi', max_length=1, choices=EVAL_TYPE, default=0)
dtDate = models.DateField("Date concernée", default=timezone.now) 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) nEval_Mode = models.CharField('Mode de suivi ', max_length=1, choices=EVAL_MODE, default=0)
sDesc_neg = models.TextField("Points à améliorer") sDesc_neg = models.TextField("Points à améliorer")
sDesc_pos = models.TextField("Points positifs") sDesc_pos = models.TextField("Points positifs")
@@ -99,10 +99,11 @@ class cl_Student_eval(models.Model):
def get_ref_of_eval(self): def get_ref_of_eval(self):
sRet = "" sRet = ""
if int(self.nEval_Type) == 1: if int(self.nEval_Type) == 2:
sRet = self.sRef
elif int(self.nEval_Type) == 2:
sRet = self.dtDate.strftime("%d.%b.%Y") sRet = self.dtDate.strftime("%d.%b.%Y")
else:
sRet = self.sRef
#print(sRet) #print(sRet)