diff --git a/gestion_employe/__pycache__/models.cpython-310.pyc b/gestion_employe/__pycache__/models.cpython-310.pyc index 26b3567..57f0fcd 100644 Binary files a/gestion_employe/__pycache__/models.cpython-310.pyc and b/gestion_employe/__pycache__/models.cpython-310.pyc differ diff --git a/gestion_employe/__pycache__/views.cpython-310.pyc b/gestion_employe/__pycache__/views.cpython-310.pyc index 9594d46..97305ef 100644 Binary files a/gestion_employe/__pycache__/views.cpython-310.pyc and b/gestion_employe/__pycache__/views.cpython-310.pyc differ diff --git a/gestion_employe/models.py b/gestion_employe/models.py index ee75383..0b2474a 100644 --- a/gestion_employe/models.py +++ b/gestion_employe/models.py @@ -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 \ No newline at end of file + return self.titre diff --git a/gestion_employe/views.py b/gestion_employe/views.py index a799abf..b446ae9 100644 --- a/gestion_employe/views.py +++ b/gestion_employe/views.py @@ -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() ) ]