Enable progressing the application using the form

opentech/apply/activity/templates/activity/include/comment_form.html

-<form method="post">
+<form method="post" id="comment-form">
     {% csrf_token %}
     {{ comment_form }}
-    <input type="submit" value="Comment">
+    <input id="comment-form-submit" name="form-submitted" type="submit" form="comment-form" value="Comment">
 </form>

opentech/apply/funds/forms.py

@@ -4,9 +4,19 @@ from .models import ApplicationSubmission
 
 
 class ProgressSubmissionForm(forms.ModelForm):
+    action = forms.ChoiceField()
+
     class Meta:
         model = ApplicationSubmission
-        fields = ('status',)
+        fields = []
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        choices = [(action, action) for action in self.instance.phase.action_names]
+        self.fields['action'].choices = choices
+        self.fields['action'].label = self.instance.phase.name
+
+    def save(self, *args, **kwargs):
+        new_phase = self.instance.workflow.process(self.instance.phase, self.cleaned_data['action'])
+        self.instance.status = str(new_phase)
+        return super().save(*args, **kwargs)

opentech/apply/funds/templates/funds/includes/progress_form.html

-<form method="post">
+<form method="post" id="progress-form">
     {% csrf_token %}
     {{ progress_form }}
-    <input type="submit" value="Progress">
+    <input id="progress-form-submit" name="form-submitted" type="submit" form="progress-form" value="Progress">
 </form>

opentech/apply/funds/views.py

@@ -53,12 +53,20 @@ class ProgressContextMixin:
 
 
 class ProgressSubmissionView(DelegatedViewMixin, UpdateView):
-     form_class = ProgressSubmissionForm
-     context_name = 'progress_form'
+    model = ApplicationSubmission
+    form_class = ProgressSubmissionForm
+    context_name = 'progress_form'
+
+    def form_valid(self, form):
+        return super().form_valid(form)
 
 
 class SubmissionDetailView(CommentContextMixin, ProgressContextMixin, DetailView):
     model = ApplicationSubmission
+    form_views = {
+        'progress': ProgressSubmissionView,
+        'comment': CommentFormView,
+    }
 
     def get_context_data(self, **kwargs):
         return super().get_context_data(
@@ -75,8 +83,8 @@ class SubmissionDetailView(CommentContextMixin, ProgressContextMixin, DetailView
         kwargs['template_names'] = self.get_template_names()
         kwargs['context'] = self.get_context_data()
 
-        import pudb; pudb.set_trace()
-        view = CommentFormView.as_view()
+        form_submitted = request.POST['form-submitted'].lower()
+        view = self.form_views[form_submitted].as_view()
 
         return view(request, *args, **kwargs)