fnschool 20251019.81526.808__tar.gz → 20251021.80056.821__tar.gz

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/PKG-INFO

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

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251019.81526.808"
+__version__ = "20251021.80056.821"

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschoo1/canteen/models.py

@@ -146,6 +146,9 @@ class Ingredient(models.Model):
         return quantity
 
     def get_consuming_quantity(self, date_end):
+
+        if self.storage_date < date_end:
+            return 0
         consumptions = self.cleaned_consumptions
         if not consumptions:
             return 0
@@ -159,6 +162,8 @@ class Ingredient(models.Model):
         return quantity
 
     def get_remaining_quantity(self, date_end):
+        if self.storage_date < date_end:
+            return 0
         return self.quantity - self.get_consuming_quantity(date_end)
 
     @property

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschoo1/canteen/views.py

@@ -97,6 +97,9 @@ quantity_header = (
         "To prevent the number of decimal places in the unit "
         + 'price from becoming too large, "quantity" is '
         + "only allowed to be an integer."
+        + " If your unit price is a decimal, please use a "
+        + "smaller quantity unit and then expand the "
+        + "quantity to an integer."
     ),
 )
 
@@ -396,25 +399,26 @@ def edit_ingredient(request, ingredient_id):
 
     if request.method == "POST":
 
-        form = IngredientForm(request.POST, instance=ingredient)
-
-        total_price = form.instance.total_price
-        quantity = form.instance.quantity
+        total_price = request.POST.get("total_price")
+        quantity = request.POST.get("quantity")
 
         [total_price0, quantity0], [total_price1, quantity1] = split_price(
             total_price, quantity
         )
 
+        form = IngredientForm(request.POST, instance=ingredient)
         if total_price1:
             unit_price_error_msg = _(
-                "The unit pricei ({unit_price}) has more than 3 decimal places and cannot be saved. Please modify it again."
+                "The unit pricei ({unit_price}) has more than {decimal_prec} decimal places and cannot be saved. Please modify it again."
             ).format(
                 unit_price=(
                     Decimal(str(total_price)) / Decimal(str(float(quantity)))
-                ).normalize()
+                ).normalize(),
+                decimal_prec=decimal_prec,
             )
             form.add_error("total_price", unit_price_error_msg)
             form.add_error("quantity", unit_price_error_msg)
+            form.fields["total_price"].widget.attrs.update({"autofocus": ""})
             return render(
                 request, "canteen/ingredient/update.html", {"form": form}
             )
@@ -578,7 +582,7 @@ def create_ingredients(request):
                         created_at=datetime.now().date(),
                     )
 
-                storage_date = row[storage_date_header[0]]
+                storage_date = date_parser.parse(row[storage_date_header[0]])
                 name = row[ingredient_name_header[0]]
                 quantity_unit_name = row[quantity_unit_name_header[0]]
                 is_ignorable = not row[is_ignorable_header[0]] is np.nan
@@ -591,19 +595,6 @@ def create_ingredients(request):
                 )
 
                 if total_price1:
-
-                    Ingredient.objects.create(
-                        user=request.user,
-                        storage_date=storage_date,
-                        name=name + _("(1)"),
-                        meal_type=meal_type,
-                        category=category,
-                        quantity=quantity0,
-                        total_price=total_price0,
-                        quantity_unit_name=quantity_unit_name,
-                        is_ignorable=is_ignorable,
-                    )
-
                     Ingredient.objects.create(
                         user=request.user,
                         storage_date=storage_date,
@@ -615,19 +606,19 @@ def create_ingredients(request):
                         quantity_unit_name=quantity_unit_name,
                         is_ignorable=is_ignorable,
                     )
-
-                else:
-                    Ingredient.objects.create(
-                        user=request.user,
-                        storage_date=storage_date,
-                        name=name,
-                        meal_type=meal_type,
-                        category=category,
-                        quantity=quantity0,
-                        total_price=total_price0,
-                        quantity_unit_name=quantity_unit_name,
-                        is_ignorable=is_ignorable,
-                    )
+                    name = name + _("(1)")
+
+                Ingredient.objects.create(
+                    user=request.user,
+                    storage_date=storage_date,
+                    name=name,
+                    meal_type=meal_type,
+                    category=category,
+                    quantity=quantity0,
+                    total_price=total_price0,
+                    quantity_unit_name=quantity_unit_name,
+                    is_ignorable=is_ignorable,
+                )
 
             return redirect("canteen:close_window")
 
