fnschool 20251011.82005.807__py3-none-any.whl → 20251012.81427.834__py3-none-any.whl

fnschoo1/__init__.py

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

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, "")

fnschoo1/fnschool/__init__.py

@@ -1,6 +1,7 @@
 import re
 
-from django.utils.translation import gettext  as _
+from django.utils.translation import gettext as _
+
 # from django.utils.translation import gettext_lazy as _
 
 

{fnschool-20251011.82005.807.dist-info → fnschool-20251012.81427.834.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251011.82005.807
+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.82005.807.dist-info → fnschool-20251012.81427.834.dist-info}/RECORD

@@ -1,5 +1,4 @@
-fnschoo1/__init__.py,sha256=eLqO0x1gqSWrEqF8dFYMX8Sf5k2_kuT3lla69Ty4If4,1506
-fnschoo1/db.sqlite3,sha256=k8mhvHCeeE98o8mdCTIJqFsdbGkjUYtBn7ZrFzMdp1I,176128
+fnschoo1/__init__.py,sha256=T2T3r4M0B848PqXzWVZxgczEaLgO_Ex901nVZLrFaHg,1506
 fnschoo1/manage.py,sha256=pMv0yE2eTcNrgskSHDUdRrnY51iTm1DXg32I8mWDDqw,696
 fnschoo1/canteen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/canteen/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
@@ -40,8 +39,8 @@ fnschoo1/canteen/templates/canteen/meal_type/delete.html,sha256=1UmCyXD-6lbYl-IE
 fnschoo1/canteen/templates/canteen/meal_type/list.html,sha256=c5kJUE1OgpRtSrMV4wFwL_gbRSaX_XMM4Zt1JTx34_g,1907
 fnschoo1/canteen/templates/canteen/meal_type/update.html,sha256=Rfv1TamSFIKHzvUNlgnmrPmfmzrehPpuo5Hv8VF0yek,818
 fnschoo1/canteen/workbook/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschoo1/canteen/workbook/generate.py,sha256=o6dCRE7Ne8tSCZkdu8MIsgvt4UEuf9YiefsBBAGMVec,81958
-fnschoo1/fnschool/__init__.py,sha256=71nfNRSJdwE_7r6s5hkoPOyQ0iSYDNhv3CcbiSwg9fw,287
+fnschoo1/canteen/workbook/generate.py,sha256=347Wg5WB90dLoQb5ZkMlCo4aV0L59FsWmKoE6BptGDg,82705
+fnschoo1/fnschool/__init__.py,sha256=TmHhzykpKNMoMf6eD-EKvbvmnlzs1XGHtvD55ae1sXs,287
 fnschoo1/fnschool/asgi.py,sha256=kzkqosS10uBlyBX53EXcsATcvEZmac6nsPzyOHCuucE,393
 fnschoo1/fnschool/settings.py,sha256=l9Y1iQCivSfmsNfnHltfXLzxP6gG4VMIL4GEZgAp8YM,4357
 fnschoo1/fnschool/urls.py,sha256=8WPemtCUuStd0R9gDP70c-NRQ5k7G4ksq6dYGH6xCDM,1036
@@ -93,9 +92,9 @@ fnschoo1/templates/includes/_navigation.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 fnschoo1/templates/includes/_paginator.html,sha256=Z-Hxcdmun4SJ1YcHnWTDLfW8wrngROiBTwr4NZWaPP4,1246
 fnschoo1/templates/registration/logged_out.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/registration/login.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fnschool-20251011.82005.807.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251011.82005.807.dist-info/METADATA,sha256=2cW6dqYnTCBW73v2-Ca5icWqIlEetTKnQPmYS1AbPYg,4752
-fnschool-20251011.82005.807.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251011.82005.807.dist-info/entry_points.txt,sha256=To2PDA9r0qhE0Wq1-M8hEE8uXxTrTe16BOcpKPT-q5g,47
-fnschool-20251011.82005.807.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251011.82005.807.dist-info/RECORD,,
+fnschool-20251012.81427.834.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251012.81427.834.dist-info/METADATA,sha256=usJgEjLKK9z8Y45ehDz2izOqhT3sWiTAyrNW8PFTe1g,4752
+fnschool-20251012.81427.834.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251012.81427.834.dist-info/entry_points.txt,sha256=To2PDA9r0qhE0Wq1-M8hEE8uXxTrTe16BOcpKPT-q5g,47
+fnschool-20251012.81427.834.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251012.81427.834.dist-info/RECORD,,