fnschool 20251013.81959.843__py3-none-any.whl → 20251014.81347.804__py3-none-any.whl

fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251013.81959.843"
+__version__ = "20251014.81347.804"

fnschoo1/canteen/forms.py

@@ -70,9 +70,19 @@ class CategoryForm(forms.ModelForm):
         fields = [
             "name",
             "abbreviation",
+            "priority",
             "pin_to_consumptions_top",
             "is_disabled",
         ]
+        widgets = {
+            "priority": forms.NumberInput(
+                attrs={
+                    "title": _(
+                        "Numbers with smaller values have higher priority."
+                    ),
+                },
+            ),
+        }
 
 
 class MealTypeForm(forms.ModelForm):

fnschoo1/canteen/migrations/0014_category_priority.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.25 on 2025-10-14 04:46
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "canteen",
+            "0013_alter_consumption_options_alter_ingredient_options_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="category",
+            name="priority",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+                verbose_name="Category Priority",
+            ),
+        ),
+    ]

fnschoo1/canteen/models.py

@@ -45,10 +45,22 @@ class Category(models.Model):
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
+    priority = models.IntegerField(
+        null=True,
+        blank=True,
+        validators=[
+            MinValueValidator(0),
+        ],
+        verbose_name=_("Category Priority"),
+    )
+
     pin_to_consumptions_top = models.BooleanField(
         default=False, verbose_name=_("Pin to Consumptions Top")
     )
 
+    class Meta:
+        ordering = ["priority"]
+
     def __str__(self):
         return self.name
 
@@ -110,12 +122,6 @@ class Ingredient(models.Model):
     @property
     def cleaned_consumptions(self):
         consumptions = self.consumptions.all()
-        for c1 in consumptions:
-            for c2 in consumptions:
-                if c1.date_of_using == c2.date_of_using and c1.id != c2.id:
-                    c1.is_disabled = False
-                    c1.save()
-                    c2.delete()
         return consumptions
 
     @property
@@ -128,6 +134,22 @@ class Ingredient(models.Model):
         )
         return quantity
 
+    def get_consuming_quantity(self, date_end):
+        consumptions = self.cleaned_consumptions
+        if not consumptions:
+            return 0
+        quantity = sum(
+            [
+                c.amount_used
+                for c in consumptions
+                if not c.is_disabled and c.date_of_using <= date_end
+            ]
+        )
+        return quantity
+
+    def get_remaining_quantity(self, date_end):
+        return self.quantity - self.get_consuming_quantity(date_end)
+
     @property
     def remaining_quantity(self):
         consumptions = self.cleaned_consumptions
@@ -156,7 +178,7 @@ class Consumption(models.Model):
 
     date_of_using = models.DateField(verbose_name=_("Date"))
     amount_used = models.IntegerField(
-        verbose_name="消耗数量",
+        verbose_name=_("Consuming Quantity"),
         validators=[MinValueValidator(0)],
     )
     is_disabled = models.BooleanField(

fnschoo1/canteen/templates/canteen/category/delete.html

@@ -21,6 +21,10 @@
       <dd>
         {{ category.created_at }}
       </dd>
+      <dt>{% trans 'Priority' %}</dt>
+      <dd>
+        {{ category.priority }}
+      </dd>
       <dt>{% trans 'Pin to consumptions top' %}</dt>
       <dd>
         {% if category.pin_to_consumptions_top %}

fnschoo1/canteen/templates/canteen/category/list.html

@@ -18,6 +18,7 @@
         <th>{% trans "Abbreviation" %}</th>
         <th>{% trans "Created at" %}</th>
         <th>{% trans "Pin to consumptions top" %}</th>
+        <th>{% trans "Priority" %}</th>
         <th>{% trans "Is Disabled" %}</th>
         <th>#</th>
       </tr>
@@ -34,6 +35,7 @@
               {% trans "Yes" %}
             {% endif %}
           </td>
+          <td>{{ category.priority|default_if_none:'0' }}</td>
           <td>
             {% if category.is_disabled %}
               {% trans "Yes" %}

fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -30,7 +30,7 @@
       <input class="form-control "
              onkeydown="if(event.keyCode==13){list_consumptions();}"
              title="{% trans 'The end date of storage.' %}"
-             id="storage_date_end"
+             id="storage_date_end_input"
              value="{{ request.COOKIES.storage_date_end }}">
     </input>
   </div>

fnschoo1/canteen/views.py

@@ -784,7 +784,6 @@ class CategoryListView(LoginRequiredMixin, ListView):
     model = Category
     template_name = "canteen/category/list.html"
     context_object_name = "categories"
-    ordering = ["-created_at"]
 
     paginate_by = 10
     paginate_orphans = 2

fnschoo1/canteen/workbook/generate.py

@@ -2106,6 +2106,19 @@ class CanteenWorkBook:
         ]:
             set_column_width_in_inches(sheet, col, width)
 
