diff --git a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
index 992c709d4aa131ef2608595492ca4d1f6e67e3b9..9a813a591eb94759b16a7cfeeacfa693ed7b6900 100644
--- a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
@@ -38,61 +38,36 @@
</div>
{% endif %}
- {% if my_active_submissions %}
+ {% if my_submissions_exists %}
<div class="mb-10">
<div class="flex">
- <h2 class="font-light flex-1">{% trans "My active submissions" %}</h2>
+ <h2 class="font-light flex-1">{% trans "My submissions" %}</h2>
</div>
- {% for submission in my_active_submissions %}
- <div class="wrapper wrapper--status-bar-outer">
- <div class="wrapper wrapper--status-bar-inner">
- <div class="mt-5 ms-4 lg:max-w-[30%]">
- <h4 class="heading mb-2 font-bold line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h4>
- <p class="m-0 text-gray-400">
- {% if submission.is_draft %}
- {% trans "Drafted on " %}
- {% else %}
- {% trans "Submitted on " %}
- {% endif %}
- {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
- </p>
- </div>
- {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
+
+ <div hx-get="{% url 'dashboard:applicant_submissions' %}" hx-trigger="load delay:1000" id="submissions_list">
+ {% for dummy_item in per_section_items %}
+ <div class="wrapper wrapper--status-bar-outer animate-pulse min-h-40">
+ <div class="mt-5 ms-4 lg:max-w-[30%] h-9 bg-gray-200 "></div>
</div>
- {% if request.user|has_edit_perm:submission %}
- <a class="button button--primary ms-4" href="{% url 'funds:submissions:edit' submission.id %}">
- {% if submission.status == 'draft_proposal' %}
- {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
- {% else %}
- {% trans "Edit" %}
- {% endif %}
- </a>
- {% endif %}
- </div>
- {% empty %}
- {% trans "No active submissions" %}
- {% endfor %}
+ {% endfor %}
+
+ </div>
</div>
{% endif %}
- {% if active_projects.count %}
+ {% if my_projects_exists %}
<div class="mb-10">
<div class="flex">
- <h2 class="font-light flex-1">{% trans "My active projects" %}</h2>
+ <h2 class="font-light flex-1">{% trans "My projects" %}</h2>
</div>
- {% for project in active_projects.data %}
- <div class="wrapper wrapper--status-bar-outer">
- <div class="wrapper wrapper--status-bar-inner">
- <div class="mt-5 ms-4 lg:max-w-[30%]">
- <h4 class="heading mb-2 font-bold line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'apply:projects:detail' project.id %}">{{ project.title }}</a></h4>
- <p class="m-0 text-gray-400">{% trans "Project start date: " %} {{ project.created_at.date }}</p>
- </div>
- {% project_status_bar project.status request.user css_class="status-bar--small" %}
+ <div hx-get="{% url 'dashboard:applicant_projects' %}" hx-trigger="load delay:50" id="projects_list">
+ {% for dummy_item in per_section_items %}
+ <div class="wrapper wrapper--status-bar-outer animate-pulse min-h-40">
+ <div class="mt-5 ms-4 lg:max-w-[30%] h-9 bg-gray-200 "></div>
</div>
- </div>
- {% empty %}
- {% trans "No active projects" %}
- {% endfor %}
+ {% endfor %}
+
+ </div>
</div>
{% endif %}
diff --git a/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html b/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html
new file mode 100644
index 0000000000000000000000000000000000000000..c95e743ad7544d3572811fc386c5b45809eecbdc
--- /dev/null
+++ b/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html
@@ -0,0 +1,33 @@
+{% load i18n dashboard_statusbar_tags statusbar_tags workflow_tags %}
+
+{% for project in page.object_list %}
+ <div class="wrapper wrapper--status-bar-outer">
+ <div class="wrapper wrapper--status-bar-inner">
+ <div class="mt-5 ms-4 lg:max-w-[30%]">
+ <h4 class="heading mb-2 font-bold line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'apply:projects:detail' project.id %}">{{ project.title }}</a></h4>
+ <p class="m-0 text-gray-400">{% trans "Project start date: " %} {{ project.created_at.date }}</p>
+ </div>
+ {% project_status_bar project.status request.user css_class="status-bar--small" %}
+ </div>
+ </div>
+{% empty %}
+ {% trans "No active projects" %}
+{% endfor %}
+
+<nav class="mt-5 mb-20" aria-label="Pagination">
+ <span class="step-links flex gap-2 justify-center items-center">
+ {% if page.has_previous %}
+ <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page=1" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">«</a>
+ <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.previous_page_number }}" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">‹</a>
+ {% endif %}
+
+ <span class="current">
+ Page {{ page.number }} of {{ page.paginator.num_pages }}.
+ </span>
+
+ {% if page.has_next %}
+ <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.next_page_number }}" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">›</a>
+ <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.paginator.num_pages }}" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">»</a>
+ {% endif %}
+ </span>
+</nav>
diff --git a/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html b/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html
new file mode 100644
index 0000000000000000000000000000000000000000..82e6dc6255726cf2ae565f1d5f65e73aca27d82e
--- /dev/null
+++ b/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html
@@ -0,0 +1,49 @@
+{% load i18n dashboard_statusbar_tags statusbar_tags workflow_tags %}
+
+{% for submission in page.object_list %}
+ <div class="wrapper wrapper--status-bar-outer">
+ <div class="wrapper wrapper--status-bar-inner">
+ <div class="mt-5 ms-4 lg:max-w-[30%]">
+ <h4 class="heading mb-2 font-bold line-clamp-3 hover:line-clamp-none"><a class="link {% if not submission.is_active %} text-gray-400 {% endif %}" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h4>
+ <p class="m-0 text-gray-400">
+ {% if submission.is_draft %}
+ {% trans "Drafted on " %}
+ {% else %}
+ {% trans "Submitted on " %}
+ {% endif %}
+ {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
+ </p>
+ </div>
+ {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}
+ </div>
+ {% if request.user|has_edit_perm:submission %}
+ <a class="button button--primary ms-4" href="{% url 'funds:submissions:edit' submission.id %}">
+ {% if submission.status == 'draft_proposal' %}
+ {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
+ {% else %}
+ {% trans "Edit" %}
+ {% endif %}
+ </a>
+ {% endif %}
+ </div>
+{% empty %}
+ {% trans "No active submissions" %}
+{% endfor %}
+
+<nav class="mt-5 mb-20" aria-label="Pagination">
+ <span class="step-links flex gap-2 justify-center items-center">
+ {% if page.has_previous %}
+ <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page=1" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">«</a>
+ <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.previous_page_number }}" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">‹</a>
+ {% endif %}
+
+ <span class="current">
+ Page {{ page.number }} of {{ page.paginator.num_pages }}.
+ </span>
+
+ {% if page.has_next %}
+ <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.next_page_number }}" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">›</a>
+ <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.paginator.num_pages }}" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">»</a>
+ {% endif %}
+ </span>
+</nav>
diff --git a/hypha/apply/dashboard/tests/test_views.py b/hypha/apply/dashboard/tests/test_views.py
index 980dd6dcce8fe87bba3372159cfd67153ebe0062..88470bacc2c9c80f1dbff4de11bee76a43e36822 100644
--- a/hypha/apply/dashboard/tests/test_views.py
+++ b/hypha/apply/dashboard/tests/test_views.py
@@ -28,21 +28,22 @@ class TestApplicantDashboard(BaseViewTestCase):
user_factory = ApplicantFactory
url_name = "dashboard:{}"
base_view_name = "dashboard"
+ partial_submissions_view_name = "applicant_submissions"
- def test_can_access_dashboard_with_active(self):
+ def test_can_access_submissions_partials_with_active(self):
application = ApplicationSubmissionFactory(
user=self.user, form_data__title="Improve the internet"
)
- response = self.get_page()
+ response = self.get_page(view_name=self.partial_submissions_view_name)
self.assertContains(response, application.title)
self.assertNotContains(response, "Submission history")
- def test_can_have_draft_titles_on_dashboard(self):
+ def test_can_have_draft_titles_on_submissions_partials(self):
submission = ApplicationSubmissionFactory(user=self.user)
draft_revision = ApplicationRevisionFactory(submission=submission)
submission.draft_revision = draft_revision
submission.save()
- response = self.get_page()
+ response = self.get_page(view_name=self.partial_submissions_view_name)
self.assertNotContains(response, submission.title)
self.assertContains(response, submission.from_draft().title)
self.assertNotContains(response, "Submission history")
@@ -53,16 +54,16 @@ class TestApplicantDashboard(BaseViewTestCase):
self.assertNotContains(response, application.title)
self.assertNotContains(response, "Submission history")
- def test_gets_invite_if_invited_to_proposal(self):
+ def test_submissions_partials_gets_invite_if_invited_to_proposal(self):
InvitedToProposalFactory(user=self.user, draft=True)
- response = self.get_page()
+ response = self.get_page(view_name=self.partial_submissions_view_name)
self.assertContains(response, "Start your ")
- def test_no_invite_if_can_edit(self):
+ def test_submissions_partials_no_invite_if_can_edit(self):
ApplicationSubmissionFactory(
user=self.user, status="concept_more_info", workflow_stages=2
)
- response = self.get_page()
+ response = self.get_page(view_name=self.partial_submissions_view_name)
self.assertNotContains(response, "Start your ")
self.assertContains(response, "Edit", 1)
diff --git a/hypha/apply/dashboard/urls.py b/hypha/apply/dashboard/urls.py
index b1d468c529155bf8de7029f58148735e12b38b66..2a926366a097166ad2338ebc0a799cbce798a058 100644
--- a/hypha/apply/dashboard/urls.py
+++ b/hypha/apply/dashboard/urls.py
@@ -1,9 +1,12 @@
from django.urls import path
from .views import DashboardView
+from .views_partials import applicant_projects, applicant_submissions
app_name = "dashboard"
urlpatterns = [
path("", DashboardView.as_view(), name="dashboard"),
+ path("applicant/submissions/", applicant_submissions, name="applicant_submissions"),
+ path("applicant/projects/", applicant_projects, name="applicant_projects"),
]
diff --git a/hypha/apply/dashboard/views.py b/hypha/apply/dashboard/views.py
index bb5611808bfff45d80d72109a29fc22edec712ba..fc2954971a6cf8d11d8c4d093c8cfbc6824b3304 100644
--- a/hypha/apply/dashboard/views.py
+++ b/hypha/apply/dashboard/views.py
@@ -517,11 +517,16 @@ class ApplicantDashboardView(TemplateView):
template_name = "dashboard/applicant_dashboard.html"
def get_context_data(self, **kwargs):
- my_active_submissions = list(self.my_active_submissions(self.request.user))
-
context = super().get_context_data(**kwargs)
- context["my_active_submissions"] = my_active_submissions
- context["active_projects"] = self.active_project_data()
+ context["my_submissions_exists"] = ApplicationSubmission.objects.filter(
+ user=self.request.user
+ ).exists()
+ context["per_section_items"] = range(
+ 5
+ ) # it is just for animation, nothing to do with no of items there.
+ context["my_projects_exists"] = Project.objects.filter(
+ user=self.request.user
+ ).exists()
context["active_invoices"] = self.active_invoices()
context["historical_projects"] = self.historical_project_data()
context["historical_submissions"] = self.historical_submission_data()
@@ -535,31 +540,6 @@ class ApplicantDashboardView(TemplateView):
"data": tasks,
}
- def active_project_data(self):
- active_projects = (
- Project.objects.filter(user=self.request.user)
- .active()
- .order_by("-created_at")
- .for_table()
- )
- return {
- "count": active_projects.count(),
- "data": active_projects,
- }
-
- def my_active_submissions(self, user):
- active_subs = (
- ApplicationSubmission.objects.filter(
- user=user,
- )
- .active()
- .current()
- .select_related("draft_revision")
- )
-
- for submission in active_subs:
- yield submission.from_draft()
-
def active_invoices(self):
active_invoices = (
Invoice.objects.filter(project__user=self.request.user)
diff --git a/hypha/apply/dashboard/views_partials.py b/hypha/apply/dashboard/views_partials.py
new file mode 100644
index 0000000000000000000000000000000000000000..0afdc0a8fd3b6e75eb2e6a14e8b279678d32e017
--- /dev/null
+++ b/hypha/apply/dashboard/views_partials.py
@@ -0,0 +1,51 @@
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
+from django.db.models import Case, When
+from django.shortcuts import render
+from django.views.decorators.http import require_GET
+
+from hypha.apply.funds.models.submissions import ApplicationSubmission
+from hypha.apply.funds.workflow import active_statuses
+from hypha.apply.projects.models import Project
+
+
+def my_active_submissions(user):
+ active_subs = (
+ ApplicationSubmission.objects.filter(
+ user=user,
+ )
+ .annotate(
+ is_active=Case(When(status__in=active_statuses, then=True), default=False)
+ )
+ .select_related("draft_revision")
+ .order_by("-is_active", "-submit_time")
+ )
+ for submission in active_subs:
+ yield submission.from_draft()
+
+
+@login_required
+@require_GET
+def applicant_submissions(request):
+ active_submissions = list(my_active_submissions(request.user))
+
+ page = request.GET.get("page", 1)
+ page = Paginator(active_submissions, per_page=5, orphans=3).page(page)
+ return render(
+ request,
+ template_name="dashboard/partials/applicant_submissions.html",
+ context={"page": page},
+ )
+
+
+@login_required
+@require_GET
+def applicant_projects(request):
+ active_projects = Project.objects.filter(user=request.user).order_by("-created_at")
+ page = request.GET.get("page", 1)
+ page = Paginator(active_projects, per_page=5, orphans=3).page(page)
+ return render(
+ request,
+ template_name="dashboard/partials/applicant_projects.html",
+ context={"page": page},
+ )