Operation Parcels extraction wizard - issue with initial and template

1 files changed, 18 insertions, 8 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index c3442b5b5..f8976bd5d 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -415,24 +415,34 @@ def operation_delete(request, pk):
 
 def operation_modify_parcels(request, pk):
     formset = None
+    operation = models.Operation.objects.get(pk=pk)
     parcels = models.Parcel.objects.filter(operation=pk).all()
+    data = {}
 
     if request.method == 'POST': #TODO
         formset = SelectedParcelFormSet(request.POST, request.FILES)
         if formset.is_valid():
             pass
         else:
-            formset = SelectedParcelFormSet
+            formset = SelectedParcelFormSet()
     else:
-        data = [{
-            'parcels': parcel,
-            'selected_town': parcel.town
-        } for parcel in parcels]
-        formset = SelectedParcelFormSet(initial=data)
-        formset_general = SelectedParcelGeneralFormSet(initial=data)
+        i = 0
+        towns_array = []
+        parcels_array = []
+        info = {}
+        for parcel in parcels:
+            towns_array.append(parcel.town)
+            parcels_array.append(parcel.pk)
+            #  data['parcel'] = parcel.pk
+            i += 1
+        data['TOWNS'] = towns_array
+        #  data['PARCELS'] = parcels_array
+        data['form-TOTAL_FORMS'] = '1'
+        data['form-INITIAL_FORMS'] = '0'
+        formset = SelectedParcelFormSet(intial=data)
+        #formset = SelectedParcelGeneralFormSet()
     return render(request, 'ishtar/forms/operation_modify_parcels.html', {
         'formset': formset,
-        'formset_general': formset_general,
     })