+    def fill_in_food_sheets(self):
+        user = self.request.user
+        date_start = self.date_start
+        date_end = self.date_end
+        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)
+        ).all()
+
     def fill_in(self):
         self.fill_in_cover_sheet()
         self.fill_in_storage_sheet()

fnschoo1/static/js/fnschool.js

@@ -9,9 +9,7 @@ function get_cookie(name) {
   return null
 }
 function delete_cookie(name) {
-  document.cookie =
-    name +
-    `=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=${window.location.pathname}`
+  document.cookie = name + `=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`
 }
 
 function set_cookies(cookies) {
@@ -28,7 +26,7 @@ function set_simple_cookie(key, value) {
   }
   const expiryDate = new Date()
   expiryDate.setFullYear(expiryDate.getFullYear() + 20)
-  document.cookie = `${key}=${value}; expires=${expiryDate.toUTCString()}; path=${window.location.pathname}`
+  document.cookie = `${key}=${value}; expires=${expiryDate.toUTCString()}; path=/`
 }
 function update_href(query) {
   query = new Map(Object.entries(query))

{fnschool-20251013.81959.843.dist-info → fnschool-20251014.81347.804.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
-fnschoo1/__init__.py,sha256=P5QYmb7ozN6bO6SBiWzHKv5mAxye_K2A3X_5bGBmfXc,197
+fnschoo1/__init__.py,sha256=Oo5lrB265t6WgO2VyARHhiCzSnqnPwPyQqwRCxQNeCk,197
 fnschoo1/manage.py,sha256=Cr5OtPrRWfEc7KEjW4yYnMKj_qlb0-qpwFRz3vFXvC0,1565
 fnschoo1/canteen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/canteen/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 fnschoo1/canteen/apps.py,sha256=zUjM0ZJwHW4i72vOm87QewRlvFQORQo5yb053u4YIGs,146
-fnschoo1/canteen/forms.py,sha256=4Y75VHpnONdN5hM8aShyr7tbQSElLa-22PQK7fDRflw,2296
-fnschoo1/canteen/models.py,sha256=20r24iNJW0hmPwhY96pQLYaIgqf8kc_Tx76IqORR_LE,5219
+fnschoo1/canteen/forms.py,sha256=PDPAzZZ_y533KtMxCixLXXsXok5gjUShCSXeonYgGqQ,2582
+fnschoo1/canteen/models.py,sha256=a4dCdTAcWu84D6PP8CWCSsAF4Q6ZMo74eDluwOmH_R8,5710
 fnschoo1/canteen/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 fnschoo1/canteen/urls.py,sha256=4GtrqC9L59c8zopfjRgqhbcvA5iPnGcAUVuM6CrKWpk,2797
-fnschoo1/canteen/views.py,sha256=AXMO6dEMjBMTO-D6sWEV2sDwYZcms0L6hSgq8NHvVfw,26315
+fnschoo1/canteen/views.py,sha256=DGrbOZuU0XuMuTnldFrHpRsm-spYuBHZMzBQq3z_iC0,26284
 fnschoo1/canteen/migrations/0001_initial.py,sha256=IHlyfT9sNc-kRQZy7NyjgWzp4EGus405QCAUw4oNdAQ,3943
 fnschoo1/canteen/migrations/0002_ingredient_is_disabled.py,sha256=j8oGWb2b99YwsEk-uwESLA_JRITEcz6b35ekoYOUGGc,444
 fnschoo1/canteen/migrations/0003_consumption_is_disabled_alter_ingredient_is_disabled.py,sha256=9RB5SHjINgrrqtDpcVIUXEBa3C_MTcR_keXLGG_PcOs,619
@@ -21,14 +21,15 @@ fnschoo1/canteen/migrations/0010_alter_consumption_options_alter_ingredient_opti
 fnschoo1/canteen/migrations/0011_category_pin_to_consumptions_top.py,sha256=gonvx7T23KlesYUGFx-WTvkz1BLZSnq0n62qKvtWnUo,553
 fnschoo1/canteen/migrations/0012_alter_ingredient_storage_date.py,sha256=JvU9xrAbGN8uoKHQw00wq6U4CaR_6WojQo-8VwmID3I,436
 fnschoo1/canteen/migrations/0013_alter_consumption_options_alter_ingredient_options_and_more.py,sha256=hKwsEJ_a1ezANJSrQoca2wEy22AZESwhqH9eonNfOm8,6735
+fnschoo1/canteen/migrations/0014_category_priority.py,sha256=AywjPQhwtwm8xttEEOGQ3yyQ8j890hL5J-wCUNEwbkE,677
 fnschoo1/canteen/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/canteen/templates/canteen/close.html,sha256=pLYeJmGaOEJKMUJdZmYzz_n--l28IRDQ4fXvetP_Vsc,200
 fnschoo1/canteen/templates/canteen/category/create.html,sha256=7Hq62BqEpamDt52_Ut7DTO74_3yEn8_CqXH4e4va6dY,593
-fnschoo1/canteen/templates/canteen/category/delete.html,sha256=MnPyFzjO3HonOljwxGf6r1UzmbFjow7VT6h7YGkxxfk,1709
-fnschoo1/canteen/templates/canteen/category/list.html,sha256=aj81uoA-jmdv8mZT-Y9DxjOHVGrSfI1z0DB1YnJWb4w,2045
+fnschoo1/canteen/templates/canteen/category/delete.html,sha256=gkEg3oiIbjVsZMKEywkAeXtb21oHTofi8cOER4dW6cc,1802
+fnschoo1/canteen/templates/canteen/category/list.html,sha256=QLO2GA13Co48Ijd0DCCN4lcMm1fgJqT2CprH5VdLZPw,2148
 fnschoo1/canteen/templates/canteen/category/update.html,sha256=8Nzdbe8UorrJHzElkrdqvLaPnUvcvGhrViZB4D86wqo,815
 fnschoo1/canteen/templates/canteen/consumption/_create.html,sha256=lpST1R0vL1PEI1YE9d0-bcWWpCMH-INjIF-7pweAHuU,1008
-fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=NOUKb48EueRHHN3tb1KwTkCsmpWwdWWCwX3Kwqi-A7o,15954
+fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=k7E3SH9B605WlrJ7_ylncfoOe51qhHgIXKr_TYLukEs,15960
 fnschoo1/canteen/templates/canteen/ingredient/close.html,sha256=pLYeJmGaOEJKMUJdZmYzz_n--l28IRDQ4fXvetP_Vsc,200
 fnschoo1/canteen/templates/canteen/ingredient/create.html,sha256=xZvh0tP_cv2HPQ96JSHChO6Ni23tzHc5YJCUhE2yEqM,807
 fnschoo1/canteen/templates/canteen/ingredient/create_one.html,sha256=O8EPSvAnEZ-4VJiwFdoyxJrMOoMpRkH6CyfvWwHaVgc,599
@@ -40,7 +41,7 @@ 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=1UUXdeGLdHFzZDGzMFOcoD6rsZtjRAzYFfKLpiRpVps,84102
+fnschoo1/canteen/workbook/generate.py,sha256=iCVe844tDqFZXn8eVwpgR7udZRfQJNoTalU-8jJH4x0,84475
 fnschoo1/fnschool/__init__.py,sha256=TmHhzykpKNMoMf6eD-EKvbvmnlzs1XGHtvD55ae1sXs,287
 fnschoo1/fnschool/asgi.py,sha256=kzkqosS10uBlyBX53EXcsATcvEZmac6nsPzyOHCuucE,393
 fnschoo1/fnschool/settings.py,sha256=l9Y1iQCivSfmsNfnHltfXLzxP6gG4VMIL4GEZgAp8YM,4357
@@ -50,7 +51,7 @@ fnschoo1/fnschool/wsgi.py,sha256=dQq4S0vZWCz8w5R9KooJeLYTVFXvEgJRYe7NFZwVxU8,393
 fnschoo1/fnschool/templatetags/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 fnschoo1/fnschool/templatetags/fnschool_tags.py,sha256=l5Zov4VlQKpz-69SFftP4kXyMymz-a0D5F_ss_eiFc4,568
 fnschoo1/locale/en/LC_MESSAGES/django.mo,sha256=M8AB6fmjwlEd761iFlasNWdiEYfE-2nIwBoioGtEVUo,404
-fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=LMXr4V7PzsK1AkSxnQmV1a6mDIdXRTJv3H-Om092BHc,19994
+fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=3Ipol-cSR0HI3vvp7gbK1jxLGR7ZzeKncXX__rzyJCw,20121
 fnschoo1/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/profiles/admin.py,sha256=93UCvdODI63KzCDfFFnKmfvCMGCp6FCG9WErE91i79Y,522
 fnschoo1/profiles/apps.py,sha256=WDu6eceFnDkBFMqquAolMZMo7XPb0ah6l2q2AruTrl4,215
@@ -76,7 +77,7 @@ fnschoo1/static/css/fnschool.css,sha256=nPjOh0vWuuFnZWrXcT2E3j3adL77v_PRyeml65Mv
 fnschoo1/static/images/favicon.ico,sha256=S8Tf0NsUdHnoYO0SEn-sig6YjB0atIpEtSlm7p1HxjY,5014
 fnschoo1/static/js/bootstrap.bundle.min.js,sha256=6kw84LCFc4QJzifgkle0FsvQrpt2NVRNPNjSSc9caiM,125881
 fnschoo1/static/js/bootstrap.min.js,sha256=0SHpZTHghUOz_BNedMzuH00z5lgwOSRKP_KI9G5Ogbk,88597
-fnschoo1/static/js/fnschool.js,sha256=A_IsEK7F_X83P-maARL5jDaQm90e1K48zAIv5r-34Vw,3019
+fnschoo1/static/js/fnschool.js,sha256=tq9QzYsq8S3CvCqLk2U9tQuwQTcE-hYpf5YanqIHi4g,2959
 fnschoo1/static/js/jquery.min.js,sha256=np_WnfpAmUmEO_iheFAJKf6mbm0_laW3Ns4x7kjSlt4,162505
 fnschoo1/static/js/jquery.slim.min.js,sha256=p5YkbOjgHxX3hTadKlGuDW58NvJ1ldjjokDuDQ_5yXs,129962
 fnschoo1/static/js/popper.min.js,sha256=O2xdmtEow7gq3I7-0lKjshvxHkBe0hTWrMkbX2fy0XQ,36887
@@ -93,14 +94,14 @@ 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-20251013.81959.843.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251013.81959.843.dist-info/METADATA,sha256=DC-zwFsEtLabNxJmkbl26HyKqHjaJ_6S-Mm5MvvktP8,4752
-fnschool-20251013.81959.843.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
-fnschool-20251013.81959.843.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251013.81959.843.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool-20251013.81959.843.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
-fnschool-20251013.81959.843.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
-fnschool-20251013.81959.843.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
-fnschool-20251013.81959.843.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251013.81959.843.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
-fnschool-20251013.81959.843.dist-info/RECORD,,
+fnschool-20251014.81347.804.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251014.81347.804.dist-info/METADATA,sha256=OK9Y8pUH8pBnQF7_lFDDckxCnj-zUsXvco38oP1x7eI,4752
+fnschool-20251014.81347.804.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
+fnschool-20251014.81347.804.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251014.81347.804.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschool-20251014.81347.804.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
+fnschool-20251014.81347.804.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
+fnschool-20251014.81347.804.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
+fnschool-20251014.81347.804.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251014.81347.804.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
+fnschool-20251014.81347.804.dist-info/RECORD,,