From: Olivier Larchevêque Date: Thu, 14 Apr 2011 19:15:07 +0000 (-0400) Subject: utilisation de inline formset dans le form pour le financement X-Git-Tag: DAE~181 X-Git-Url: https://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=151e7bd03a965f5a9716bb391460ec6dece4dfc2 utilisation de inline formset dans le form pour le financement --- diff --git a/project/dae/forms.py b/project/dae/forms.py index d601326..617114a 100644 --- a/project/dae/forms.py +++ b/project/dae/forms.py @@ -16,6 +16,9 @@ class PostePieceForm(inlineformset_factory(dae.Poste, dae.PostePiece)): class DossierPieceForm(inlineformset_factory(dae.Dossier, dae.DossierPiece)): pass +class FinancementForm(inlineformset_factory(dae.Poste, dae.PosteFinancement, extra=1)): + pass + class PosteValidationForm(forms.ModelForm): """ Validation d'un poste""" @@ -164,13 +167,6 @@ class ChoosePosteForm(forms.ModelForm): key=lambda t: t[1]) -class PosteFinancementForm(forms.ModelForm): - """ Formulaire des sources de financement pour un poste. """ - class Meta: - model = dae.PosteFinancement - fields = ('type', 'montant', 'pourcentage', 'commentaire') - - class EmployeForm(forms.ModelForm): """ Formulaire des employés. """ class Meta: diff --git a/project/dae/templates/dae/financement-full.html b/project/dae/templates/dae/financement-full.html deleted file mode 100644 index 132dc93..0000000 --- a/project/dae/templates/dae/financement-full.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends 'base.html' %} - -{% block title %} - Formulaire financement -{% endblock %} - -{% block main %} - {% include 'dae/financement.html' %} -{% endblock %} diff --git a/project/dae/templates/dae/financement.html b/project/dae/templates/dae/financement.html deleted file mode 100644 index 06d3ed7..0000000 --- a/project/dae/templates/dae/financement.html +++ /dev/null @@ -1,11 +0,0 @@ -

Financement

- -
- - {{ form.as_table }} -
- - {% if not new %} - - {% endif %} -
diff --git a/project/dae/templates/dae/financements.html b/project/dae/templates/dae/financements.html new file mode 100644 index 0000000..45a7862 --- /dev/null +++ b/project/dae/templates/dae/financements.html @@ -0,0 +1,23 @@ + + {% for f in financementForm.management_form %} + {{ f }} + {% endfor %} + + {% for field in financementForm.forms.0 %} + {% if not field.is_hidden %} + + {% endif %} + {% endfor %} + + {% for f in financementForm.forms %} + + {% for field in f %} + {% if not field.is_hidden %} + + {% else %} + {{ field }} + {% endif %} + {% endfor %} + + {% endfor %} +
{{ field.label }}
{% if field.errors %}{{ field.errors }}{% endif %}{{ field }}
diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html index 4b05140..a2125fd 100644 --- a/project/dae/templates/dae/poste.html +++ b/project/dae/templates/dae/poste.html @@ -26,10 +26,6 @@ Demande d'autorisation d'embauche - - -