fnschool 20251014.81347.804__tar.gz → 20251015.80844.859__tar.gz

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251014.81347.804
+Version: 20251015.80844.859
 Summary: Just some school related scripts, without any ambition.
 Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
 Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251014.81347.804"
+__version__ = "20251015.80844.859"

fnschool-20251015.80844.859/src/fnschoo1/canteen/migrations/0015_alter_category_options_alter_category_priority.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.25 on 2025-10-14 05:48
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0014_category_priority"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="category",
+            options={"ordering": ["priority"]},
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="priority",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+                verbose_name="优先级",
+            ),
+        ),
+    ]

fnschool-20251015.80844.859/src/fnschoo1/canteen/migrations/0016_consumption_unique_ingredient_date_of_using.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.25 on 2025-10-15 00:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0015_alter_category_options_alter_category_priority"),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="consumption",
+            constraint=models.UniqueConstraint(
+                fields=("ingredient", "date_of_using"),
+                name="unique_ingredient_date_of_using",
+            ),
+        ),
+    ]

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/canteen/models.py

@@ -189,6 +189,12 @@ class Consumption(models.Model):
         verbose_name = _("Consumption Record")
         verbose_name_plural = _("Consumption Records")
         ordering = ["-date_of_using"]
+        constraints = [
+            models.UniqueConstraint(
+                fields=["ingredient", "date_of_using"],
+                name="unique_ingredient_date_of_using",
+            )
+        ]
 
     def __str__(self):
         return _("{0} of {1} was consumed on {2} .").format(

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/canteen/templates/canteen/consumption/_create.html

@@ -6,7 +6,7 @@
     <form onkeydown="if(event.keyCode==13){return false;}"
           name="consumption_form"
           data-is_disabled="{{ form.instance.is_disabled }}"
-          data-amount_used="{{ form.instance.amount_used }}"
+          data-amount_used="{{ form.instance.amount_used|default_if_none:0 }}"
           data-ingredient_unit_price="{{ form.instance.ingredient.unit_price }}"
           data-date_of_using="{{ form.instance.date_of_using|date:"Y-m-d" }}"
           data-ingredient_meal_type="{{ form.instance.ingredient.meal_type }}"

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -47,7 +47,13 @@
           <th class="">{% trans "Remaining Quantity" %}</th>
         {% endif %}
         {% for date_h in date_range %}
-          <th data-date_of_using="{{ date_h }}" class="consumption-date">{{ date_h }}</th>
+          <th data-date_of_using="{{ date_h }}" class="consumption-date">
+            {{ date_h }}
+            <br />
+            |
+            <br />
+            |
+          </th>
         {% empty %}
           <th></th>
         {% endfor %}
@@ -85,8 +91,6 @@
   </table>
 </div>
 <div class="">
-  <button onclick="submit_consumptions();"
-          class="btn btn-submit-consumptions btn-primary float-start">{% trans "Submit" %}</button>
   <button onclick="generate_spreadsheet();"
           class="btn btn-submit-consumptions btn-success float-end">{% trans "Generate Spreadsheet" %}</button>
   <select class="workbook-month-select form-select float-end mx-2"
@@ -180,23 +184,53 @@
     });
   });
 
+  function submit_consumption_form(element) {
+    var element = $(element)
+    var form = $(element.closest("form"));
+    var formData = new FormData(form[0]);
+
+    $.ajax({
+      url: form.attr('action'),
+      method: 'POST',
+      data: formData,
+      processData: false,
+      contentType: false,
+      success(res) {
+        if (res == "OK") {
+          element.css({
+            'border': "5px solid green",
+            "border-radius": "10px"
+          })
+          form.data("amount_used", element.val())
+        }
+      },
+      error(xhr) {
+        element.css({
+          'border': "5px solid red",
+          "border-radius": "10px"
+        })
+      }
+    });
+
+  }
+
   function amount_used_input_blur(element) {
     element = $(element)
     var ingredient_quantity = element.closest('tr').data("ingredient_quantity")
     ingredient_quantity = parseInt(ingredient_quantity) || 0
-    var amount_used = element.closest("form").data("amount_used")
-    var new_amount_used = $.trim(element.val())
+    var $consumption_form = element.closest("form")
+    var amount_used = parseInt($consumption_form.data("amount_used")) || 0
+    var new_amount_used = parseInt($.trim(element.val())) || 0
     new_amount_used = parseInt(new_amount_used) || 0
     if (new_amount_used < 0) {
-      element.val('0')
+      element.val('')
       new_amount_used = 0
     }
-    if (new_amount_used === 0 && amount_used == "None") {
+    if (new_amount_used === 0 && amount_used === 0) {
       element.val('')
     }
     if (amount_used > 0 && new_amount_used === 0) {
       element.val('0')
-      new_amount_used = 0
     }
     var $tds = element.parent().parent().siblings("td")
     var $amount_used_inputs = $tds.find("form input[name='amount_used']")
@@ -207,7 +241,11 @@
     });
     if ((total_consumed + new_amount_used) > ingredient_quantity) {
       var remaining_quantity = total_consumed < ingredient_quantity ? (ingredient_quantity - total_consumed) : 0
-      element.val(remaining_quantity)
+      if (remaining_quantity === 0) {
+        element.val('')
+      } else {
+        element.val(remaining_quantity)
+      }
       new_amount_used = remaining_quantity
     }
     total_consumed = total_consumed + new_amount_used
