fnschool 20251011.82005.807__tar.gz → 20251012.81520.855__tar.gz

{fnschool-20251011.82005.807 → fnschool-20251012.81520.855}/PKG-INFO

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

@@ -6,7 +6,7 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251011.82005.807"
+__version__ = "20251012.81520.855"
 
 FNSCHOOL_PATH = Path(__file__).parent
 if FNSCHOOL_PATH.as_posix() not in sys.path:
@@ -37,7 +37,7 @@ def main():
             "forget to activate a virtual environment?"
         ) from exc
 
-    if not "runserver" in sys.argv:
+    if len(sys.argv) < 2:
         local_port = str(random.randint(8080, 65530))
         local_url = "http://127.0.0.1:" + local_port
         sys.argv.append("runserver")

fnschool-20251012.81520.855/src/fnschoo1/canteen/migrations/0013_alter_consumption_options_alter_ingredient_options_and_more.py

@@ -0,0 +1,197 @@
+# Generated by Django 4.2.25 on 2025-10-12 07:14
+
+import django.core.validators
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("canteen", "0012_alter_ingredient_storage_date"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="consumption",
+            options={
+                "ordering": ["-date_of_using"],
+                "verbose_name": "消耗记录",
+                "verbose_name_plural": "消耗记录列表",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="ingredient",
+            options={
+                "verbose_name": "Ingredient",
+                "verbose_name_plural": "食材列表",
+            },
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="abbreviation",
+            field=models.CharField(
+                blank=True, max_length=100, null=True, verbose_name="简称"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="created_at",
+            field=models.DateField(verbose_name="创建日期"),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="is_disabled",
+            field=models.BooleanField(default=False, verbose_name="已禁用"),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="name",
+            field=models.CharField(max_length=100, verbose_name="食材大类名"),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="pin_to_consumptions_top",
+            field=models.BooleanField(default=False, verbose_name="置顶出库"),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="Categories",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="大类",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="consumption",
+            name="date_of_using",
+            field=models.DateField(verbose_name="日期"),
+        ),
+        migrations.AlterField(
+            model_name="consumption",
+            name="ingredient",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="consumptions",
+                to="canteen.ingredient",
+                verbose_name="食材",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="consumption",
+            name="is_disabled",
+            field=models.BooleanField(default=False, verbose_name="已禁用"),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="category",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="ingredients",
+                to="canteen.category",
+                verbose_name="大类",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="is_disabled",
+            field=models.BooleanField(default=False, verbose_name="禁用"),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="is_ignorable",
+            field=models.BooleanField(default=False, verbose_name="不入库"),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="meal_type",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="ingredients",
+                to="canteen.mealtype",
+                verbose_name="餐类",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="name",
+            field=models.CharField(max_length=100, verbose_name="食材名"),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="quantity",
+            field=models.IntegerField(
+                validators=[django.core.validators.MinValueValidator(0)],
+                verbose_name="数量",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="quantity_unit_name",
+            field=models.CharField(
+                blank=True, max_length=20, null=True, verbose_name="数量单位"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="storage_date",
+            field=models.DateField(
+                default=django.utils.timezone.now, verbose_name="入库日期"
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="total_price",
+            field=models.DecimalField(
+                decimal_places=2, max_digits=10, verbose_name="总价"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="ingredients",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="用户",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="abbreviation",
+            field=models.CharField(
+                blank=True, max_length=100, null=True, verbose_name="简称"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="created_at",
+            field=models.DateField(verbose_name="创建日期"),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="is_disabled",
+            field=models.BooleanField(default=False, verbose_name="已禁用"),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="name",
+            field=models.CharField(max_length=100, verbose_name="餐类名称"),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="meal_types",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="餐类",
+            ),
+        ),
+    ]

{fnschool-20251011.82005.807 → fnschool-20251012.81520.855}/src/fnschoo1/canteen/views.py

@@ -421,7 +421,7 @@ def list_ingredients(request):
             if c.get("category__name") in search_query
         ]
         for category in categories:
-            queries &= Q(category__icontains=category)
+            queries &= Q(category__name__icontains=category)
             search_query = search_query.replace(category, "")
 
         meal_types = Ingredient.objects.values("meal_type__name").distinct()
@@ -431,7 +431,7 @@ def list_ingredients(request):
             if m.get("meal_type__name") in search_query
         ]
         for meal_type in meal_types:
-            queries &= Q(meal_type__icontains=meal_type)
+            queries &= Q(meal_type__name__icontains=meal_type)
             search_query = search_query.replace(meal_type, "")
 
         names = re.split(r"\s+", search_query)

{fnschool-20251011.82005.807 → fnschool-20251012.81520.855}/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.82005.807 → fnschool-20251012.81520.855}/src/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 → fnschool-20251012.81520.855}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251011.82005.807
+Version: 20251012.81520.855
 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 → fnschool-20251012.81520.855}/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
@@ -24,6 +23,7 @@ src/fnschoo1/canteen/migrations/0009_alter_category_abbreviation_and_more.py
 src/fnschoo1/canteen/migrations/0010_alter_consumption_options_alter_ingredient_options_and_more.py
 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/__init__.py
 src/fnschoo1/canteen/templates/canteen/close.html
 src/fnschoo1/canteen/templates/canteen/category/create.html