add batch selection option

Author: cookkate

pptp/forms/products.py

@@ -40,8 +40,7 @@ class Meta:
             'storage_condition',
             'primary_package_material',
             'secondary_package_material',
-            'is_supplemented_food',
-            'is_tds',
+            'source_batch',
             'is_variety_pack',
             'is_individually_packaged',
             'has_preparation_instructions',
@@ -94,8 +93,9 @@ class Meta:
             'secondary_package_material': forms.Select(attrs={
                 'class': 'form-select'
             }),
-            'is_supplemented_food': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
-            'is_tds': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
+            'source_batch': forms.Select(attrs={
+                'class': 'form-select'
+            }),
             'is_variety_pack': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
             'is_individually_packaged': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
             'has_preparation_instructions': forms.CheckboxInput(attrs={'class': 'form-check-input'}),

pptp/models/products.py

@@ -37,6 +37,13 @@
     ("other", "Other"),
 ]
 
+BATCH_CHOICES = [
+    ("2025_snapcan","SNAP-CAN 2025"),
+    ("tds","Total Diet Study"),
+    ("2025_supp_food","2025 Supplemented Food Collection"),
+    ("2025_frozen_entrees","2025 Frozen Entrees Collection"),
+]
+
 
 def get_upload_path(instance, filename):
     model_name = instance.__class__.__name__.lower()
@@ -116,6 +123,12 @@ class Product(models.Model):
         help_text=_("Secondary packaging (optional)")
     )
 
+    source_batch = models.CharField(
+        choices=BATCH_CHOICES,
+        null=True,
+        help_text=_("Product collection batch")
+    )
+
     num_units = models.IntegerField(blank=True, null=True, help_text=_("Number of individual units (optional)"))
 
     is_variety_pack = models.BooleanField(

pptp/templates/pptp/products/combined_upload.html

@@ -148,19 +148,14 @@ <h5 class="section-heading">Product Flags</h5>
             <div class="form-section">
               <h5 class="section-heading">Data Processing</h5>
 
-              <div class="form-check">
-                {{ form.is_supplemented_food }}
-                <label class="form-check-label" for="{{ form.is_supplemented_food.id_for_label }}">
-                  {{ form.is_supplemented_food.label }}
-                </label>
-              </div>
-              
-              <div class="form-check">
-                {{ form.is_tds }}
-                <label class="form-check-label" for="{{ form.is_tds.id_for_label }}">
-                  Is part of Total Diet Study
-                </label>
+              <div style="margin-bottom: 10px;">
+                <label for="{{ form.source_batch.id_for_label }}" class="form-label">Product Batch</label>
+                {{ form.source_batch }}
+                {% if form.source_batch.errors %}
+                  <div class="invalid-feedback d-block">{{ form.source_batch.errors.0 }}</div>
+                {% endif %}
               </div>
+
 
               <div class="form-check">
                 {{ form.needs_manual_verification }}