@@ -215,7 +253,11 @@
     $(`td[name='remaining_${ingredient_id}']`).text(`${ingredient_quantity}-${total_consumed}=${ingredient_quantity-total_consumed}`)
     element.closest("tr").find('.ingredient-progress').css('width', `${parseInt((ingredient_quantity-total_consumed)*100/ingredient_quantity)}%`)
     var date_of_using = element.closest("form").data("date_of_using")
+
     update_header(date_of_using)
+    if (new_amount_used != amount_used) {
+      submit_consumption_form(element, new_amount_used)
+    }
   }
 
   function update_header(date_of_using) {
@@ -321,69 +363,8 @@
   });
 
   function generate_spreadsheet() {
-    submit_consumptions(function() {
-      var month = $(".workbook-month-select").val()
-      window.open(`/canteen/generate_spreadsheet/${month}`, '_blank');
-    });
-
-  }
-
-  function submit_consumptions(fn) {
-    if (dont_submit) {
-      return false
-    } else {
-      dont_submit = true
-    }
-
-    var consumption_forms = $('form[name="consumption_form"]')
-    var requests = [];
-    var progress = 0
-    consumption_forms_cp = []
-    consumption_forms.each(function(index, element) {
-      var form = $(element);
-      var amount_used_init = parseInt(form.data("amount_used")) || 0
-      var amount_used_new = parseInt(form.find("input[name='amount_used']").val()) || 0
-      if (form.data("is_disabled") == "True") {
-        return true;
-      }
-      if (form.find('input[name="amount_used"]').val().length < 1) {
-        return true;
-      }
-      if (amount_used_new == amount_used_init) {
-        return true;
-      }
-      consumption_forms_cp.push(form)
-    });
-
-    consumption_forms = consumption_forms_cp
-    var consumption_forms_length = consumption_forms.length
-    $(consumption_forms).each(function(index, element) {
-      form = $(element)
-      requests.push(
-        $.ajax({
-          url: form.attr('action'),
-          type: form.attr('method') || 'POST',
-          data: form.serialize(),
-          success: function(response) {
-            progress += 1
-            var footer_progressbar = $('.progress-footer')
-            if (footer_progressbar) {
-              var width = `${parseInt(progress*100/consumption_forms_length)}%`
-              $(footer_progressbar).css("width", width)
-            }
-          }
-        }).catch(function(error) {
-          return erroe;
-        }));
-    });
-    $.when.apply($, requests)
-      .done(function() {
-        if (fn != undefined) {
-          fn()
-        }
-        location.reload();
-      })
-      .fail(function() {});
+    var month = $(".workbook-month-select").val()
+    window.open(`/canteen/generate_spreadsheet/${month}`, 'generate_spreadsheet');
   }
 
   function set_consumptions_table_size() {

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/canteen/views.py

@@ -306,19 +306,19 @@ def create_consumptions(request, ingredient_id=None):
 @require_POST
 def new_consumption(request, consumption_id=None):
     form = None
+
+    posted_date_of_using = date_parser.parse(request.POST.get("date_of_using"))
+    posted_amount_used = request.POST.get("amount_used")
+
     if consumption_id:
         consumption = Consumption.objects.filter(
             Q(pk=consumption_id)
             & Q(ingredient__user=request.user)
+            & Q(date_of_using=posted_date_of_using)
             & Q(is_disabled=False)
         ).first()
         if consumption:
-
-            posted_amount_used = request.POST.get("amount_used")
-            if (
-                posted_amount_used.replace(".", "").isnumeric()
-                and Decimal(posted_amount_used).is_zero()
-            ):
+            if Decimal(posted_amount_used).is_zero():
                 consumption.delete()
                 return HttpResponse("OK", status=201)
 
@@ -327,13 +327,24 @@ def new_consumption(request, consumption_id=None):
             return HttpResponse("Accepted", status=202)
 
     else:
+        ingredient_id = request.POST.get("ingredient")
         ingredient = Ingredient.objects.filter(
-            Q(user=request.user) & Q(pk=request.POST.get("ingredient"))
+            Q(user=request.user) & Q(pk=ingredient_id)
         ).first()
         if not ingredient:
             return HttpResponse("Accepted", status=202)
 
-        consumption = Consumption()
+        consumption = Consumption.objects.filter(
+            Q(date_of_using=posted_date_of_using)
+            & Q(ingredient__id=ingredient_id)
+        ).first()
+
+        if not consumption:
+            consumption = Consumption()
+        elif Decimal(posted_amount_used).is_zero():
+            consumption.delete()
+            return HttpResponse("OK", status=201)
+
         consumption.ingredient = ingredient
         form = ConsumptionForm(request.POST, instance=consumption)
 

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/canteen/workbook/generate.py

@@ -880,7 +880,10 @@ class CanteenWorkBook:
 
                 split_dated_consumptions = sorted(
                     split_dated_consumptions,
-                    key=lambda i: (i.ingredient.category.name),
+                    key=lambda c: (
+                        c.ingredient.category.priority,
+                        c.ingredient.category.name,
+                    ),
                 )
 
                 consumption_date_index = sub_consumption_num
@@ -1234,7 +1237,8 @@ class CanteenWorkBook:
                 ]
 
                 split_dated_ingredients = sorted(
-                    split_dated_ingredients, key=lambda i: (i.category.name)
+                    split_dated_ingredients,
+                    key=lambda i: (i.category.priority, i.category.name),
                 )
 
                 storage_date_index = sub_storage_num
