fnschool 20251016.81138.855__tar.gz → 20251016.81833.820__tar.gz

{fnschool-20251016.81138.855 → fnschool-20251016.81833.820}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251016.81138.855
+Version: 20251016.81833.820
 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-20251016.81138.855 → fnschool-20251016.81833.820}/src/fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251016.81138.855"
+__version__ = "20251016.81833.820"

{fnschool-20251016.81138.855 → fnschool-20251016.81833.820}/src/fnschoo1/canteen/models.py

@@ -186,6 +186,7 @@ class Consumption(models.Model):
     )
 
     class Meta:
+
         verbose_name = _("Consumption Record")
         verbose_name_plural = _("Consumption Records")
         ordering = ["-date_of_using"]

{fnschool-20251016.81138.855 → fnschool-20251016.81833.820}/src/fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -49,10 +49,10 @@
         {% for date_h in date_range %}
           <th data-date_of_using="{{ date_h }}" class="consumption-date">
             {{ date_h }}
-            <br />
-            |
-            <br />
-            |
+            {% for meal_type in meal_types %}
+              <br />
+              |
+            {% endfor %}
           </th>
         {% empty %}
           <th></th>
@@ -75,7 +75,7 @@
             <div class='ingredient-progress'
                  style="width:{% widthratio ingredient.remaining_quantity ingredient.quantity 100 %}%"></div>
             {{ ingredient.name }}
-            {% if ingredient.meal_type %}
+            {% if ingredient.meal_type != meal_type_name_0 %}
               <br />
               ({{ ingredient.meal_type }})
             {% endif %}
@@ -91,6 +91,9 @@
   </table>
 </div>
 <div class="">
+  <button id="body_mp0_trigger"
+          onclick="set_body_to_mp0();"
+          class="btn btn-submit-consumptions btn-success float-end">||</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"
@@ -112,6 +115,26 @@
 
   var dont_submit = false
 
