fnschool 20251013.81959.843__tar.gz → 20251014.81348.830__tar.gz

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/PKG-INFO

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

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

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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):

fnschool-20251014.81348.830/src/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",
+            ),
+        ),
+    ]

fnschool-20251014.81348.830/src/fnschoo1/canteen/migrations/0015_alter_category_options_alter_category_priority.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.25 on 2025-10-14 05:48
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0014_category_priority"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="category",
+            options={"ordering": ["priority"]},
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="priority",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+                verbose_name="优先级",
+            ),
+        ),
+    ]

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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(

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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 %}

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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" %}

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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>

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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()

{fnschool-20251013.81959.843 → fnschool-20251014.81348.830}/src/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 → fnschool-20251014.81348.830}/src/fnschool.egg-info/PKG-INFO

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

@@ -24,6 +24,8 @@ src/fnschoo1/canteen/migrations/0010_alter_consumption_options_alter_ingredient_
 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/0014_category_priority.py
+src/fnschoo1/canteen/migrations/0015_alter_category_options_alter_category_priority.py
 src/fnschoo1/canteen/migrations/__init__.py
 src/fnschoo1/canteen/templates/canteen/close.html
 src/fnschoo1/canteen/templates/canteen/category/create.html