fnschool 20251012.81427.834__tar.gz → 20251013.80821.836__tar.gz

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

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

@@ -6,7 +6,7 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251012.81427.834"
+__version__ = "20251013.80821.836"
 
 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-20251013.80821.836/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-20251012.81427.834 → fnschool-20251013.80821.836}/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-20251012.81427.834 → fnschool-20251013.80821.836}/src/fnschoo1/canteen/workbook/generate.py

@@ -1597,54 +1597,66 @@ class CanteenWorkBook:
             & Q(is_disabled=False)
             & Q(is_ignorable=False)
         ).all()
-        month_days = [
-            self.date_start + timedelta(days=i)
-            for i in range((self.date_end - self.date_start).days)
-        ]
-        month_days.append(self.date_end)
-
-        min_storage_date = min(
-            [
-                i.storage_date
-                for i in ingredients
-                if i.storage_date >= self.date_start
+
+        consumptions = []
+        for ingredient in ingredients:
+            consumptions += [
+                c
+                for c in ingredient.consumptions.filter(
+                    Q(is_disabled=False)
+                ).all()
             ]
+
+        inventory_days = []
+        dates_of_using = sorted(
+            list(set([c.date_of_using for c in consumptions]))
+        )
+        for i, date_of_using in enumerate(dates_of_using):
+            if i + 1 < len(dates_of_using):
+                if (date_of_using + timedelta(days=1)) < dates_of_using[i + 1]:
+                    inventory_days.append(date_of_using)
+            else:
+                inventory_days.append(date_of_using)
+        inventory_days.insert(
+            0, (self.date_start.replace(day=1) - timedelta(days=1))
         )
-        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:
-            sunday_ingredients = []
+        for inventory_day in inventory_days:
+            inventory_day_ingredients = []
             for ingredient in ingredients:
+                if (
+                    ingredient.storage_date > inventory_day
+                    and inventory_day != inventory_days[-1]
+                ):
+                    continue
                 remaining_quantity = ingredient.quantity - sum(
                     [
                         c.amount_used
                         for c in ingredient.consumptions.filter(
                             Q(is_disabled=False)
+                            & Q(date_of_using__lte=inventory_day)
                         ).all()
-                        if c.date_of_using <= sunday
                     ]
                 )
                 if remaining_quantity > Decimal("0.0"):
-                    sunday_ingredients.append(ingredient)
-                    print(ingredient.name, remaining_quantity)
-            form_count = len(sunday_ingredients) / ingredient_rows_count
+                    inventory_day_ingredients.append(ingredient)
+            form_count = len(inventory_day_ingredients) / ingredient_rows_count
             surplus_ingredients_len = (
-                len(sunday_ingredients) % ingredient_rows_count
+                len(inventory_day_ingredients) % ingredient_rows_count
             )
             fake_ingredients_len = (
                 ingredient_rows_count - surplus_ingredients_len
             )
 
-            sunday_ingredients = sorted(
-                sunday_ingredients, key=lambda i: i.category.name
+            inventory_day_ingredients = sorted(
+                inventory_day_ingredients, key=lambda i: i.category.name
             )
 
-            s_ingredient0 = sunday_ingredients[0]
-            sunday_ingredients += [
+            if len(inventory_day_ingredients) < 1:
+                continue
+            s_ingredient0 = inventory_day_ingredients[0]
+            inventory_day_ingredients += [
                 Ingredient(
                     user=user,
                     storage_date=self.date_start,
@@ -1660,17 +1672,21 @@ class CanteenWorkBook:
                 for i in range(fake_ingredients_len)
             ]
             for index in range(
-                0, len(sunday_ingredients), ingredient_rows_count
+                0, len(inventory_day_ingredients), ingredient_rows_count
             ):
-                split_ingredients = sunday_ingredients[
+                split_ingredients = inventory_day_ingredients[
                     index : index + ingredient_rows_count
                 ]
 
-                formed_ingredients.append([sunday, index, split_ingredients])
+                formed_ingredients.append(
+                    [inventory_day, index, split_ingredients]
+                )
 
-        for index, (sunday, sunday_index, ingredients) in enumerate(
-            formed_ingredients
-        ):
+        for index, (
+            inventory_day,
+            inventory_day_index,
+            ingredients,
+        ) in enumerate(formed_ingredients):
 
             title_row_num = (ingredient_rows_count + 8) * index + 1
             title_cell = sheet.cell(title_row_num, 1)
@@ -1693,9 +1709,9 @@ class CanteenWorkBook:
                 )
             ).format(
                 affiliation=user.affiliation,
-                year=sunday.year,
-                month=sunday.month,
-                day=sunday.day,
+                year=inventory_day.year,
+                month=inventory_day.month,
+                day=inventory_day.day,
             )
 
             sub_title_affiliation_date_cell.font = self.font_12
@@ -1766,6 +1782,7 @@ class CanteenWorkBook:
             )
 
             summary_total_price = Decimal("0.0")
+            formed_ingredients_index = index
             for index, ingredient in enumerate(ingredients):
                 ingredient_row_num = header1_row_num + index + 1
                 ingredient_quantity = (
@@ -1774,9 +1791,9 @@ class CanteenWorkBook:
                         [
                             c.amount_used
                             for c in ingredient.consumptions.filter(
-                                is_disabled=False
+                                Q(date_of_using__lte=inventory_day)
+                                & Q(is_disabled=False)
                             ).all()
-                            if c.date_of_using <= sunday
                         ]
                     )
                     if ingredient.id
@@ -1808,25 +1825,29 @@ class CanteenWorkBook:
 
             summary_row_num = header1_row_num + ingredient_rows_count + 1
 
-            prev_sunday = (
-                formed_ingredients[index - 1][0]
-                if 0 <= index - 1 < len(formed_ingredients)
+            prev_inventory_day = (
+                formed_ingredients[formed_ingredients_index - 1][0]
+                if 0 <= formed_ingredients_index - 1 < len(formed_ingredients)
                 else None
             )
-            next_sunday = (
-                storaged_ingredients[index + 1][0]
-                if 0 < index + 1 < (len(formed_ingredients) - 1)
+            next_inventory_day = (
+                formed_ingredients[formed_ingredients_index + 1][0]
+                if 0 < formed_ingredients_index + 1 < len(formed_ingredients)
                 else None
             )
-            summary_1_value = ""
+            summary_col1_value = ""
 
-            if not next_sunday or not next_sunday == sunday:
-                summary_1_value = _("Summary Total Price (Surplus Sheet)")
+            if next_inventory_day and next_inventory_day == inventory_day:
+                summary_col1_value = _(
+                    "Sub0-summary Total Price (Surplus Sheet)"
+                )
+            else:
+                summary_col1_value = _("Summary Total Price (Surplus Sheet)")
                 summary_total_price = Decimal("0.0")
                 ingredients_list = [
                     __ingredients
-                    for __sunday, __sunday_index, __ingredients in formed_ingredients
-                    if __sunday == sunday
+                    for __inventory_day, __inventory_day_index, __ingredients in formed_ingredients
+                    if __inventory_day == inventory_day
                 ]
                 for ingredients in ingredients_list:
                     for ingredient in ingredients:
@@ -1835,7 +1856,8 @@ class CanteenWorkBook:
                                 [
                                     c.amount_used
                                     for c in ingredient.consumptions.filter(
-                                        is_disabled=False
+                                        Q(is_disabled=False)
+                                        & Q(date_of_using__lte=inventory_day)
                                     ).all()
                                 ]
                             )
@@ -1846,10 +1868,7 @@ class CanteenWorkBook:
                             ingredient_quantity * ingredient.unit_price
                         )
 
-            else:
-                summary_1_value = _("Sub0-summary Total Price (Surplus Sheet)")
-
-            sheet.cell(summary_row_num, 1, summary_1_value)
+            sheet.cell(summary_row_num, 1, summary_col1_value)
 
             sheet.cell(summary_row_num, 4, summary_total_price)
             sheet.cell(summary_row_num, 6, summary_total_price)

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

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

@@ -23,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