@@ -674,7 +665,7 @@ def get_template_workbook_of_purchased_ingredients(request):
         ws.column_dimensions[column_letter].width = len(h) + hans_len + 2
         if c:
             h_cell.comment = Comment(c, _("the FNSCHOOL Authors"))
-
+    ws.freeze_panes = "B2"
     buffer = io.BytesIO()
     wb.save(buffer)
     buffer.seek(0)

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschoo1/canteen/workbook/generate.py

@@ -20,6 +20,7 @@ from django.db.models import (
     DecimalField,
     ExpressionWrapper,
     F,
+    IntegerField,
     Q,
     Sum,
     Value,
@@ -185,8 +186,16 @@ def set_row_height_in_inches(worksheet, row, inches):
     worksheet.row_dimensions[row].height = points
 
 
-class CanteenWorkBook:
-    def __init__(self, request, month, meal_type):
+class MealTypeWorkbook:
+    def __init__(
+        self,
+        request,
+        year=None,
+        month=None,
+        ingredients=None,
+        meal_type=None,
+        categories=None,
+    ):
         self.wb = Workbook()
         self.wb[self.wb.sheetnames[0]].sheet_state = "hidden"
         self.cover_sheet = self.wb.create_sheet(title=_("Sheet Cover"))
@@ -227,15 +236,27 @@ class CanteenWorkBook:
         self.font_18_bold = Font(size=18, bold=True)
         self.font_20_bold = Font(size=20, bold=True)
 
+        self.year = year or datetime().now().year
+        self.month = month or datetime().now().month
+
+        self.first_date_of_month = datetime(self.year, self.month, 1).date()
+        self.last_date_of_month = datetime(
+            self.year, self.month, calendar.monthrange(self.year, self.month)[1]
+        ).date()
+        self.first_date_of_year = datetime(self.year, 1, 1)
+        self.last_date_of_year = datetime(self.year, 12, 31)
+
         self.request = request
         self.user = self.request.user
+        self.ingredients = ingredients
+        self.ignorable_ingredients = self.ingredients.filter(
+            Q(is_ignorable=True)
+        ).all()
+        self.storage_ingredients = self.ingredients.filter(
+            Q(is_ignorable=False)
+        ).all()
         self.meal_type = meal_type
-        self.year = int(month.split("-")[0])
-        self.month = int(month.split("-")[1])
-        self.date_start = datetime(self.year, self.month, 1).date()
-        self.date_end = datetime(
-            self.year, self.month, calendar.monthrange(self.year, self.month)[1]
-        ).date()
+        self.categories = categories
         self.is_zh_CN = is_zh_CN()
 
         self._is_school = None
@@ -294,7 +315,7 @@ class CanteenWorkBook:
             affiliation=user.affiliation,
             year=self.year,
             month=self.month,
-            day=self.date_end.day,
+            day=self.last_date_of_month.day,
         )
 
         header_row_num = 3
@@ -318,10 +339,7 @@ class CanteenWorkBook:
             cell.alignment = self.center_alignment
             cell.border = self.thin_border
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.38)
         set_row_height_in_inches(sheet, 2, 0.22)
         set_row_height_in_inches(sheet, 3, 0.32)
@@ -334,14 +352,10 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
-                & Q(category=category)
-                & Q(storage_date__gte=self.date_start)
-                & Q(storage_date__lte=self.date_end)
-                & Q(meal_type=self.meal_type)
-                & Q(is_disabled=False)
-                & Q(is_ignorable=True)
+            ingredients = self.ignorable_ingredients.filter(
+                Q(category=category)
+                & Q(storage_date__gte=self.first_date_of_month)
+                & Q(storage_date__lte=self.last_date_of_month)
             ).all()
             total_price_cell = sheet.cell(row_num, 2)
             total_price_cell.value = sum([i.total_price for i in ingredients])
