Opportunity Summary Fields

commcare_connect/opportunity/api/serializers.py

@@ -1,11 +1,35 @@
 from rest_framework import serializers
 
-from commcare_connect.opportunity.models import Opportunity
+from commcare_connect.opportunity.models import CommCareApp, Opportunity
+
+
+class CommCareAppSerializer(serializers.ModelSerializer):
+    organization = serializers.SlugRelatedField(read_only=True, slug_field="slug")
+
+    class Meta:
+        model = CommCareApp
+        fields = ["cc_domain", "cc_app_id", "name", "description", "organization"]
 
 
 class OpportunitySerializer(serializers.ModelSerializer):
     organization = serializers.SlugRelatedField(read_only=True, slug_field="slug")
+    learn_app = CommCareAppSerializer()
+    deliver_app = CommCareAppSerializer()
 
     class Meta:
         model = Opportunity
-        fields = ["id", "name", "description", "date_created", "date_modified", "organization"]
+        fields = [
+            "id",
+            "name",
+            "description",
+            "date_created",
+            "date_modified",
+            "organization",
+            "learn_app",
+            "deliver_app",
+            "end_date",
+            "max_visits_per_user",
+            "daily_max_visits_per_user",
+            "budget_per_visit",
+            "total_budget",
+        ]

commcare_connect/opportunity/forms.py

@@ -1,4 +1,7 @@
+from crispy_forms.helper import FormHelper, Layout
+from crispy_forms.layout import Field, Row, Submit
 from django import forms
+from django.utils.timezone import now
 
 from commcare_connect.opportunity.models import CommCareApp, Opportunity
 from commcare_connect.users.models import Organization
@@ -9,11 +12,33 @@ class Meta:
         model = Opportunity
         fields = ["name", "description", "active"]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper(self)
+        self.helper.layout = Layout(
+            Row(Field("name")),
+            Row(Field("description")),
+            Row(Field("active")),
+            Submit("submit", "Submit"),
+        )
+
 
 class OpportunityCreationForm(forms.ModelForm):
     class Meta:
         model = Opportunity
-        fields = ["name", "description"]
+        fields = [
+            "name",
+            "description",
+            "end_date",
+            "max_visits_per_user",
+            "daily_max_visits_per_user",
+            "budget_per_visit",
+            "total_budget",
+        ]
+        widgets = {
+            "end_date": forms.DateInput(attrs={"type": "date", "class": "form-control"}),
+        }
 
     learn_app = forms.ChoiceField()
     deliver_app = forms.ChoiceField()
@@ -24,15 +49,46 @@ def __init__(self, *args, **kwargs):
         self.org_slug = kwargs.pop("org_slug", "")
         super().__init__(*args, **kwargs)
 
+        self.helper = FormHelper(self)
+        self.helper.layout = Layout(
+            Row(Field("name")),
+            Row(Field("description")),
+            Row(Field("end_date")),
+            Row(
+                Field("max_visits_per_user", wrapper_class="form-group col-md-6 mb-0"),
+                Field("daily_max_visits_per_user", wrapper_class="form-group col-md-6 mb-0"),
+            ),
+            Row(
+                Field("total_budget", wrapper_class="form-group col-md-6 mb-0"),
+                Field("budget_per_visit", wrapper_class="form-group col-md-6 mb-0"),
+            ),
+            Row(Field("learn_app")),
+            Row(Field("deliver_app")),
+            Submit("submit", "Submit"),
+        )
+
         choices = [(app["id"], app["name"]) for app in self.applications]
         self.fields["learn_app"] = forms.ChoiceField(choices=choices)
         self.fields["deliver_app"] = forms.ChoiceField(choices=choices)
 
     def clean(self):
         cleaned_data = super().clean()
-        if cleaned_data["learn_app"] == cleaned_data["deliver_app"]:
-            self.add_error("learn_app", "Learn app and Deliver app cannot be same")
-            self.add_error("deliver_app", "Learn app and Deliver app cannot be same")
+        if cleaned_data:
+            if cleaned_data["learn_app"] == cleaned_data["deliver_app"]:
+                self.add_error("learn_app", "Learn app and Deliver app cannot be same")
+                self.add_error("deliver_app", "Learn app and Deliver app cannot be same")
+
+            if cleaned_data["daily_max_visits_per_user"] > cleaned_data["max_visits_per_user"]:
+                self.add_error(
+                    "daily_max_visits_per_user",
+                    "Daily max visits per user cannot be greater than Max visits per user",
+                )
+
+            if cleaned_data["budget_per_visit"] > cleaned_data["total_budget"]:
+                self.add_error("budget_per_visit", "Budget per visit cannot be greater than Total budget")
+
+            if cleaned_data["end_date"] < now().date():
+                self.add_error("end_date", "Please enter the correct end date for this opportunity")
 
     def save(self, commit=True):
         organization = Organization.objects.filter(slug=self.org_slug).first()

commcare_connect/opportunity/migrations/0003_opportunity_budget_per_visit_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.1 on 2023-07-18 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("opportunity", "0002_commcareapp_opportunity_deliver_app_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="opportunity",
+            name="budget_per_visit",
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name="opportunity",
+            name="daily_max_visits_per_user",
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name="opportunity",
+            name="end_date",
+            field=models.DateField(null=True),
+        ),
+        migrations.AddField(
+            model_name="opportunity",
+            name="max_visits_per_user",
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name="opportunity",
+            name="total_budget",
+            field=models.IntegerField(null=True),
+        ),
+    ]

commcare_connect/opportunity/models.py

@@ -41,6 +41,11 @@ class Opportunity(BaseModel):
         on_delete=models.CASCADE,
         null=True,
     )
+    max_visits_per_user = models.IntegerField(null=True)
+    daily_max_visits_per_user = models.IntegerField(null=True)
+    end_date = models.DateField(null=True)
+    budget_per_visit = models.IntegerField(null=True)
+    total_budget = models.IntegerField(null=True)
 
     def __str__(self):
         return self.name

commcare_connect/templates/opportunity/opportunity_create.html

@@ -9,8 +9,7 @@
 
     <form method="post">
       {% csrf_token %}
-      {{ form|crispy }}
-      <input class="btn btn-primary" type="submit">
+      {% crispy form %}
     </form>
 
   </div>