[WIP] CLDT seat implementation

amy/api/v2/serializers.py

@@ -174,6 +174,9 @@ class MembershipSerializer(serializers.ModelSerializer):
     inhouse_instructor_training_seats_total = serializers.IntegerField()
     inhouse_instructor_training_seats_utilized = serializers.IntegerField()
     inhouse_instructor_training_seats_remaining = serializers.IntegerField()
+    cldt_seats_total = serializers.IntegerField()
+    cldt_seats_utilized = serializers.IntegerField()
+    cldt_seats_remaining = serializers.IntegerField()
 
     class Meta:
         model = Membership
@@ -220,6 +223,9 @@ class Meta:
             "inhouse_instructor_training_seats_total",
             "inhouse_instructor_training_seats_utilized",
             "inhouse_instructor_training_seats_remaining",
+            "cldt_seats_total",
+            "cldt_seats_utilized",
+            "cldt_seats_remaining",
         )
 
 

amy/extrequests/utils.py

@@ -152,6 +152,13 @@ def get_membership_warnings_after_match(
             "it's been allowed.",
         )
 
+    cldt_remaining = membership.cldt_seats_remaining
+    if cldt_remaining <= 0:
+        warnings.append(
+            f'Membership "{membership}" is using more CLDT seats than '
+            "it's been allowed.",
+        )
+
     # check if membership is active
     if not (membership.agreement_start <= date.today() <= membership.agreement_end):
         warnings.append(

amy/fiscal/forms.py

@@ -120,13 +120,17 @@ class Meta:
             "additional_public_instructor_training_seats",
             "inhouse_instructor_training_seats",
             "additional_inhouse_instructor_training_seats",
+            "cldt_seats",
+            "additional_cldt_seats",
             "emergency_contact",
             "workshops_without_admin_fee_rolled_over",
             "workshops_without_admin_fee_rolled_from_previous",
             "public_instructor_training_seats_rolled_over",
             "public_instructor_training_seats_rolled_from_previous",
             "inhouse_instructor_training_seats_rolled_over",
             "inhouse_instructor_training_seats_rolled_from_previous",
+            "cldt_seats_rolled_over",
+            "cldt_seats_rolled_from_previous",
         ]
 
     def __init__(
@@ -145,10 +149,12 @@ def __init__(
             del self.fields["workshops_without_admin_fee_rolled_over"]
             del self.fields["public_instructor_training_seats_rolled_over"]
             del self.fields["inhouse_instructor_training_seats_rolled_over"]
+            del self.fields["cldt_seats_rolled_over"]
         if not show_rolled_from_previous:
             del self.fields["workshops_without_admin_fee_rolled_from_previous"]
             del self.fields["public_instructor_training_seats_rolled_from_previous"]
             del self.fields["inhouse_instructor_training_seats_rolled_from_previous"]
+            del self.fields["cldt_seats_rolled_from_previous"]
 
         # set up a layout object for the helper
         self.helper.layout = self.helper.build_default_layout(self)
@@ -288,6 +294,9 @@ class Meta(MembershipCreateForm.Meta):
             "inhouse_instructor_training_seats",
             "additional_inhouse_instructor_training_seats",
             "inhouse_instructor_training_seats_rolled_from_previous",
+            "cldt_seats",
+            "additional_cldt_seats",
+            "cldt_seats_rolled_from_previous",
             "emergency_contact",
             "comment",
         ]
@@ -303,6 +312,7 @@ def __init__(self, *args, **kwargs):
             "workshops_without_admin_fee_rolled_from_previous",
             "public_instructor_training_seats_rolled_from_previous",
             "inhouse_instructor_training_seats_rolled_from_previous",
+            "cldt_seats_rolled_from_previous",
         ]
         for field in fields:
             self[field].field.min_value = 0

amy/fiscal/views.py

@@ -287,6 +287,10 @@ def form_valid(self, form):
                 "inhouse_instructor_training_seats_rolled_over",
                 "inhouse_instructor_training_seats_rolled_from_previous",
             ),