@@ -1822,7 +1826,14 @@ class CanteenWorkBook:
                         _(
                             "{meal_type} ({category}, Checked/Storaged at {storage_date})"
                         ).format(
-                            meal_type=ingredient.meal_type,
+                            meal_type=(
+                                (
+                                    ingredient.meal_type.abbreviation
+                                    or ingredient.meal_type.name
+                                )
+                                if ingredient.meal_type
+                                else ""
+                            ),
                             category=ingredient.category,
                             storage_date=ingredient.storage_date,
                         ),
@@ -2147,13 +2158,16 @@ def get_workbook_zip(request, month):
                 _(
                     "Canteen {meal_type} Daybook WorkBook ({month}) of {affiliation}"
                 ).format(
-                    meal_type=meal_type.abbreviation or meal_type.name,
+                    meal_type=(
+                        (meal_type.abbreviation or meal_type.name)
+                        if meal_type
+                        else ""
+                    ),
                     month=month.replace("-", ""),
                     affiliation=request.user.affiliation,
                 )
                 + ".xlsx"
             )
-            # filename = escape_uri_path(filename)
 
             wb = CanteenWorkBook(request, month, meal_type).fill_in()
             excel_buffer = io.BytesIO()

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschoo1/manage.py

@@ -39,7 +39,7 @@ def main():
     sys.argv[0] = "manage.py"
 
     if len(sys.argv) < 2:
-        local_port = str(random.randint(8080, 65530))
+        local_port = "8230"
         local_url = "http://127.0.0.1:" + local_port
         sys.argv.append("runserver")
         sys.argv.append(str(local_port))

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251014.81347.804
+Version: 20251015.80844.859
 Summary: Just some school related scripts, without any ambition.
 Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
 Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>

{fnschool-20251014.81347.804 → fnschool-20251015.80844.859}/src/fnschool.egg-info/SOURCES.txt

@@ -25,6 +25,8 @@ src/fnschoo1/canteen/migrations/0011_category_pin_to_consumptions_top.py
 src/fnschoo1/canteen/migrations/0012_alter_ingredient_storage_date.py
 src/fnschoo1/canteen/migrations/0013_alter_consumption_options_alter_ingredient_options_and_more.py
 src/fnschoo1/canteen/migrations/0014_category_priority.py
+src/fnschoo1/canteen/migrations/0015_alter_category_options_alter_category_priority.py
+src/fnschoo1/canteen/migrations/0016_consumption_unique_ingredient_date_of_using.py
 src/fnschoo1/canteen/migrations/__init__.py
 src/fnschoo1/canteen/templates/canteen/close.html
 src/fnschoo1/canteen/templates/canteen/category/create.html