Implement invoice/payment report / Fix forms

commcare_connect/opportunity/tables.py

@@ -531,6 +531,14 @@ def render_payment_date(self, value):
         return
 
 
+class TWPaymentInvoiceTable(PaymentInvoiceTable):
+    pk = None
+
+    class Meta(PaymentInvoiceTable.Meta):
+        fields = ("amount", "date", "invoice_number", "service_delivery")
+        sequence = ("amount", "date", "invoice_number", "payment_status", "payment_date", "service_delivery")
+
+
 def popup_html(value, popup_title, popup_direction="top", popup_class="", popup_attributes=""):
     return format_html(
         "<span class='{}' data-bs-toggle='tooltip' data-bs-placement='{}' data-bs-title='{}' {}>{}</span>",

commcare_connect/opportunity/tw_form_views.py

@@ -1,10 +1,12 @@
 from django.contrib import messages
 from django.db.models import Q
 from django.forms import modelformset_factory
+from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.test.utils import override_settings
 from django.urls import reverse
 from django.views.generic import CreateView
+from crispy_forms.utils import render_crispy_form
 
 from commcare_connect.opportunity import views
 from commcare_connect.opportunity.models import (
@@ -40,6 +42,7 @@
 from commcare_connect.organization.decorators import org_admin_required, org_member_required
 from commcare_connect.program import views as program_views
 from commcare_connect.users.models import User
+from commcare_connect.utils.commcarehq_api import get_domains_for_user
 
 
 @override_settings(CRISPY_TEMPLATE_PACK="tailwind")
@@ -111,6 +114,10 @@ class OpportunityEdit(views.OpportunityEdit):
     template_name = "tailwind/pages/opportunity_edit.html"
     form_class = OpportunityChangeForm
 
+    def get_success_url(self):
+        return reverse("opportunity:tw_opportunity_detail", args=(self.request.org.slug, self.object.id))
+
+
 
 @override_settings(CRISPY_TEMPLATE_PACK="tailwind")
 @org_member_required
@@ -226,7 +233,7 @@ def send_message_mobile_users(request, org_slug=None, pk=None):
             send_push_notification_task.delay(selected_user_ids, title, body)
         if "sms" in message_type:
             send_sms_task.delay(selected_user_ids, body)
-        return redirect("opportunity:detail", org_slug=request.org.slug, pk=pk)
+        return redirect("opportunity:tw_opportunity_detail", request.org.slug, pk)
 
     return render(
         request,
@@ -245,16 +252,15 @@ def send_message_mobile_users(request, org_slug=None, pk=None):
 @org_member_required
 def invoice_create(request, org_slug=None, pk=None):
     opportunity = get_opportunity_or_404(pk, org_slug)
-    # if not opportunity.managed or request.org_membership.is_program_manager:
-    #     return redirect("opportunity:detail", org_slug, pk)
+    if not opportunity.managed or request.org_membership.is_program_manager:
+        return redirect("opportunity:detail", org_slug, pk)
     form = PaymentInvoiceForm(data=request.POST or None, opportunity=opportunity)
     if request.POST and form.is_valid():
         form.save()
-    return render(
-        request,
-        "tailwind/pages/form.html",
-        dict(title=f"{request.org.slug} - {opportunity.name}", form=form),
-    )
+        form = PaymentInvoiceForm(opportunity=opportunity)
+        return redirect("opportunity:tw_invoice_list", org_slug, pk)
+    return HttpResponse(render_crispy_form(form))
+
 
 
 @override_settings(CRISPY_TEMPLATE_PACK="tailwind")
@@ -278,7 +284,7 @@ def get_success_url(self):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs["domains"] = []
+        kwargs["domains"] = get_domains_for_user(self.request.user)
         kwargs["user"] = self.request.user
         kwargs["org_slug"] = self.request.org.slug
         return kwargs
@@ -317,6 +323,11 @@ def get_template_names(self):
         template = f"tailwind/pages/program_{view}.html"
         return template
 
+    def get_success_url(self):
+        # Todo; update with tailwind URL
+        return reverse("program:list", kwargs={"org_slug": self.request.org.slug})
+
+
 
 def invite_organization(request, org_slug=None, pk=None):
     return render(request, "tailwind/pages/invite_organization.html")

commcare_connect/opportunity/tw_forms.py

@@ -7,8 +7,9 @@
 from django.core.exceptions import ValidationError
 from django.db.models import Q, Sum
 from django.utils.timezone import now
+from django.urls import reverse
 
-from commcare_connect.connect_id_client.models import Credential
+from commcare_connect import connect_id_client
 from commcare_connect.opportunity.forms import FILTER_COUNTRIES, DateRanges
 from commcare_connect.organization.models import Organization
 from commcare_connect.program.models import ManagedOpportunity, Program
@@ -157,14 +158,6 @@ def clean_deliver_unit(self):
             raise ValidationError("Flags are already configured for this Deliver Unit.")
         return deliver_unit
 
-def icon_field(field_name, icon_class, **kwargs):
-    icon_html = f'<i class="fa {icon_class} mr-2 text-gray-500"></i>'
-    return Field(
-        field_name,
-        label=Markup(icon_html + field_name.capitalize()),
-        **kwargs
-    )
-
 
 class FormJsonValidationRulesForm(forms.ModelForm):
     class Meta:
@@ -213,7 +206,7 @@ def __init__(self, *args, **kwargs):
 class OpportunityUserInviteForm(forms.Form):
     def __init__(self, *args, **kwargs):
         org_slug = kwargs.pop("org_slug", None)
-        credentials = [Credential(org_slug, org_slug)]  # connect_id_client.fetch_credentials(org_slug)
+        credentials = connect_id_client.fetch_credentials(org_slug)
         super().__init__(*args, **kwargs)
 
         self.helper = TailwindFormHelper(self)
@@ -523,11 +516,6 @@ def __init__(self, *args, **kwargs):
                     ),
                     css_class="flex flex-col gap-2",
                 ),
-                Row(
-                    Submit("cancel", "Cancel", css_class="button button-md outline-style"),
-                    Submit("submit", "Submit", css_class="button button-md primary-dark"),
-                    css_class="flex justify-end gap-4",
-                ),
                 css_class="flex flex-col gap-4",
             )
         )