+  $(document).ready(function() {
+    var body_mp0_cookie = get_cookie("body_mp0")
+    if (body_mp0_cookie == "" || body_mp0_cookie == null) {
+      $("#body_mp0_trigger").html("&lt;")
+    } else {
+      $("#body_mp0_trigger").html("&gt;")
+    }
+  });
+
+  function set_body_to_mp0() {
+    if ($('body').hasClass("m-0")) {
+      set_simple_cookie("body_mp0", "")
+      $("#body_mp0_trigger").html("&gt;")
+      $('body').removeClass("m-0 p-0");
+    } else {
+      set_simple_cookie("body_mp0", "1")
+      $('#body_mp0_trigger').html("&lt;")
+      $('body').addClass("m-0 p-0");
+    }
+  }
 
   function list_consumptions_rapidly() {
     query = {

{fnschool-20251016.81138.855 → fnschool-20251016.81833.820}/src/fnschoo1/canteen/views.py

@@ -57,6 +57,9 @@ from .forms import (
 from .models import Category, Consumption, Ingredient, MealType
 
 # Create your views here.
+
+meal_type_name_0 = _("Meal type 0")
+
 decimal_prec = getattr(settings, "DECIMAL_PREC", 2)
 
 storage_date_header = (
@@ -197,6 +200,15 @@ def create_consumptions(request, ingredient_id=None):
         consumptions = ingredient.consumptions.filter(
             Q(is_disabled=False)
         ).all()
+
+        consumptions_len = len(consumptions)
+        for c_index in range(consumptions_len):
+            consumption = consumptions[c_index]
+            for c0_index in range(c_index + 1, consumptions_len):
+                consumption0 = consumptions[c0_index]
+                if consumption.date_of_using == consumption0.date_of_using:
+                    consumption.delete()
+
         consumption_dates = list(set([c.date_of_using for c in consumptions]))
 
         for per_day in date_range:
@@ -206,9 +218,6 @@ def create_consumptions(request, ingredient_id=None):
                     c for c in consumptions if c.date_of_using == per_day
                 ]
                 consumption = consumptions_per_day[0]
-                if len(consumptions_per_day) > 1:
-                    for c in consumptions_per_day[1:]:
-                        c.delete()
 
             else:
                 consumption = Consumption()
@@ -298,6 +307,7 @@ def create_consumptions(request, ingredient_id=None):
             "ingredient_ids": ingredient_ids,
             "months": months,
             "storage_date_start": date_start,
+            "meal_type_name_0": meal_type_name_0,
         },
     )
 
@@ -508,6 +518,11 @@ def create_ingredients(request):
             for index, row in df.iterrows():
                 category_name = row[category_header[0]]
                 meal_type_name = row[meal_type_header[0]]
+                meal_type_name = (
+                    meal_type_name_0
+                    if meal_type_name is np.nan
+                    else meal_type_name
+                )
 
                 category = Category.objects.filter(
                     Q(name=category_name) & Q(user=request.user)

{fnschool-20251016.81138.855 → fnschool-20251016.81833.820}/src/fnschoo1/canteen/workbook/generate.py

@@ -1087,7 +1087,22 @@ class CanteenWorkBook:
                     )
                     last_category = consumption.ingredient.category
 
-                sheet.cell(consumption_row_num, 2, consumption.ingredient.name)
+                ingredient_name_cell = sheet.cell(consumption_row_num, 2)
+                ingredient_name_cell.value = consumption.ingredient.name
+                if consumption.ingredient.name:
+                    ingredient_name_cell.comment = Comment(
+                        _(
+                            "{meal_type}({category}, Storaged/Checked at {storage_date})."
+                        ).format(
+                            meal_type=consumption.ingredient.meal_type,
+                            category=consumption.ingredient.category,
+                            storage_date=consumption.ingredient.storage_date.strftime(
+                                "%Y.%m.%d"
+                            ),
+                        ),
+                        user.username,
+                    )
+
                 sheet.cell(
                     consumption_row_num,
                     3,
@@ -1097,8 +1112,8 @@ class CanteenWorkBook:
                     consumption_row_num,
                     4,
                     (
-                        consumption.ingredient.quantity
-                        if consumption.ingredient.quantity
+                        consumption.amount_used
+                        if consumption.ingredient.name
                         else ""
                     ),
                 )
@@ -1107,7 +1122,7 @@ class CanteenWorkBook:
                     5,
                     (
                         consumption.ingredient.unit_price
-                        if consumption.ingredient.unit_price
+                        if consumption.ingredient.name
                         else ""
                     ),
                 )
@@ -1117,8 +1132,7 @@ class CanteenWorkBook:
                     (
                         consumption.ingredient.unit_price
                         * consumption.amount_used
-                        if consumption.ingredient.unit_price
-                        and consumption.amount_used
+                        if consumption.ingredient.name
                         else ""
                     ),
                 )
@@ -1946,6 +1960,7 @@ class CanteenWorkBook:
         category_ingredients = []
         for category in categories:
             _ingredients = [i for i in ingredients if i.category == category]
+            _ingredients = sorted(_ingredients, key=lambda i: (i.storage_date))
             split_count = math.ceil(len(_ingredients) / ingredient_rows_count)
             for i in range(0, len(_ingredients), ingredient_rows_count):
                 _split_ingredients = _ingredients[i : i + ingredient_rows_count]
@@ -1968,9 +1983,6 @@ class CanteenWorkBook:
                         )
                     ]
 
-                _split_ingredients = sorted(
-                    _split_ingredients, key=lambda i: (i.storage_date)
-                )
                 category_ingredients.append([category, _split_ingredients])
 
         for index, (category, c_ingredients) in enumerate(category_ingredients):
@@ -2151,6 +2163,8 @@ class CanteenWorkBook:
 
 
 def get_workbook_zip(request, month):
+    from ..views import meal_type_name_0
+
     meal_types = MealType.objects.annotate(
         ingredients_count=Count("ingredients")
     ).filter(
@@ -2166,7 +2180,7 @@ def get_workbook_zip(request, month):
                 ).format(
                     meal_type=(
                         (meal_type.abbreviation or meal_type.name)
-                        if meal_type
+                        if not meal_type.name == meal_type_name_0
                         else ""
                     ),
                     month=month.replace("-", ""),

{fnschool-20251016.81138.855 → fnschool-20251016.81833.820}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251016.81138.855
+Version: 20251016.81833.820
 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>