Implement 'Add manual task' feature

hypha/apply/activity/forms.py

@@ -5,16 +5,28 @@
 from pagedown.widgets import PagedownWidget
 
 from hypha.apply.stream_forms.fields import MultiFileField
+from hypha.apply.todo.options import COMMENT_TASK
+from hypha.apply.todo.views import add_manual_task_to_user
+from hypha.apply.users.models import STAFF_GROUP_NAME, User
 
 from .models import Activity, ActivityAttachment
 
 
 class CommentForm(FileFormMixin, forms.ModelForm):
     attachments = MultiFileField(label=_("Attachments"), required=False)
+    assigned_to = forms.ModelChoiceField(
+        queryset=User.objects.filter(groups__name=STAFF_GROUP_NAME),
+        required=False,
+        label=_("Assign task(optional)"),
+    )
 
     class Meta:
         model = Activity
-        fields = ("message", "visibility")
+        fields = (
+            "message",
+            "visibility",
+            "assigned_to",
+        )
         labels = {
             "visibility": "Visible to",
             "message": "Message",
@@ -23,7 +35,6 @@ class Meta:
             "visibility": "Select a relevant user role. Staff can view every comment."
         }
         widgets = {
-            "visibility": forms.RadioSelect(),
             "message": PagedownWidget(),
         }
 
@@ -47,10 +58,21 @@ def __init__(self, *args, user=None, **kwargs):
             visibility.choices = self.visibility_choices
             visibility.initial = visibility.initial[0]
             visibility.widget = forms.HiddenInput()
+        if not user.is_apply_staff:
+            self.fields["assigned_to"].widget = forms.HiddenInput()
 
     @transaction.atomic
     def save(self, commit=True):
         instance = super().save(commit=True)