@@ -353,13 +367,9 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=True)
+        ingredients = self.ignorable_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -464,7 +474,7 @@ class CanteenWorkBook:
             affiliation=user.affiliation,
             year=self.year,
             month=self.month,
-            day=self.date_end.day,
+            day=self.last_date_of_month.day,
         )
 
         header_row_num = 3
@@ -490,10 +500,7 @@ class CanteenWorkBook:
             cell.alignment = self.center_alignment
             cell.border = self.thin_border
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.38)
         set_row_height_in_inches(sheet, 2, 0.22)
         set_row_height_in_inches(sheet, 3, 0.32)
@@ -506,19 +513,14 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
-                & Q(category=category)
+            ingredients = self.storage_ingredients.filter(
+                Q(category=category)
                 & Q(
                     consumptions__date_of_using__range=(
-                        self.date_start,
-                        self.date_end,
+                        self.first_date_of_month,
+                        self.last_date_of_month,
                     )
                 )
-                & Q(meal_type=self.meal_type)
-                & Q(category__is_disabled=False)
-                & Q(is_disabled=False)
-                & Q(is_ignorable=False)
             ).distinct()
 
             total_price_cell = sheet.cell(row_num, 2)
@@ -526,8 +528,8 @@ class CanteenWorkBook:
             for i in ingredients:
                 consumptions = i.consumptions.filter(
                     Q(is_disabled=False)
-                    & Q(date_of_using__lte=self.date_end)
-                    & Q(date_of_using__gte=self.date_start)
+                    & Q(date_of_using__lte=self.last_date_of_month)
+                    & Q(date_of_using__gte=self.first_date_of_month)
                 ).all()
                 total_price_consumed += sum(
                     [c.amount_used * i.unit_price for c in consumptions]
@@ -541,18 +543,13 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(
+        ingredients = self.storage_ingredients.filter(
+            Q(
                 consumptions__date_of_using__range=(
-                    self.date_start,
-                    self.date_end,
+                    self.first_date_of_month,
+                    self.last_date_of_month,
                 )
             )
-            & Q(meal_type=self.meal_type)
-            & Q(category__is_disabled=False)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
         ).distinct()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -560,8 +557,8 @@ class CanteenWorkBook:
         for i in ingredients:
             consumptions = i.consumptions.filter(
                 Q(is_disabled=False)
-                & Q(date_of_using__lte=self.date_end)
-                & Q(date_of_using__gte=self.date_start)
+                & Q(date_of_using__lte=self.last_date_of_month)
+                & Q(date_of_using__gte=self.first_date_of_month)
             ).all()
             summary_total_price += sum(
                 [c.amount_used * i.unit_price for c in consumptions]
@@ -666,7 +663,7 @@ class CanteenWorkBook:
             affiliation=user.affiliation,
             year=self.year,
             month=self.month,
-            day=self.date_end.day,
+            day=self.last_date_of_month.day,
         )
 
         header_row_num = 3
@@ -690,10 +687,7 @@ class CanteenWorkBook:
             cell.alignment = self.center_alignment
             cell.border = self.thin_border
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.38)
         set_row_height_in_inches(sheet, 2, 0.22)
         set_row_height_in_inches(sheet, 3, 0.32)
@@ -706,15 +700,12 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
+            ingredients = self.storage_ingredients.filter(
+                Q(storage_date__gte=self.first_date_of_month)
+                & Q(storage_date__lte=self.last_date_of_month)
                 & Q(category=category)
-                & Q(storage_date__gte=self.date_start)
-                & Q(storage_date__lte=self.date_end)
-                & Q(meal_type=self.meal_type)
-                & Q(is_disabled=False)
-                & Q(is_ignorable=False)
             ).all()
+
             total_price_cell = sheet.cell(row_num, 2)
             total_price_cell.value = sum([i.total_price for i in ingredients])
 
@@ -725,13 +716,9 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
+        ingredients = self.storage_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -811,16 +798,10 @@ class CanteenWorkBook:
         sheet.sheet_properties.tabColor = "ff9e16"
         user = self.user
         consumption_rows_count = 21
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-        consumptions = Consumption.objects.filter(
-            Q(is_disabled=False)
-            & Q(ingredient__meal_type=self.meal_type)
-            & Q(ingredient__user=user)
-            & Q(date_of_using__gte=self.date_start)
-            & Q(date_of_using__lte=self.date_end)
-        ).all()
+        categories = self.categories
+        consumptions = []
+        for i in self.storage_ingredients:
+            consumptions += i.consumptions.filter(Q(is_disabled=False)).all()
         consumption_row_height = 0.18
         consumption_rows_height = consumption_rows_count * 0.18
 
@@ -880,7 +861,7 @@ class CanteenWorkBook:
                     Ingredient(
                         user=user,
                         name="",
-                        storage_date=self.date_start,
+                        storage_date=self.first_date_of_month,
                         meal_type=split_dated_consumption.ingredient.meal_type,
                         category=c,
                         quantity=0.0,
@@ -1204,22 +1185,16 @@ class CanteenWorkBook:
         sheet.sheet_properties.tabColor = "16b1ff"
         user = self.user
         ingredient_rows_count = 21
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-        ).all()
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
+        ingredients = self.storage_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
+        categories = self.categories
         ingredient_row_height = 0.18
         ingredient_rows_height = ingredient_rows_count * 0.18
         storage_dates = sorted(list(set([i.storage_date for i in ingredients])))
 
-        storaged_ingredients = []
+        formed_ingredients = []
         for storage_date in storage_dates:
             dated_ingredients = [
                 i for i in ingredients if i.storage_date == storage_date
@@ -1282,7 +1257,7 @@ class CanteenWorkBook:
                 )
 
                 storage_date_index = sub_storage_num
-                storaged_ingredients.append(
+                formed_ingredients.append(
                     [storage_date, storage_date_index, split_dated_ingredients]
                 )
 
@@ -1293,7 +1268,7 @@ class CanteenWorkBook:
             storage_date,
             storage_date_index,
             dated_ingredients,
-        ) in enumerate(storaged_ingredients):
+        ) in enumerate(formed_ingredients):
             row_num = (ingredient_rows_count + 6) * index + 1
 
             title_cell_row_num = row_num