+            (
+                "cldt_seats_rolled_over",
+                "cldt_seats_rolled_from_previous",
+            ),
         )
         save_rolled_to = False
         try:
@@ -584,6 +588,9 @@ def get_initial(self) -> Dict[str, Any]:
             "inhouse_instructor_training_seats": self.membership.inhouse_instructor_training_seats,  # noqa
             "additional_inhouse_instructor_training_seats": self.membership.additional_inhouse_instructor_training_seats,  # noqa
             "inhouse_instructor_training_seats_rolled_from_previous": 0,
+            "cldt_seats": self.membership.cldt_seats,  # noqa
+            "additional_cldt_seats": self.membership.additional_cldt_seats,  # noqa
+            "cldt_seats_rolled_from_previous": 0,
             "emergency_contact": self.membership.emergency_contact,
         }
 
@@ -599,6 +606,9 @@ def get_form_kwargs(self) -> Dict[str, Any]:
             "inhouse_instructor_training_seats_rolled_from_previous": max(
                 self.membership.inhouse_instructor_training_seats_remaining, 0
             ),
+            "cldt_seats_rolled_from_previous": max(
+                self.membership.cldt_seats_remaining, 0
+            ),
         }
         return {
             "max_values": max_values,
@@ -623,6 +633,9 @@ def form_valid(self, form):
         self.membership.inhouse_instructor_training_seats_rolled_over = (
             form.instance.inhouse_instructor_training_seats_rolled_from_previous
         )
+        self.membership.cldt_seats_rolled_over = (
+            form.instance.cldt_seats_rolled_from_previous
+        )
         self.membership.rolled_to_membership = self.object
         self.membership.save()
 

amy/reports/views.py

@@ -143,12 +143,13 @@ def instructor_issues(request):
         airport__isnull=True
     )
 
-    # Everyone who's been in instructor training but doesn't yet have a badge.
+    # Everyone who's been in instructor training or CLDT but doesn't yet have a badge.
     learner = Role.objects.get(name="learner")
     ttt = Tag.objects.get(name="TTT")
