This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -123,4 +123,4 @@ class Formation(models.Model):
|
||||
date_fin = models.DateField(blank=True, null=True, verbose_name="Date de fin de validité")
|
||||
certificat = models.FileField(upload_to='documents/formations/', blank=True, null=True, verbose_name="Certificat (PDF/Image)")
|
||||
def __str__(self):
|
||||
return self.titre
|
||||
return self.titre
|
||||
|
||||
@@ -383,8 +383,8 @@ def liste_employe(request):
|
||||
projets = [
|
||||
", ".join([
|
||||
a.projet.nom_projet for a in Affectation.objects.filter(
|
||||
employe=employe,
|
||||
date_fin_daffectation__gte=timezone.now().date()
|
||||
employe=employe
|
||||
#, date_fin_daffectation__gte=timezone.now().date()
|
||||
)
|
||||
])
|
||||
]
|
||||
@@ -408,14 +408,14 @@ def liste_employe(request):
|
||||
"salaire_mensuel": contrat.salaire_mensuel,
|
||||
"statut": contrat.statut,
|
||||
"fichier_contrat": contrat.fichier_contrat.url if contrat.fichier_contrat else "",
|
||||
} for contrat in Contrat.objects.filter(employe=employe, statut='actif')
|
||||
} for contrat in Contrat.objects.filter(employe=employe)#, statut='actif')
|
||||
]
|
||||
|
||||
affectations = [
|
||||
{**model_to_dict(affectation), "projet": affectation.projet.nom_projet}
|
||||
for affectation in Affectation.objects.filter(
|
||||
employe=employe,
|
||||
date_fin_daffectation__gte=timezone.now().date()
|
||||
employe=employe
|
||||
#, date_fin_daffectation__gte=timezone.now().date()
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user