1 files changed, 47 insertions, 34 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 77d0c8f24..c3442b5b5 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -31,7 +31,12 @@ from django.forms import formset_factory
 
 from archaeological_operations import models
 from archaeological_operations import forms
-from archaeological_operations.forms import SelectedParcelForm, ParcelFormSet, SelectedParcelFormSet
+from archaeological_operations.forms import (
+    SelectedParcelForm,
+    ParcelFormSet,
+    SelectedParcelFormSet,
+    SelectedParcelGeneralFormSet,
+)
 from archaeological_operations import wizards
 from ishtar_common.forms import ClosingDateFormSelection, FinalForm, FinalDeleteForm
 from ishtar_common.models import (
@@ -408,40 +413,48 @@ def operation_delete(request, pk):
     return redirect(reverse(wizard_url, kwargs={"step": "final-" + wizard_url}))
 
 
-#  def operation_modify_parcels(request, pk):
-#      for form in SelectedParcelFormSet():
-#          print(form)
-#      formset = ''
-#      if request.method == 'POST':
-#          formset = SelectedParcelFormSet(request.POST, request.FILES)
-#          print(formset)
-#          if formset.is_valid():
-#              for form in formset:
-#                  print(form)
-#          else:
-#              formset = SelectedParcelFormSet()
-#          return render(request, 'ishtar/forms/operation_modify_parcels.html', {'formset': formset})
-
-
-class ParcelFormView(QAItemForm):
-    template_name = 'ishtar/forms/operation_modify_parcels.html'
-    form_class = SelectedParcelFormSet
-    base_url = "operation-parcels-modify"
-    model = models.Operation
-
-    def get_form_kwargs(self):
-        kwargs = super(ParcelFormView, self).get_form_kwargs()
-        kwargs["user"] = self.request.user
-        return kwargs
-
-    def form_valid(self, form):
-        form.save()
-        return HttpResponseRedirect(reverse("success"))
+def operation_modify_parcels(request, pk):
+    formset = None
+    parcels = models.Parcel.objects.filter(operation=pk).all()
 
-    def get_context_data(self, **kwargs):
-        data = super(ParcelFormView, self).get_context_data(**kwargs)
-        data["action_name"] = _("Modify parcels")
-        return data
+    if request.method == 'POST': #TODO
+        formset = SelectedParcelFormSet(request.POST, request.FILES)
+        if formset.is_valid():
+            pass
+        else:
+            formset = SelectedParcelFormSet
+    else:
+        data = [{
+            'parcels': parcel,
+            'selected_town': parcel.town
+        } for parcel in parcels]
+        formset = SelectedParcelFormSet(initial=data)
+        formset_general = SelectedParcelGeneralFormSet(initial=data)
+    return render(request, 'ishtar/forms/operation_modify_parcels.html', {
+        'formset': formset,
+        'formset_general': formset_general,
+    })
+
+
+#  class ParcelFormView(QAItemForm):
+#      template_name = 'ishtar/forms/operation_modify_parcels.html'
+#      form_class = SelectedParcelFormSet
+#      base_url = "operation-parcels-modify"
+#      model = models.Operation
+#
+#      def get_form_kwargs(self):
+#          kwargs = super(ParcelFormView, self).get_form_kwargs()
+#          kwargs["user"] = self.request.user
+#          return kwargs
+#
+#      def form_valid(self, form):
+#          form.save()
+#          return HttpResponseRedirect(reverse("success"))
+#
+#      def get_context_data(self, **kwargs):
+#          data = super(ParcelFormView, self).get_context_data(**kwargs)
+#          data["action_name"] = _("Modify parcels")
+#          return data
 
 
 # archaeological sites