1 files changed, 29 insertions, 31 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 0b71331f8..d6ebd940c 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -31,12 +31,7 @@ from django.forms import formset_factory
 
 from archaeological_operations import models
 from archaeological_operations import forms
-from archaeological_operations.forms import (
-    SelectedParcelForm,
-    ParcelFormSet,
-    SelectedParcelFormSet,
-    SelectedParcelGeneralFormSet,
-)
+from archaeological_operations.forms import SelectedParcelGeneralFormSet
 from archaeological_operations import wizards
 from ishtar_common.forms import ClosingDateFormSelection, FinalForm, FinalDeleteForm
 from ishtar_common.models import (
@@ -419,39 +414,42 @@ def operation_modify_parcels(request, pk):
     operation = models.Operation.objects.get(pk=pk)
     parcels = models.Parcel.objects.filter(operation=pk).all()
     data = {}
+    available_towns = []
+
+    for town in operation.towns.all():
+        available_towns.append((town.id, town.name))
 
     if request.method == 'POST':  #TODO
-        formset = formset_class(request.POST, request.FILES)
+        print(request.POST)
+        formset = formset_class(request.POST or None, request.FILES or None)
         if formset.is_valid():
-            pass
+            print(formset.cleaned_data)
         else:
             formset = formset_class()
     else:
-        towns_array = []
-        parcels_array = []
-        info = {}
-        for parcel in parcels:
-            print(parcel.pk)
-            print(parcel.town)
-            #towns_array.append(parcel.town)
-            parcels_array.append(int(parcel.pk))
-        # data['TOWNS'] = towns_array
-        #  data['PARCELS'] = parcels_array
-        data['form-TOTAL_FORMS'] = 3
-        # TODO: feed initial with current parcels
-        print("parcel_array : ")
-        for p in parcels_array:
-            print(p)
         initial = []
-        initial = {'PARCELS': parcels_array}
-        print(initial)
-        #  if parcels:
-        #      for parcel in parcels:
-        data['form-INITIAL_FORMS'] = len(initial)
+        for parcel in parcels:
+            town = models.Town.objects.get(pk=parcel.town_id)
+            initial.append({
+                "pk": parcel.pk,
+                "town": town.pk,
+                "year": parcel.year,
+                "section": parcel.section,
+                "parcel_number": parcel.parcel_number,
+                "public_domain": parcel.public_domain
+            })
+
+        data = {
+            'TOWNS': available_towns,
+            'form-TOTAL_FORMS': len(initial),
+            'form-INITIAL_FORMS': 0,
+        }
+
         formset = formset_class(initial=initial, data=data)
-        for form in formset:
-            print(form.as_table())
-        #formset = SelectedParcelGeneralFormSet()
+
+        for form in formset:# DEBUG
+            print(form.as_table())# DEBUG
+
     return render(request, 'ishtar/forms/operation_modify_parcels.html', {
         'formset': formset,
     })