fnschool 20251011.81705.829__tar.gz → 20251012.81427.834__tar.gz

{fnschool-20251011.81705.829 → fnschool-20251012.81427.834}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251011.81705.829
+Version: 20251012.81427.834
 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-20251011.81705.829 → fnschool-20251012.81427.834}/pyproject.toml

@@ -58,7 +58,7 @@ version = {attr = "fnschoo1.__version__"}
 where = ["src"]
 
 [tool.setuptools.package-data]
-"*" = ["*.mo","*.xlsx","*.toml","*.html","*.js", "*.css", "db.sqlite3", "*.ico"]
+"*" = ["*.mo","*.xlsx","*.toml","*.html","*.js", "*.css", "*.ico"]
 
 [tool.setuptools.exclude-package-data]
 "*" = ["*.po"]

{fnschool-20251011.81705.829 → fnschool-20251012.81427.834}/src/fnschoo1/__init__.py

@@ -6,7 +6,7 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251011.81705.829"
+__version__ = "20251012.81427.834"
 
 FNSCHOOL_PATH = Path(__file__).parent
 if FNSCHOOL_PATH.as_posix() not in sys.path:

{fnschool-20251011.81705.829 → fnschool-20251012.81427.834}/src/fnschoo1/canteen/workbook/generate.py

@@ -1603,7 +1603,17 @@ class CanteenWorkBook:
         ]
         month_days.append(self.date_end)
 
-        sundays = [d for d in month_days if d.weekday() == 6]
+        min_storage_date = min(
+            [
+                i.storage_date
+                for i in ingredients
+                if i.storage_date >= self.date_start
+            ]
+        )
+        print("min_storage_date", min_storage_date)
+        sundays = [
+            d for d in month_days if d.weekday() == 6 and d >= min_storage_date
+        ]
 
         formed_ingredients = []
         for sunday in sundays:
@@ -1628,6 +1638,11 @@ class CanteenWorkBook:
             fake_ingredients_len = (
                 ingredient_rows_count - surplus_ingredients_len
             )
+
+            sunday_ingredients = sorted(
+                sunday_ingredients, key=lambda i: i.category.name
+            )
+
             s_ingredient0 = sunday_ingredients[0]
             sunday_ingredients += [
                 Ingredient(
@@ -1644,10 +1659,6 @@ class CanteenWorkBook:
                 )
                 for i in range(fake_ingredients_len)
             ]
-
-            sunday_ingredients = sorted(
-                sunday_ingredients, key=lambda i: i.category.name
-            )
             for index in range(
                 0, len(sunday_ingredients), ingredient_rows_count
             ):
@@ -1776,12 +1787,21 @@ class CanteenWorkBook:
                 )
                 summary_total_price += ingredient_total_price
 
-                sheet.cell(ingredient_row_num, 1, ingredient.name)
+                ingredient_name_cell = sheet.cell(ingredient_row_num, 1)
+                ingredient_name_cell.value = ingredient.name
+                if ingredient.name:
+                    ingredient_name_cell.comment = Comment(
+                        _("{meal_type} ({category})").format(
+                            meal_type=ingredient.meal_type,
+                            category=ingredient.category,
+                        ),
+                        user.username,
+                    )
                 sheet.cell(ingredient_row_num, 2, ingredient.quantity_unit_name)
-                sheet.cell(ingredient_row_num, 3, ingredient_quantity)
-                sheet.cell(ingredient_row_num, 4, ingredient_total_price)
-                sheet.cell(ingredient_row_num, 5, ingredient_quantity)
-                sheet.cell(ingredient_row_num, 6, ingredient_total_price)
+                sheet.cell(ingredient_row_num, 3, ingredient_quantity or "")
+                sheet.cell(ingredient_row_num, 4, ingredient_total_price or "")
+                sheet.cell(ingredient_row_num, 5, ingredient_quantity or "")
+                sheet.cell(ingredient_row_num, 6, ingredient_total_price or "")
                 sheet.cell(ingredient_row_num, 7, "")
                 sheet.cell(ingredient_row_num, 8, "")
                 sheet.cell(ingredient_row_num, 9, "")

{fnschool-20251011.81705.829 → fnschool-20251012.81427.834}/src/fnschoo1/fnschool/__init__.py

@@ -1,7 +1,8 @@
 import re
 
-from django.utils.translation import gettext  # as _
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
+
+# from django.utils.translation import gettext_lazy as _
 
 
 def count_chinese_characters(text):

{fnschool-20251011.81705.829 → fnschool-20251012.81427.834}/src/fnschool.egg-info/PKG-INFO

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

@@ -2,7 +2,6 @@ LICENSE
 README.md
 pyproject.toml
 src/fnschoo1/__init__.py
-src/fnschoo1/db.sqlite3
 src/fnschoo1/manage.py
 src/fnschoo1/canteen/__init__.py
 src/fnschoo1/canteen/admin.py