+    cldt = Tag.objects.get(name="CLDT")
     stalled = Tag.objects.get(name="stalled")
     trainees = (
-        Task.objects.filter(event__tags__in=[ttt], role=learner)
+        Task.objects.filter(event__tags__in=[ttt, cldt], role=learner)
         .exclude(person__badges__in=instructor_badges)
         .order_by("person__family", "person__personal", "event__start")
         .select_related("person", "event")

amy/templates/fiscal/all_memberships.html

@@ -17,7 +17,8 @@
         <th>Variant</th>
         <th>Dates</th>
         <th>Contribution</th>
-        <th>Remaining instructor training seats</th>
+        <th>IT seats</th>
+        <th>CLDT seats</th>
         <th class="additional-links"></th>
       </tr>
       {% for membership in all_memberships %}
@@ -41,7 +42,10 @@
           <td>{{ membership.agreement_start|date:"Y-m-d" }} &mdash; {{ membership.agreement_end|date:"Y-m-d" }}</td>
           <td>{{ membership.get_contribution_type_display }}</td>
           <td {% if membership.instructor_training_seats_remaining <= 0 and membership.instructor_training_seats_total > 0 or membership.instructor_training_seats_remaining < 0 and membership.instructor_training_seats_total == 0 %}class="table-danger"{% endif %}>
-            {{ membership.instructor_training_seats_remaining }}
+            {{ membership.instructor_training_seats_remaining }} / {{ membership.instructor_training_seats_total }}
+          </td>
+          <td {% if membership.cldt_seats_remaining <= 0 and membership.cldt_seats_total > 0 or membership.cldt_seats_remaining < 0 and membership.cldt_seats_total == 0 %}class="table-danger"{% endif %}>
+            {{ membership.cldt_seats_remaining }} / {{ membership.cldt_seats_total }}
           </td>
           <td>
             <a href="{% url 'membership_details' membership.pk %}" title="View membership"><i class="fas fa-info-circle"></i></a>

amy/templates/fiscal/membership.html

@@ -168,6 +168,30 @@
       </p>
     </td>
   </tr>
+  <tr>
+    <th rowspan="3" width="30%">CLDT seats</th>
+    <th>Allowed:</th>
+    <td>
+      {{ membership.cldt_seats_total }}
+      <p class="small">
+        Includes {{ membership.additional_cldt_seats }} additional seats.<br>
+        Includes {{ membership.cldt_seats_rolled_from_previous|default_if_none:0 }} seats rolled from previous membership.
+      </p>
+    </td>
+  </tr>
+  <tr>
+    <th>Utilized:</th>
+    <td>{{ membership.cldt_seats_utilized }}</td>
+  </tr>
+  <tr {% if membership.cldt_seats_remaining <= 0 and membership.cldt_seats_total > 0 or membership.cldt_seats_remaining < 0 and membership.cldt_seats_total == 0 %}class="table-danger"{% endif %}>
+    <th>Remaining:</th>
+    <td>
+      {{ membership.cldt_seats_remaining }}
+      <p class="small">
+        {{ membership.cldt_seats_rolled_over|default:"None" }} were rolled over to following membership.
+      </p>
+    </td>
+  </tr>
   <tr>
     <th>Instructor training seats:</th>
     <td colspan="2">

amy/templates/fiscal/organization.html

@@ -115,6 +115,7 @@ <h2>Memberships</h2>
     <th colspan="2">Self-organised workshops <i class="fas fa-question-circle" data-toggle="tooltip" title="Per agreement duration"></i></th>
     <th colspan="3">Public instructor training seats</th>
     <th colspan="3">In-house instructor training seats</th>
+    <th colspan="3">CLDT seats</th>
     <th rowspan="2" class="additional-links"></th>
   </tr>
   <tr>
@@ -137,6 +138,10 @@ <h2>Memberships</h2>
     <th><small>Allowed</small></th>
     <th><small>Utilized</small></th>
     <th><small>Remaining</small></th>
+    <!-- CLDT seats -->
+    <th><small>Allowed</small></th>
+    <th><small>Utilized</small></th>
+    <th><small>Remaining</small></th>
   </tr>
   {% for membership in organization.memberships.all %}
   <tr>
@@ -203,6 +208,24 @@ <h2>Memberships</h2>
         Inc. {{ membership.inhouse_instructor_training_seats_rolled_over|default:0 }} rolled over
       </p>
     </td>
+    <!-- CLDT seats -->
+    <td>
+        {{ membership.cldt_seats_total|default_if_none:"&mdash;" }}
+        <p class="small">
+          Inc.
+          {{ membership.additional_cldt_seats|default:0 }} additional,
+          {{ membership.cldt_seats_rolled_from_previous|default:0 }} rolled from prev.
+        </p>
+      </td>
+      <td>{{ membership.cldt_seats_utilized|default_if_none:"&mdash;" }}</td>
+      <td
+        {% if membership.cldt_seats_remaining <= 0 and membership.cldt_seats_total > 0 or membership.cldt_seats_remaining < 0 and membership.cldt_seats_total == 0 %}class="table-danger"{% endif %}
+      >
+        {{ membership.cldt_seats_remaining }}
+        <p class="small">
+          Inc. {{ membership.cldt_seats_rolled_over|default:0 }} rolled over
+        </p>
+      </td>
     <!-- link -->
     <td>
       <a href="{% url 'membership_details' membership.pk %}" title="View membership"><i class="fas fa-info-circle"></i></a>

amy/workshops/management/commands/fake_database.py

@@ -182,6 +182,7 @@ def fake_tags(self):
             ("LSO", 170, "Lesson Specific Onboarding"),
             ("hackathon", 180, "Event is a hackathon"),
             ("WiSE", 190, "Women in Science and Engineering"),
+            ("CLDT", 200, "Collaborative Lesson Development Training"),
         ]
 
         self.stdout.write("Generating {} fake tags...".format(len(tags)))