@@ -586,15 +574,13 @@ def __init__(self, *args, **kwargs):
             Row(
                 HTML("<div class='col-span-2'><h6 class='title-sm'>Apps</h6>  <span class='hint'>Add required apps to the opportunity. All fields are mandatory.</span> </div>"),
                 Column(
-                    "Learn App",
                     Field("learn_app_domain", css_class=SELECT_CLASS),
                     Field("learn_app", css_class=SELECT_CLASS),
                     Field("learn_app_description", css_class=TEXTAREA_CLASS),
                     Field("learn_app_passing_score", css_class=BASE_INPUT_CLASS),
                     data_loading_states=True,
                 ),  
                 Column(
-                    "Deliver App",
                     Field("deliver_app_domain", css_class=SELECT_CLASS),
                     Field("deliver_app", css_class=SELECT_CLASS), 
                     data_loading_states=True,
@@ -607,20 +593,40 @@ def __init__(self, *args, **kwargs):
             )
         )
 
-        domain_choices = [(i, f"Domain {i}") for i in range(1, 11)]
+        domain_choices = [(domain, domain) for domain in self.domains]
         self.fields["description"] = forms.CharField(widget=forms.Textarea(attrs={"rows": 3}))
         self.fields["learn_app_domain"] = forms.ChoiceField(
             choices=domain_choices,
+            widget=forms.Select(
+                attrs={
+                    "hx-get": reverse("opportunity:get_applications_by_domain", args=(self.org_slug,)),
+                    "hx-include": "#id_learn_app_domain",
+                    "hx-trigger": "load delay:0.3s, change",
+                    "hx-target": "#id_learn_app",
+                    "data-loading-disable": True,
+                }
+            ),
+        )
+        self.fields["learn_app"] = forms.Field(
+            widget=forms.Select(choices=[(None, "Loading...")], attrs={"data-loading-disable": True})
         )