+        assigned_user = self.cleaned_data["assigned_to"]
+        if assigned_user:
+            # add task to assigned user
+            add_manual_task_to_user(
+                code=COMMENT_TASK,
+                message=instance.message,
+                user=assigned_user,
+                related_obj=instance,
+            )
         added_files = self.cleaned_data["attachments"]
         if added_files:
             ActivityAttachment.objects.bulk_create(

hypha/apply/activity/models.py

@@ -245,6 +245,17 @@ def priviledged(self):
         # Not visible to applicant
         return self.visibility not in [APPLICANT, PARTNER, APPLICANT_PARTNERS, ALL]
 
+    # @property
+    def get_absolute_url(self):
+        if self.type == COMMENT:
+            return "{source_link}#communications".format(
+                source_link=self.source.get_absolute_url()
+            )
+        else:
+            return "{source_link}#activity_feed".format(
+                source_link=self.source.get_absolute_url()
+            )
+
     @property
     def private(self):
         # not visible to all

hypha/apply/activity/services.py

@@ -1,3 +1,8 @@
+from django.contrib.contenttypes.models import ContentType
+from django.db.models import OuterRef, Subquery
+
+from hypha.apply.todo.models import Task
+
 from .models import Activity
 
 
@@ -36,12 +41,21 @@ def get_related_comments_for_user(obj, user):
         [`Activity`][hypha.apply.activity.models.Activity] queryset
     """
     related_query = type(obj).activities.rel.related_query_name
-
-    return (
+    queryset = (
         Activity.comments.filter(**{related_query: obj})
         .select_related("user")
         .prefetch_related(
             "related_object",
         )
         .visible_to(user)
     )
+
+    if user.is_apply_staff:
+        assigned_to_subquery = Task.objects.filter(
+            related_content_type=ContentType.objects.get_for_model(Activity),
+            related_object_id=OuterRef("id"),
+        ).values("user__full_name")
+
+        queryset = queryset.annotate(assigned_to=Subquery(assigned_to_subquery))
+
+    return queryset

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

@@ -1,6 +1,40 @@
 {% load i18n %}
 
 <div class="wrapper wrapper--comments">
-    {% trans "Submit" as submit %}
-    {% include "funds/includes/delegated_form_base.html" with form=comment_form value=submit extra_classes="form__comments" %}
+    {% trans "Submit" as value %}
+    {% load i18n %}
+    <form
+        class="form form__comments"
+        method="post"
+        id="{% if form_id %}{{ form_id }}{% else %}{{ comment_form.name }}{% endif %}"
+        enctype="multipart/form-data"
+        {% if action %}action="{{ action }}"{% endif %}
+    >
+        {% csrf_token %}
+
+        {{ comment_form.media }}
+        {% for hidden in comment_form.hidden_fields %}
+            {{ hidden }}
+        {% endfor %}
+
+        <div class="fields--visible">
+            {% for field in comment_form.visible_fields %}
+                {% if field.field %}
+                    {% include "forms/includes/field.html" %}
+                {% else %}
+                    {{ field }}
+                {% endif %}
+            {% endfor %}
+
+            <button
+                class="button button--primary"
+                id="{{ comment_form.name }}-submit"
+                name="{{ form_prefix }}{{ comment_form.name }}"
+                type="submit"
+                form="{% if form_id %}{{ form_id }}{% else %}{{ comment_form.name }}{% endif %}">
+                {{ value }}
+            </button>
+        </div>
+
+    </form>
 </div>

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

@@ -21,6 +21,10 @@
                 {% endif %}
             </p>
 
+            {% if request.user.is_apply_staff and activity.assigned_to %}
+                <p class="feed__meta-item"><span>{% trans "Assigned to: " %} {{ activity.assigned_to }}</span></p>
+            {% endif %}
+
             {% if editable and activity.user == request.user %}
                 <p class="feed__meta-item feed__meta-item--edit-button">
                     <a class="link link--edit-submission is-active js-edit-comment" href="#">

hypha/apply/todo/migrations/0005_task_message_alter_task_code.py

@@ -0,0 +1,49 @@
+# Generated by Django 4.2.11 on 2024-07-29 11:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("todo", "0004_alter_task_code"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="task",
+            name="message",
+            field=models.CharField(blank=True, max_length=250, null=True),
+        ),
+        migrations.AlterField(
+            model_name="task",
+            name="code",
+            field=models.CharField(
+                choices=[
+                    ("comment_task", "Comment Task"),
+                    ("submission_draft", "Submission Draft"),
+                    ("determination_draft", "Determination draft"),
+                    ("review_draft", "Review Draft"),
+                    ("project_waiting_paf", "Project waiting PAF"),
+                    ("project_submit_paf", "Project submit PAF"),
+                    ("paf_required_changes", "PAF required changes"),
+                    ("paf_waiting_assignee", "PAF waiting assignee"),
+                    ("paf_waiting_approval", "PAF waiting approval"),
+                    ("project_waiting_contract", "Project waiting contract"),
+                    (
+                        "project_waiting_contract_document",
+                        "Project waiting contract document",
+                    ),
+                    (
+                        "project_waiting_contract_review",
+                        "Project waiting contract review",
+                    ),
+                    ("project_waiting_invoice", "Project waiting invoice"),
+                    ("invoice_required_changes", "Invoice required changes"),
+                    ("invoice_waiting_approval", "Invoice waiting approval"),
+                    ("invoice_waiting_paid", "Invoice waiting paid"),
+                    ("report_due", "Report due"),
+                ],
+                max_length=50,
+            ),
+        ),
+    ]

hypha/apply/todo/models.py

@@ -28,6 +28,8 @@ class Task(models.Model):
     )
     related_object_id = models.PositiveIntegerField(blank=True, null=True)
     related_object = GenericForeignKey("related_content_type", "related_object_id")
+    # for manually added tasks
+    message = models.CharField(max_length=250, null=True, blank=True)
 
     class Meta:
         ordering = ("-created_at",)

hypha/apply/todo/options.py

@@ -20,8 +20,10 @@
 INVOICE_WAITING_APPROVAL = "invoice_waiting_approval"
 INVOICE_WAITING_PAID = "invoice_waiting_paid"
 REPORT_DUE = "report_due"
+COMMENT_TASK = "comment_task"
 
 TASKS_CODE_CHOICES = (
+    (COMMENT_TASK, "Comment Task"),
     (SUBMISSION_DRAFT, "Submission Draft"),
     (DETERMINATION_DRAFT, "Determination draft"),
     (REVIEW_DRAFT, "Review Draft"),
@@ -42,13 +44,20 @@
 
 
 template_map = {
+    # ADD Manual Task
+    COMMENT_TASK: {
+        "text": _("{msg}"),
+        "icon": "comment",
+        "url": "{link}",
+        "type": _("Comment"),
+    },
     # SUBMISSIONS ACTIONS
     # :todo: actions for mupltiple stages of submission
     SUBMISSION_DRAFT: {
         "text": _(
             'A Submission draft [<span class="truncate inline-block max-w-32 align-bottom ">{related.title}</span>]({link} "{related.title}") is waiting to be submitted'
         ),
-        "icon": "edit-draft",
+        "icon": "comment",
         "url": "{link}",
         "type": _("Draft"),
     },
@@ -194,6 +203,7 @@ def get_task_template(request, task, **kwargs):
     template_kwargs = {
         "related": related_obj,
         "link": link_to(related_obj, request),
+        "msg": task.message if task.message else "",
     }
     template["text"] = template["text"].format(**template_kwargs)
     template["url"] = template["url"].format(**template_kwargs)

hypha/apply/todo/views.py

@@ -42,6 +42,7 @@ def dispatch(self, request, *args, **kwargs):
 
     def delete(self, *args, **kwargs):
         source = self.task.related_object
+        from hypha.apply.activity.models import Activity
         from hypha.apply.determinations.models import Determination
         from hypha.apply.projects.models import Invoice
         from hypha.apply.review.models import Review
@@ -52,6 +53,8 @@ def delete(self, *args, **kwargs):
             self.task.related_object, Review
         ):
             source = self.task.related_object.submission
+        elif isinstance(self.task.related_object, Activity):
+            source = self.task.related_object.source
         messenger(
             MESSAGES.REMOVE_TASK,
             user=self.request.user,
@@ -88,6 +91,21 @@ def add_task_to_user(code, user, related_obj):
     return None
 
 
+def add_manual_task_to_user(code, message, user, related_obj):
+    """
+    Add task for a user
+    input:
+        message: message
+        user: User object
+        related_obj: Object - Submission, Project, Invoice, Report
+    output: task - Task object / None in case of no creation
+    """
+    task = Task.objects.create(
+        code=code, user=user, related_object=related_obj, message=message
+    )
+    return task
+
+
 def add_task_to_user_group(code, user_group, related_obj):
     """
     Add task for user_groups

hypha/static_src/sass/components/_form.scss

@@ -449,12 +449,12 @@
     &__comments {
         .fields--visible {
             display: grid;
-            grid-template-areas: "message" "attachments" "visibility" "actions";
+            grid-template-areas: "message" "attachments" "visibility" "assigned_to" "actions";
             grid-template-rows: auto auto auto auto;
             grid-template-columns: 1fr;
 
             @include media-query(lg) {
-                grid-template-areas: "message attachments" "message visibility";
+                grid-template-areas: "message attachments" "message visibility" "message assigned_to" "actions assigned_to";
                 grid-template-rows: auto auto;
                 grid-template-columns: 2fr 1fr;
                 column-gap: 2rem;
@@ -466,6 +466,16 @@
                 }
             }
 
+            // stylelint-disable-next-line selector-class-pattern
+            .button {
+                max-width: 150px;
+            }
+
+            // stylelint-disable-next-line selector-class-pattern
+            .form__group {
+                margin-block-end: 0.5rem;
+            }
+
             // stylelint-disable-next-line selector-class-pattern
             .id_attachments {
                 grid-area: attachments;
@@ -484,6 +494,13 @@
             .id_visibility_0 {
                 grid-area: visibility;
             }
+
+            // stylelint-disable-next-line selector-class-pattern
+            .id_assigned_to {
+                grid-area: assigned_to;
+                display: flex;
+                flex-direction: column;
+            }
         }
     }
 

hypha/templates/includes/menu-notifications.html

@@ -38,6 +38,7 @@
             <button type="button" @click='open = false' class="appearance-none opacity-70 hover:opacity-100">
                 {% heroicon_solid "x-mark" aria_hidden="true" class="" %}
             </button>
+
         </header>
 
         <div

hypha/templates/includes/sprites.html

@@ -29,4 +29,8 @@
         <path d="M12 20h9"/>
         <path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z"/>
     </svg>
+    <svg id="comment" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+        <path stroke-linecap="round" stroke-linejoin="round" d="M8.625 9.75a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H8.25m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H12m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0h-.375m-13.5 3.01c0 1.6 1.123 2.994 2.707 3.227 1.087.16 2.185.283 3.293.369V21l4.184-4.183a1.14 1.14 0 0 1 .778-.332 48.294 48.294 0 0 0 5.83-.498c1.585-.233 2.708-1.626 2.708-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018Z" />
+    </svg>
+
 </svg>