@@ -1327,13 +1302,13 @@ class CanteenWorkBook:
                 storage_num += 1
 
             prev_storage_date = (
-                storaged_ingredients[index - 1][0]
-                if 0 <= index - 1 < len(storaged_ingredients)
+                formed_ingredients[index - 1][0]
+                if 0 <= index - 1 < len(formed_ingredients)
                 else None
             )
             next_storage_date = (
-                storaged_ingredients[index + 1][0]
-                if 0 < index + 1 < (len(storaged_ingredients) - 1)
+                formed_ingredients[index + 1][0]
+                if 0 < index + 1 < (len(formed_ingredients) - 1)
                 else None
             )
             sub_title_num_cell_row_num = title_cell_row_num + 1
@@ -1563,10 +1538,7 @@ class CanteenWorkBook:
             cell.border = self.thin_border
             cell.font = self.font_12_bold
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.60)
         set_row_height_in_inches(sheet, 2, 0.44)
 
@@ -1578,13 +1550,10 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
-                & Q(category=category)
-                & Q(storage_date__gte=self.date_start)
-                & Q(storage_date__lte=self.date_end)
-                & Q(meal_type=self.meal_type)
-                & Q(is_disabled=False)
+            ingredients = self.ingredients.filter(
+                Q(category=category)
+                & Q(storage_date__gte=self.first_date_of_month)
+                & Q(storage_date__lte=self.last_date_of_month)
             ).all()
             total_price_cell = sheet.cell(row_num, 2)
             total_price_cell.value = sum([i.total_price for i in ingredients])