-        learn_app_choices = [(i, f"Learn App {i}") for i in range(1, 11)]
-        self.fields["learn_app"] = forms.Field(widget=forms.Select(choices=learn_app_choices))
         self.fields["learn_app_description"] = forms.CharField(widget=forms.Textarea(attrs={"rows": 3}))
         self.fields["learn_app_passing_score"] = forms.IntegerField(max_value=100, min_value=0)
         self.fields["deliver_app_domain"] = forms.ChoiceField(
             choices=domain_choices,
+            widget=forms.Select(
+                attrs={
+                    "hx-get": reverse("opportunity:get_applications_by_domain", args=(self.org_slug,)),
+                    "hx-include": "#id_deliver_app_domain",
+                    "hx-trigger": "load delay:0.3s, change",
+                    "hx-target": "#id_deliver_app",
+                    "data-loading-disable": True,
+                }
+            ),
+        )
+        self.fields["deliver_app"] = forms.Field(
+            widget=forms.Select(choices=[(None, "Loading...")], attrs={"data-loading-disable": True})
         )
-        deliver_app_choices = [(i, f"Deliver App {i}") for i in range(1, 11)]
-        self.fields["deliver_app"] = forms.Field(widget=forms.Select(choices=deliver_app_choices))
         self.fields["api_key"] = forms.CharField(max_length=50)
 
     def clean(self):

commcare_connect/opportunity/urls.py

@@ -54,10 +54,6 @@
     user_visits_list,
     verification_flags_config,
     visit_verification,
-    worker_deliver,
-    worker_learn,
-    worker_list,
-    worker_verify,
 )
 
 app_name = "opportunity"
@@ -119,10 +115,6 @@
     path("<int:opp_id>/suspend_user/<int:pk>/", view=suspend_user, name="suspend_user"),
     path("<int:opp_id>/revoke_user_suspension/<int:pk>/", view=revoke_user_suspension, name="revoke_user_suspension"),
     path("<int:opp_id>/delete_form_json_rule/<int:pk>/", view=delete_form_json_rule, name="delete_form_json_rule"),
-    path("<int:opp_id>/workers/list/", view=worker_list, name="worker_list"),
-    path("<int:opp_id>/workers/learn/", view=worker_learn, name="worker_learn"),
-    path("<int:opp_id>/workers/deliver/", view=worker_deliver, name="worker_deliver"),
-    path("<int:opp_id>/workers/verify/", view=worker_verify, name="worker_verify"),
     path("<int:pk>/catchment_area_export/", view=export_catchment_area, name="catchment_area_export"),
     path("<int:pk>/catchment_area_import/", view=import_catchment_area, name="catchment_area_import"),
     path("<int:pk>/payment_report/", payment_report, name="payment_report"),
@@ -139,48 +131,64 @@
     path("<int:opp_id>/tw/dashboard/", tw_views.dashboard, name="tw_worker"),
     path("<int:opp_id>/tw/pm_dashboard/", tw_views.pm_dashboard, name="pm_dashboard"),
     path("<int:opp_id>/tw/worker/", tw_views.worker, name="tw_worker"),
-    path("<int:opp_id>/tw/opportunities/", tw_views.opportunities, name="tw_opportunities"),
+    path("<int:opp_id>/tw/opportunities/", tw_views.opportunities, name="tw_opportunity_detail"),
     path("<int:opp_id>/tw/opportunities_list/", tw_views.opportunities_list, name="tw_opportunities"),
     path("<int:opp_id>/tw/pm_opportunities_list/", tw_views.pm_opportunities_list, name="tw_pm_opportunities"),
