- {% with activity|display_activity_author:request.user as author_name %}
-
-
-
- {% user_image author_name size=25 %}
+ {% if not mini %}
+ /", partial_comments, name="partial-comments"),
path("/edit-comment/", edit_comment, name="edit-comment"),
path("/delete-comment/", delete_comment, name="delete-comment"),
+ path("post-comment/", post_comment, name="post-comment"),
path(
"activities/attachment//download/",
AttachmentView.as_view(),
diff --git a/hypha/apply/activity/views.py b/hypha/apply/activity/views.py
index 9933a2af42..ce5a75f124 100644
--- a/hypha/apply/activity/views.py
+++ b/hypha/apply/activity/views.py
@@ -1,13 +1,21 @@
+import json
+
from django.contrib.auth.decorators import login_required, user_passes_test
+from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied
from django.core.paginator import Paginator
+from django.http import Http404, HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, render
+from django.utils import timezone
from django.utils.decorators import method_decorator
+from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _
from django.views.decorators.http import require_http_methods
from django.views.generic import ListView
from rolepermissions.checkers import has_object_permission
+from hypha.apply.activity.forms import CommentForm
+from hypha.apply.activity.messaging import MESSAGES, messenger
from hypha.apply.funds.models.submissions import ApplicationSubmission
from hypha.apply.users.decorators import is_apply_staff, staff_required
from hypha.apply.utils.storage import PrivateMediaView
@@ -110,6 +118,90 @@ def delete_comment(request, pk):
)
+@login_required
+@require_http_methods(["POST", "GET"])
+@user_passes_test(is_apply_staff)
+def post_comment(request: HttpRequest):
+ if request.method == "POST":
+ form = CommentForm(user=request.user, data=request.POST or None)
+ if (source_content_type := form.data["source_content_type"]) and (
+ source_object_id := form.data["source_object_id"]
+ ):
+ if (
+ not ContentType.objects.filter(id=source_content_type).exists()
+ or not ContentType.objects.get_for_id(source_content_type)
+ .model_class()
+ .objects.filter(id=source_object_id)
+ .exists()
+ ):
+ raise Http404
+
+ source = ContentType.objects.get_for_id(
+ source_content_type
+ ).get_object_for_this_type(id=source_object_id)
+ form.instance.user = request.user
+ form.instance.source = source
+ form.instance.type = COMMENT
+ form.instance.timestamp = timezone.now()
+ if form.is_valid():
+ obj = form.save()
+ messenger(
+ MESSAGES.COMMENT,
+ request=request,
+ user=request.user,
+ source=source,
+ related=obj,
+ )
+ return HttpResponse(
+ status=204,
+ headers={
+ "HX-Trigger": json.dumps(
+ {
+ "commentAdded": obj.pk,
+ "showMessage": mark_safe(_("Comment added!")),
+ }
+ ),
+ },
+ )
+ return render(
+ request, "activity/partials/comment_form.html", {"form": form}
+ )
+ else:
+ form = CommentForm(user=request.user, mini=True)
+
+ params = request.GET.dict()
+
+ # Ensure the provided source content type & object actually exist
+ source_content_type = params.get("source_content_type")
+ source_object_id = params.get("source_object_id")
+ if not (source_content_type and source_object_id) or (
+ not ContentType.objects.filter(id=source_content_type).exists()
+ or not ContentType.objects.get_for_id(source_content_type)
+ .model_class()
+ .objects.filter(id=source_object_id)
+ .exists()
+ ):
+ raise Http404
+
+ form.fields["source_content_type"].initial = source_content_type
+ form.fields["source_object_id"].initial = source_object_id
+
+ if (related_content_type := params.get("related_content_type")) and (
+ related_object_id := params.get("related_object_id")
+ ):
+ if (
+ ContentType.objects.filter(id=related_content_type).exists()
+ and ContentType.objects.get_for_id(related_content_type)
+ .model_class()
+ .objects.filter(id=related_object_id)
+ .exists()
+ ):
+ form.fields["related_content_type"].initial = related_content_type
+ form.fields["related_object_id"].initial = related_object_id
+
+ return render(request, "activity/partials/comment_form.html", {"form": form})
+
+
class ActivityContextMixin:
"""Mixin to add related 'comments' of the current view's 'self.object'"""
diff --git a/hypha/apply/funds/templates/funds/comments.html b/hypha/apply/funds/templates/funds/comments.html
index c6e9f3e3c8..9fec3457e6 100644
--- a/hypha/apply/funds/templates/funds/comments.html
+++ b/hypha/apply/funds/templates/funds/comments.html
@@ -57,7 +57,7 @@
+ {% with activity|display_activity_author:request.user as author_name %}
+
-
+
-
+
+ {% user_image author_name size=25 %}
+
-
-
+ {% endif %}
diff --git a/hypha/apply/activity/urls.py b/hypha/apply/activity/urls.py
index bd26613df1..f3c45dcd47 100644
--- a/hypha/apply/activity/urls.py
+++ b/hypha/apply/activity/urls.py
@@ -6,6 +6,7 @@
delete_comment,
edit_comment,
partial_comments,
+ post_comment,
)
app_name = "activity"
@@ -17,6 +18,7 @@
path("comments/
-
+
+ {% else %}
+
+
+
-
{{ author_name }}
{% if not request.user.is_applicant %}
@@ -33,88 +41,188 @@
{% endif %}
-
- {% trans "commented" %}
+
+
+ {% if not submission_title and activity|user_can_see_related:request.user %}
+ {# Determine if an/a should be used in the following text (not relevant to languages other than english) #}
+ {% with activity.related_object|model_verbose_name|an as an_or_a %}
+ {% blocktrans with verbose_related_name=activity.related_object|model_verbose_name %}commented on {{an_or_a}} {{ verbose_related_name }}{% endblocktrans %}
+ {% endwith %}
+ {% else %}
+ {% trans "commented" %}
+ {% endif %}
+
{{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}
-
-
+
- {% if not request.user.is_applicant %}
- {% if request.user.is_apply_staff and activity.assigned_to %}
-
- {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
- {% if activity.assigned_to.id == request.user.id %}
- {% trans "Assigned to you" %}
- {% else %}
- {% blocktrans with activity.assigned_to.full_name as assigned_to %}Assigned to {{ assigned_to }}{% endblocktrans %}
- {% endif %}
-
+
+ {% endwith %}
+
+ {% if not request.user.is_applicant %}
+ {% if request.user.is_apply_staff and activity.assigned_to %}
+
+ {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
+ {% if activity.assigned_to.id == request.user.id %}
+ {% trans "Assigned to you" %}
+ {% else %}
+ {% blocktrans with activity.assigned_to.full_name as assigned_to %}Assigned to {{ assigned_to }}{% endblocktrans %}
+ {% endif %}
+
+ {% endif %}
+
+ {% with activity.visibility|visibility_display:request.user as visibility_text %}
+
+ {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
+ {{ visibility_text }}
+
+ {% endwith %}
{% endif %}
- {% with activity.visibility|visibility_display:request.user as visibility_text %}
-
- {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
- {{ visibility_text }}
-
- {% endwith %}
- {% endif %}
+ {% if editable and activity.user == request.user and not activity.deleted %}
+
+ {% heroicon_micro "pencil-square" aria_hidden=true %}
+ {% trans "Edit" %}
+
+ {% endif %}
- {% if editable and activity.user == request.user and not activity.deleted %}
-
- {% heroicon_micro "pencil-square" aria_hidden=true %}
- {% trans "Edit" %}
-
+ {% if editable and activity.user == request.user and not activity.deleted and request.user.is_apply_staff %}
+
+ {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}
+ {% trans "Delete" %}
+
+ {% endif %}
+
+
+
+
+ {% if submission_title %}
+ {% trans "updated" %} {{ activity.source.title }}
{% endif %}
- {% if editable and activity.user == request.user and not activity.deleted and request.user.is_apply_staff %}
-
- {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}
- {% trans "Delete" %}
-
+
-
+
+ {% include 'activity/partial_comment_message.html' with activity=activity %}
+
+ {% if not submission_title and activity|user_can_see_related:request.user %}
+ {% with url=activity.related_object.get_absolute_url %}
+ {% if url %}
+
+ {% endif %}
+ {% endwith %}
{% endif %}
+ {% with activity|display_activity_author:request.user as author_name %}
+
+ {% endwith %}
+
+
+
- {% endwith %}
-
+ {{ author_name }}
-
-
- {% if submission_title %}
- {% trans "updated" %} {{ activity.source.title }}
- {% endif %}
+ {% if not request.user.is_applicant %}
+
+ {% for role in activity.user.get_role_names %}
+
+ {{ role }}
+
+ {% endfor %}
+
+ {% endif %}
- {{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}
+
+
+
+
- {% include 'activity/partial_comment_message.html' with activity=activity %}
-
+
+ {% trans "commented" %}
+
+ {% if not request.user.is_applicant %}
+ {% if request.user.is_apply_staff and activity.assigned_to %}
+
+ {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
+ {% if activity.assigned_to.id == request.user.id %}
+ {% trans "Assigned to you" %}
+ {% else %}
+ {% blocktrans with activity.assigned_to.full_name as assigned_to %}Assigned to {{ assigned_to }}{% endblocktrans %}
+ {% endif %}
+
+ {% endif %}
- {% if not submission_title and activity|user_can_see_related:request.user %}
- {% with url=activity.related_object.get_absolute_url %}
- {% if url %}
-
+ {% with activity.visibility|visibility_display:request.user as visibility_text %}
+
+ {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
+ {{ visibility_text }}
+
+ {% endwith %}
{% endif %}
- {% endwith %}
- {% endif %}
+
+ {% if editable and activity.user == request.user and not activity.deleted %}
+
+ {% heroicon_micro "pencil-square" aria_hidden=true %}
+ {% trans "Edit" %}
+
+ {% endif %}
+
+ {% if editable and activity.user == request.user and not activity.deleted and request.user.is_apply_staff %}
+
+ {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}
+ {% trans "Delete" %}
+
+ {% endif %}
+
+
+
+
+ {% if submission_title %}
+ {% trans "updated" %} {{ activity.source.title }}
+ {% endif %}
+
+
+ {% include 'activity/partial_comment_message.html' with activity=activity %}
+
+ {% trans "Add communication" %}
{% endfor %}
-
+
{% include "forms/includes/field.html" with field=form.message label_classes="sr-only" %}
diff --git a/hypha/apply/funds/views/comments.py b/hypha/apply/funds/views/comments.py
index afae1daf63..143c5672c6 100644
--- a/hypha/apply/funds/views/comments.py
+++ b/hypha/apply/funds/views/comments.py
@@ -46,7 +46,6 @@ def comments_view(request, pk):
related=obj,
)
return redirect("funds:submissions:comments", pk=submission.pk)
-
ctx = {
"object": submission,
"comments_count": comments_count,
diff --git a/hypha/apply/projects/migrations/0108_projectformpointer.py b/hypha/apply/projects/migrations/0108_projectformpointer.py
new file mode 100644
index 0000000000..8e45c357b2
--- /dev/null
+++ b/hypha/apply/projects/migrations/0108_projectformpointer.py
@@ -0,0 +1,39 @@
+# Generated by Django 5.2.15 on 2026-07-21 15:55
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("application_projects", "0107_invoiceexportmanager"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="ProjectFormPointer",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "project",
+ models.OneToOneField(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="pfp",
+ to="application_projects.project",
+ ),
+ ),
+ ],
+ options={
+ "verbose_name": "project form",
+ "verbose_name_plural": "project forms",
+ },
+ ),
+ ]
diff --git a/hypha/apply/projects/migrations/0109_create_project_form_pointers.py b/hypha/apply/projects/migrations/0109_create_project_form_pointers.py
new file mode 100644
index 0000000000..11e24842a8
--- /dev/null
+++ b/hypha/apply/projects/migrations/0109_create_project_form_pointers.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.2.15 on 2026-07-21 17:15
+
+from django.db import migrations
+
+
+def create_pf_pointers(apps, schema_editor):
+ ProjectFormPointer = apps.get_model("application_projects", "ProjectFormPointer")
+ all_projects = apps.get_model("application_projects", "Project").objects.all()
+ for project in all_projects:
+ if bool(project.form_fields):
+ ProjectFormPointer.objects.create(project=project)
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("application_projects", "0108_projectformpointer"),
+ ]
+
+ operations = [
+ migrations.RunPython(create_pf_pointers),
+ ]
diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py
index 086628c389..6ab466170a 100644
--- a/hypha/apply/projects/models/payment.py
+++ b/hypha/apply/projects/models/payment.py
@@ -176,7 +176,11 @@ class Meta:
verbose_name_plural = _("invoices")
def __str__(self):
- return _("Invoice requested for {project}").format(project=self.project)
+ if not self.invoice_number:
+ return _("Invoice for {project}").format(project=self.project)
+ return _("Invoice {number} for {project}").format(
+ number=self.invoice_number, project=self.project
+ )
@status_field.getter()
def _get_object_status(self):
diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
index d134d38bf2..92b70cae96 100644
--- a/hypha/apply/projects/models/project.py
+++ b/hypha/apply/projects/models/project.py
@@ -525,6 +525,30 @@ class Meta:
verbose_name = pgettext_lazy("singular", "project SOW")
verbose_name_plural = pgettext_lazy("plural", "project SOW")
+ def get_absolute_url(self):
+ return reverse("apply:projects:sow", kwargs={"pk": self.project.pk})
+
+ def __str__(self):
+ return _("Scope of Work for {project}").format(project=self.project)
+
+
+class ProjectFormPointer(models.Model):
+ """Due to the actual Project Form being embedded in the project object, this model serves as a way to differentiate activities between the project & project form"""
+
+ project = models.OneToOneField(
+ Project, related_name="pfp", on_delete=models.CASCADE
+ )
+
+ class Meta:
+ verbose_name = pgettext_lazy("singular", "project form")
+ verbose_name_plural = pgettext_lazy("plural", "project forms")
+
+ def get_absolute_url(self):
+ return reverse("apply:projects:approval", kwargs={"pk": self.project.pk})
+
+ def __str__(self):
+ return _("Project form for {project}").format(project=self.project)
+
class ProjectBaseStreamForm(BaseStreamForm, models.Model):
name = models.CharField(max_length=255)
diff --git a/hypha/apply/projects/reports/models.py b/hypha/apply/projects/reports/models.py
index 0e07626f5a..22f3e9fa66 100644
--- a/hypha/apply/projects/reports/models.py
+++ b/hypha/apply/projects/reports/models.py
@@ -127,6 +127,11 @@ class Meta:
def get_absolute_url(self):
return reverse("apply:projects:reports:detail", kwargs={"pk": self.pk})
+ def __str__(self):
+ return _("Report due {due_date} for {project}").format(
+ due_date=self.end_date, project=self.project
+ )
+
@property
def previous(self):
return (
diff --git a/hypha/apply/projects/reports/templates/reports/report_detail.html b/hypha/apply/projects/reports/templates/reports/report_detail.html
index b33cf16e86..814545c2c6 100644
--- a/hypha/apply/projects/reports/templates/reports/report_detail.html
+++ b/hypha/apply/projects/reports/templates/reports/report_detail.html
@@ -1,5 +1,5 @@
{% extends "base-apply.html" %}
-{% load i18n static nh3_tags heroicons %}
+{% load i18n static nh3_tags heroicons apply_tags %}
{% block title %}{% trans "Report" %} | {{ object.project.title }}{% endblock %}
@@ -16,51 +16,28 @@
{% block content %}