@@ -1602,12 +1571,9 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
+        ingredients = self.ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -1644,12 +1610,8 @@ class CanteenWorkBook:
         user = self.user
         ingredient_rows_count = 17
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
+        ingredients = self.storage_ingredients.filter(
+            Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         consumptions = []
@@ -1657,7 +1619,8 @@ class CanteenWorkBook:
             consumptions += [
                 c
                 for c in ingredient.consumptions.filter(
-                    Q(date_of_using__lte=self.date_end) & Q(is_disabled=False)
+                    Q(date_of_using__lte=self.last_date_of_month)
+                    & Q(is_disabled=False)
                 ).all()
             ]
 
@@ -1673,11 +1636,9 @@ class CanteenWorkBook:
                 inventory_days.append(date_of_using)
 
         if len(inventory_days) < 1:
-            inventory_days.insert(-1, self.date_end)
+            inventory_days.insert(-1, self.last_date_of_month)
 
-        inventory_days.insert(
-            0, (self.date_start.replace(day=1) - timedelta(days=1))
-        )
+        inventory_days.insert(0, (self.first_date_of_month - timedelta(days=1)))
         formed_ingredients = []
         for inventory_day in inventory_days:
             inventory_day_ingredients = []
@@ -1716,7 +1677,7 @@ class CanteenWorkBook:
             inventory_day_ingredients += [
                 Ingredient(
                     user=user,
-                    storage_date=self.date_start,
+                    storage_date=self.first_date_of_month,
                     name="",
                     meal_type=self.meal_type,
                     category=s_ingredient0.category,
@@ -1973,13 +1934,9 @@ class CanteenWorkBook:
         user = self.user
         ingredient_rows_count = 11
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=True)
+        ingredients = self.ignorable_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         categories = list(set([i.category for i in ingredients]))
@@ -1996,7 +1953,7 @@ class CanteenWorkBook:
                     _split_ingredients += [
                         Ingredient(
                             user=user,
-                            storage_date=self.date_end,
+                            storage_date=self.last_date_of_month,
                             name="",
                             meal_type=_split_ingredient0.meal_type,
                             category=_split_ingredient0.category,
@@ -2036,7 +1993,11 @@ class CanteenWorkBook:
             sub_title_date_cell = sheet.cell(sub_title_row_num, 4)
             sub_title_date_cell.value = _(
                 "{year}.{month:0>2}.{day:0>2} (Non-storage list sheet)"
-            ).format(year=self.year, month=self.month, day=self.date_end.day)
+            ).format(
+                year=self.year,
+                month=self.month,
+                day=self.last_date_of_month.day,
+            )
 
             for cell in [sub_title_affiliation_cell, sub_title_date_cell]:
                 cell.font = self.font_14
@@ -2170,29 +2131,7 @@ class CanteenWorkBook:
         date_end = date(year, 12, 31)
         meal_type = self.meal_type
 
-        ingredients = (
-            Ingredient.objects.filter(
-                Q(is_disabled=False)
-                & Q(is_ignorable=False)
-                & Q(user=user)
-                & Q(meal_type=meal_type)
-            )
-            .prefetch_related("consumptions")
-            .all()
-        )
-        ingredients = [
-            i
-            for i in ingredients
-            if date_start <= i.storage_date <= date_end
-            or any(
-                [
-                    date_start <= c.date_of_using <= date_end
-                    for c in i.consumptions.all()
-                    if c.is_disabled == False
-                ]
-            )
-        ]
-
+        ingredients = self.storage_ingredients
         ingredient_names = list(set([i.name for i in ingredients]))
         for ingredient_name_index, ingredient_name in enumerate(
             ingredient_names
@@ -2689,10 +2628,59 @@ 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(
-        Q(user=request.user) & Q(is_disabled=False) & Q(ingredients_count__gt=0)
+    year, month = [int(v) for v in month.split("-")]
+    first_date_of_year = datetime(year, 1, 1).date()
+    last_date_of_year = datetime(year, 12, 31).date()
+
+    meal_types = (
+        MealType.objects.annotate(ingredients_count=Count("ingredients"))
+        .filter(
+            Q(user=request.user)
+            & Q(is_disabled=False)
+            & Q(ingredients_count__gt=0)
+        )
+        .all()
+    )
+
+    categories = (
+        Category.objects.annotate(ingredients_count=Count("ingredients"))
+        .filter(
+            Q(user=request.user)
+            & Q(is_disabled=False)
+            & Q(ingredients_count__gt=0)
+        )
+        .order_by("priority")
+        .all()
+    )
+
+    user_ingredients = (
+        Ingredient.objects.annotate(
+            total_consumed=Coalesce(
+                Sum("consumptions__amount_used"), 0, output_field=IntegerField()
+            )
+        )
+        .filter(
+            Q(is_disabled=False)
+            & (
+                Q(
+                    consumptions__date_of_using__range=(
+                        first_date_of_year,
+                        last_date_of_year,
+                    )
+                )
+                | Q(quantity__gt=F("total_consumed"))
+                | (
+                    Q(storage_date__gte=first_date_of_year)
+                    & Q(storage_date__lte=last_date_of_year)
+                )
+            )
+            & Q(user=request.user)
+            & Q(category__is_disabled=False)
+            & Q(meal_type__is_disabled=False)
+        )
+        .select_related("meal_type", "category")
+        .prefetch_related("consumptions")
+        .distinct()
     )
 
     zip_buffer = io.BytesIO()
@@ -2707,13 +2695,20 @@ def get_workbook_zip(request, month):
                         if not meal_type.name == meal_type_name_0
                         else ""
                     ),
-                    month=month.replace("-", ""),
+                    month=f"{year}{month:0>2}",
                     affiliation=request.user.affiliation,
                 )
                 + ".xlsx"
             )
-
-            wb = CanteenWorkBook(request, month, meal_type).fill_in()
+            __ingredients = user_ingredients.filter(meal_type=meal_type).all()
+            wb = MealTypeWorkbook(
+                request,
+                year=year,
+                month=month,
+                ingredients=__ingredients,
+                meal_type=meal_type,
+                categories=categories,
+            ).fill_in()
             excel_buffer = io.BytesIO()
             wb.save(excel_buffer)
             excel_buffer.seek(0)
@@ -2722,3 +2717,6 @@ def get_workbook_zip(request, month):
 
     zip_buffer.seek(0)
     return zip_buffer
+
+
+# The end.

fnschool-20251021.80056.821/src/fnschoo1/fnschool/_settings.py

@@ -0,0 +1,3 @@
+
+
+

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschoo1/fnschool/settings.py

@@ -165,4 +165,14 @@ MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 
 LOGIN_URL = reverse_lazy("profiles:log_in")
+
+_settings_path = Path(__file__).parent / "_settings.py"
+if _settings_path.exists():
+    print(
+        ('Custom configuration "{_settings_path}" has been used.').format(
+            _settings_path=_settings_path.as_posix()
+        )
+    )
+    from ._settings import *
+
 # The end.

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschoo1/static/js/fnschool.js

@@ -8,7 +8,17 @@ function make_highlight(query, time_data) {
     if (seconds_diff < 46) {
       highlight_elements_toggled.push(element)
       element.toggleClass('fn-highlight')
-      $('html,body').animate({ scrollTop: element.offset().top }, 1)
+      var table_container = $(element.closest('.table-container'))
+      if (table_container.length) {
+        var container = table_container
+        var thead = $(element.closest('table').find('thead'))
+        var pos =
+          element.offset().top -
+          container.offset().top +
+          container.scrollTop() -
+          thead.height()
+        container.animate({ scrollTop: pos }, 1)
+      }
     }
   })
 

{fnschool-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251019.81526.808
+Version: 20251021.80056.821
 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-20251019.81526.808 → fnschool-20251021.80056.821}/src/fnschool.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ src/fnschoo1/canteen/templates/canteen/meal_type/update.html
 src/fnschoo1/canteen/workbook/__init__.py
 src/fnschoo1/canteen/workbook/generate.py
 src/fnschoo1/fnschool/__init__.py
+src/fnschoo1/fnschool/_settings.py
 src/fnschoo1/fnschool/asgi.py
 src/fnschoo1/fnschool/settings.py
 src/fnschoo1/fnschool/urls.py