-    path("<int:opp_id>/tw/worker_learn/", tw_views.worker_learn, name="tw_worker_learn"), # TABLE
+    path("<int:opp_id>/tw/worker_learn/", tw_views.worker_learn, name="tw_worker_learn"),  # TABLE
     path("<int:opp_id>/tw/worker_delivery/", tw_views.worker_delivery, name="tw_worker_deliver"),
     path("<int:opp_id>/tw/worker_payments/", tw_views.worker_payments, name="tw_opportunities"),  # TABLE
     path("<int:opp_id>/tw/worker_main/", tw_views.worker_main, name="tw_opportunities"),  # TABLE
     path("<int:opp_id>/tw/get_worker_last_payment/", tw_views.get_worker_last_payment, name="tw_opportunities"),
     path("<int:opp_id>/tw/workers_list/", tw_views.opportunity_worker, name="tw_opportunities"),
-    path("<int:opp_id>/tw/workers_list/learn_progress", tw_views.opportunity_worker_learn_progress, name="tw_opportunity_worker_learn_progress"),
-    path("<int:opp_id>/tw/workers_list/payments", tw_views.opportunity_worker_payment, name="tw_opportunity_worker_learn_progress"),
-    path("<int:opp_id>/tw/invoice_list/", tw_views.invoice_list, name="tw_invoice_list"),
+    path(
+        "<int:opp_id>/tw/workers_list/learn_progress",
+        tw_views.opportunity_worker_learn_progress,
+        name="tw_opportunity_worker_learn_progress",
+    ),
+    path(
+        "<int:opp_id>/tw/workers_list/payments",
+        tw_views.opportunity_worker_payment,
+        name="tw_opportunity_worker_learn_progress",
+    ),
+    path("<int:pk>/tw/invoice_list/", views.tw_invoice_list, name="tw_invoice_list"),
+    path("<int:pk>/tw/invoice_payment_report/", views.tw_payment_report, name="tw_payment_report"),
     path("<int:opp_id>/tw/my_organization/", tw_views.my_organization, name="tw_my_organization"),
     path("<int:opp_id>/tw/add_budget/", tw_views.add_budget, name="tw_add_budget"),
-    path("<int:opp_id>/tw/visits/", tw_views.opportunity_visits, name="tw_visits"), # TODO
-    path("<int:opp_id>/tw/create/", tw_views.create_opportunity, name="tw_visits"), # TODO 
+    path("<int:opp_id>/tw/visits/", tw_views.opportunity_visits, name="tw_visits"),  # TODO
+    path("<int:opp_id>/tw/create/", tw_views.create_opportunity, name="tw_visits"),  # TODO 
     path("<int:opp_id>/tw/onboarding/", tw_views.onboarding, name="tw_onboarding"),
     path("<int:opp_id>/tw/onboarding/welcome", tw_views.welcome, name="tw_welcome"),
     path("<int:opp_id>/tw/onboarding/setup-org", tw_views.onboarding_org, name="tw_setup_org"),
     path("<int:opp_id>/tw/onboarding/invite", tw_views.onboarding_invite, name="tw_invite"),
     # Tables
     path("<int:opp_id>/tw/tables/flagged_workers/", tw_views.flagged_workers, name="tw_flagged_workers"),
-    path("<int:opp_id>/tw/tables/opportunities_list/", tw_views.opportunities_list_table_view, name="tw_flagged_workers"), # TODO
-    path("<int:opp_id>/tw/tables/pm_opportunities_list/", tw_views.pm_opportunities_list_table_view, name="pm_opp_list"),
+    path(
+        "<int:opp_id>/tw/tables/opportunities_list/", tw_views.opportunities_list_table_view, name="tw_flagged_workers"
+    ),  # TODO
+    path(
+        "<int:opp_id>/tw/tables/pm_opportunities_list/", tw_views.pm_opportunities_list_table_view, name="pm_opp_list"
+    ),
     path("<int:opp_id>/tw/tables/pay_worker", tw_views.pay_worker, name="tw_pay_worker"),
