Operation - Parcels - Modify: adjustments par two #5227

2 files changed, 12 insertions, 18 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 2151aaee0..18a83f033 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -116,6 +116,7 @@ class ParcelForm(IshtarForm):
             return
         if not self.cleaned_data or (DELETION_FIELD_NAME in self.cleaned_data
            and self.cleaned_data[DELETION_FIELD_NAME]):
+            print("Youpitralala")
             return
         if (not self.cleaned_data.get('parcel_number') or
                 not self.cleaned_data.get('section')) and \
@@ -1150,13 +1151,13 @@ class SelectedParcelForm(IshtarForm):
 
 
 SelectedParcelFormSet = formset_factory(SelectedParcelForm, can_delete=True,
-                                        formset=ParcelFormSet, extra=3)
+                                        formset=ParcelFormSet)
 SelectedParcelFormSet.form_label = _("Parcels")
 SelectedParcelFormSet.form_admin_name = _("Operation - 050 - Parcels")
 SelectedParcelFormSet.form_slug = "operation-050-parcels"
 
 SelectedParcelGeneralFormSet = formset_factory(ParcelForm, can_delete=True,
-                                               formset=ParcelFormSet, extra=3)
+                                               formset=ParcelFormSet)
 SelectedParcelGeneralFormSet.form_label = _("Parcels")
 SelectedParcelGeneralFormSet.form_admin_name = _(
     "Operation - 050 - Parcels (2)")
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 7ffdcf3e8..016a43560 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -433,7 +433,7 @@ def operation_modify_parcels(request, pk):
 
     data = {
         'TOWNS': available_towns,
-        'form-TOTAL_FORMS': len(initial),
+        'form-TOTAL_FORMS': len(initial) + 3,
         'form-INITIAL_FORMS': 0,
         'form-MIN_NUM_FORMS': 0,
         'form-MAX_NUM_FORMS': 100,
@@ -443,21 +443,22 @@ def operation_modify_parcels(request, pk):
         new_data = dict(request.POST)
         new_data = {k: new_data[k][0] for k in new_data} # convert POST to classic dict
         new_data.update(data)
-        formset = formset_class(new_data) #, prefix="modified_parcel"
-        #  new_parcel_formset = formset_class(new_data) #, prefix="new_parcel
+        formset = formset_class(new_data)
         for form in formset: #DEBUG
             print(form.errors) #DEBUG
 
         if formset.is_valid():
             print(formset.cleaned_data) #DEBUG
-            post_data = [form.cleaned_data for form in formset]
+            post_data = formset.cleaned_data
 
             for data in post_data:
                 print(data)
-                try:
-                    current_parcel = models.Parcel.objects.get(pk=data["pk"])
-                except models.Parcel.DoesNotExist:
-                    current_parcel = None
+                current_parcel = None
+                if data.get("pk"):
+                    try:
+                        current_parcel = models.Parcel.objects.get(pk=data.get("pk"))
+                    except models.Parcel.DoesNotExist:
+                        pass
 
                 if current_parcel:
                     not_deleted_or_associated = True
@@ -487,15 +488,7 @@ def operation_modify_parcels(request, pk):
                     operation.parcels.add(parcel_to_add)
         else:
             print("je passe ici")
-            formset = formset_class()
     else:
-        data.update({
-            'form-TOTAL_FORMS': len(initial),
-            'form-INITIAL_FORMS': 0,
-            'form-MIN_NUM_FORMS': 0,
-            'form-MAX_NUM_FORMS': 100,
-        })
-
         formset = formset_class(initial=initial, data=data)
 
         for form in formset:# DEBUG