Add all_activity to the page

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

 {% for action in actions %}
-<div>
-    <p>{{ action.timestamp }}</p>
-    <p>{{ action.user }}</p>
-    <p>{{ action.message }}</p>
-</div>
+    {% include "activity/include/listing_base.html" with activity=action %}
 {% endfor %}

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

+{% for activity in all_activity %}
+    {% include "activity/include/listing_base.html" with activity=activity %}
+{% endfor %}

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

 {% for comment in comments %}
-<div>
-    <p>{{ comment.timestamp }}</p>
-    <p>{{ comment.user }}</p>
-    <p>{{ comment.message }}</p>
-</div>
+    {% include "activity/include/listing_base.html" with activity=comment %}
 {% endfor %}

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

+<div>
+    <p>{{ activity.timestamp }}</p>
+    <p>{{ activity.user }}</p>
+    <p>{{ activity.message }}</p>
+</div>

opentech/apply/activity/views.py

@@ -4,6 +4,16 @@ from .forms import CommentForm
 from .models import Activity, COMMENT
 
 
+class AllActivityContextMixin:
+    def get_context_data(self, **kwargs):
+        extra = {
+            'actions': Activity.actions.filter(submission__in=self.object_list),
+            'comments': Activity.comments.filter(submission__in=self.object_list),
+            'all_activity': Activity.objects.filter(submission__in=self.object_list),
+        }
+        return super().get_context_data(**extra, **kwargs)
+
+
 class ActivityContextMixin:
     def get_context_data(self, **kwargs):
         extra = {

opentech/apply/funds/templates/funds/submissions.html

@@ -39,6 +39,10 @@
     {% render_table table %}
 </div>
 
+{% include "activity/include/comment_list.html" %}
+{% include "activity/include/action_list.html" %}
+{% include "activity/include/all_activity_list.html" %}
+
 {% endblock %}
 
 {% block extra_js %}

opentech/apply/funds/views.py

@@ -5,7 +5,12 @@ from django.views.generic import DetailView, UpdateView, View
 from django_filters.views import FilterView
 from django_tables2.views import SingleTableMixin
 
-from opentech.apply.activity.views import ActivityContextMixin, CommentFormView, DelegatedViewMixin
+from opentech.apply.activity.views import (
+    AllActivityContextMixin,
+    ActivityContextMixin,
+    CommentFormView,
+    DelegatedViewMixin,
+)
 from opentech.apply.activity.models import Activity
 
 from .forms import ProgressSubmissionForm
@@ -14,7 +19,7 @@ from .tables import SubmissionsTable, SubmissionFilter, SubmissionFilterAndSearc
 from .workflow import SingleStage, DoubleStage
 
 
-class SubmissionListView(SingleTableMixin, FilterView):
+class SubmissionListView(AllActivityContextMixin, SingleTableMixin, FilterView):
     template_name = 'funds/submissions.html'
     table_class = SubmissionsTable