-    path("<int:opp_id>/tw/tables/all_invoice", tw_views.all_invoice_table, name="tw_all_invoice"),
-    path("<int:opp_id>/tw/tables/invoice_report", tw_views.invoice_report_table, name="tw_invoice_report"),
-    path("<int:opp_id>/tw/tables/my_organization_members", tw_views.my_organization_members_table, name="tw_my_organization_members_table"),
-    path("<int:opp_id>/tw/tables/learn_app",tw_views.learn_app_table, name="tw_learn_app"),
-    path("<int:opp_id>/tw/tables/delivery_app",tw_views.delivery_app_table, name="tw_delivery_app"),
-    path("<int:opp_id>/tw/tables/payment_app",tw_views.payment_app_table, name="tw_payment_app"),
-    path("<int:opp_id>/tw/tables/worker_flagged_table",tw_views.worker_flagged_table, name="tw_flagged_table"),
-    path("<int:opp_id>/tw/tables/worker_review_table",tw_views.worker_review_table, name="tw_review_table"),
-    path("<int:opp_id>/tw/tables/worker_revalidate_table",tw_views.worker_revalidate_table, name="tw_revalidate_table"),
-    path("<int:opp_id>/tw/tables/worker_approved_table",tw_views.worker_approved_table, name="tw_approved_table"),
-    path("<int:opp_id>/tw/tables/worker_rejected_table",tw_views.worker_rejected_table, name="tw_rejected_table"),
-    path("<int:opp_id>/tw/tables/worker_all_table",tw_views.worker_all_table, name="tw_all_table"),
+    path(
+        "<int:opp_id>/tw/tables/my_organization_members",
+        tw_views.my_organization_members_table,
+        name="tw_my_organization_members_table",
+    ),
+    path("<int:opp_id>/tw/tables/learn_app", tw_views.learn_app_table, name="tw_learn_app"),
+    path("<int:opp_id>/tw/tables/delivery_app", tw_views.delivery_app_table, name="tw_delivery_app"),
+    path("<int:opp_id>/tw/tables/payment_app", tw_views.payment_app_table, name="tw_payment_app"),
+    path("<int:opp_id>/tw/tables/worker_flagged_table", tw_views.worker_flagged_table, name="tw_flagged_table"),
+    path("<int:opp_id>/tw/tables/worker_review_table", tw_views.worker_review_table, name="tw_review_table"),
+    path(
+        "<int:opp_id>/tw/tables/worker_revalidate_table", tw_views.worker_revalidate_table, name="tw_revalidate_table"
+    ),
+    path("<int:opp_id>/tw/tables/worker_approved_table", tw_views.worker_approved_table, name="tw_approved_table"),
+    path("<int:opp_id>/tw/tables/worker_rejected_table", tw_views.worker_rejected_table, name="tw_rejected_table"),
+    path("<int:opp_id>/tw/tables/worker_all_table", tw_views.worker_all_table, name="tw_all_table"),
     # API
-    path("<int:opp_id>/tw/api/payment_app_expand",tw_views.payment_app_table_expand, name="tw_payment_app"),
+    path("<int:opp_id>/tw/api/payment_app_expand", tw_views.payment_app_table_expand, name="tw_payment_app"),
     path("<int:opp_id>/tw/api/payment_history/", tw_views.payment_history, name="tw_payment_history"),
     path("<int:opp_id>/tw/api/opportunities/", tw_views.opportunities_card, name="tw_opportunities_card"),
-    path("<int:opp_id>/tw/api/invoice_report_card/", tw_views.invoice_report_card, name="tw_invoice_report_card"),
     path("<int:opp_id>/tw/api/signup/", tw_views.signup_comp, name="signup_comp"),
     path("<int:opp_id>/tw/api/login/", tw_views.login_comp, name="login_comp"),
     path("<int:opp_id>/tw/api/create-org/", tw_views.create_org_comp, name="create_org_comp"),