From cf4e6a302a8b3cb4f54b80c64bbc689d9381fb6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Thu, 12 Jul 2012 15:05:50 -0400 Subject: [PATCH] dossier + poste salaire resme --- project/dae/views.py | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/project/dae/views.py b/project/dae/views.py index bcbad9e..cd4fc92 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -809,23 +809,11 @@ def pre_filled_dossier(dossier_rh, employe_source, poste_rh): return dossier - -@dae_groupe_requis -@vieux_dossier_dans_ma_region_ou_service -def dossier_resume(request, dossier_id=None): - try: - dossier = rh.Dossier.objects.get(id=dossier_id) - except: - return HttpResponseGone("Ce dossier n'est pas accessible") - +def _get_salaire_traitement(dossier): + """ + Type de remun traitement derniers commencant a la meme date + """ data = {} - data['personne'] = unicode(dossier.employe) - data['classement'] = dossier.classement.id - if dossier.statut is not None: - data['statut'] = dossier.statut.id - data['implantation'] = dossier.poste.implantation.id - data['poste'] = dossier.poste.nom - # Toutes les rémunérations d'un dossier remunerations = [r for r in dossier.remunerations().order_by('-date_debut') if \ r.type.nature_remuneration == "Traitement"] @@ -849,7 +837,24 @@ def dossier_resume(request, dossier_id=None): data['devise'] = devise data['montant'] = montant data['montant_euros'] = montant_euros + return data + +@dae_groupe_requis +@vieux_dossier_dans_ma_region_ou_service +def dossier_resume(request, dossier_id=None): + try: + dossier = rh.Dossier.objects.get(id=dossier_id) + except: + return HttpResponseGone("Ce dossier n'est pas accessible") + data = {} + data['personne'] = unicode(dossier.employe) + data['classement'] = dossier.classement.id + if dossier.statut is not None: + data['statut'] = dossier.statut.id + data['implantation'] = dossier.poste.implantation.id + data['poste'] = dossier.poste.nom + data.update(_get_salaire_traitement(dossier)) return HttpResponse(dumps(data)) @@ -869,16 +874,9 @@ def poste_resume(request, dossier_id=None): data = {} data['implantation'] = dossier.poste.implantation.id data['poste'] = dossier.poste.nom - if salaire is not None: - data['devise'] = salaire.devise.id - data['montant'] = float(salaire.montant) - data['montant_euros'] = salaire.montant_euros() - else: - data['devise'] = None - data['montant'] = "" - data['montant_euros'] = "" data['statut'] = dossier.statut_id data['classement'] = dossier.classement_id + data.update(_get_salaire_traitement(dossier)) return HttpResponse(dumps(data)) -- 1.7.10.4