fnschool 20251018.81021.825__py3-none-any.whl → 20251020.82239.858__py3-none-any.whl

fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251018.81021.825"
+__version__ = "20251020.82239.858"

fnschoo1/canteen/forms.py

@@ -20,7 +20,7 @@ class IngredientForm(forms.ModelForm):
         fields = [
             f.name
             for f in Ingredient._meta.fields
-            if f.name not in ["id", "user"]
+            if f.name not in ["id", "user", "updated_at"]
         ]
 
         current_year = date.today().year

fnschoo1/canteen/migrations/0017_ingredient_updated_at_alter_category_created_at_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.25 on 2025-10-19 02:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0016_consumption_unique_ingredient_date_of_using"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="ingredient",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="Time of updating"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="created_at",
+            field=models.DateTimeField(null=True, verbose_name="创建日期"),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="created_at",
+            field=models.DateTimeField(null=True, verbose_name="创建日期"),
+        ),
+    ]

fnschoo1/canteen/models.py

@@ -21,7 +21,9 @@ class MealType(models.Model):
     abbreviation = models.CharField(
         null=True, blank=True, max_length=100, verbose_name=_("Abbreviation")
     )
-    created_at = models.DateField(verbose_name=_("Creating Date"))
+    created_at = models.DateTimeField(
+        null=True, verbose_name=_("Creating Date")
+    )
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
@@ -41,7 +43,9 @@ class Category(models.Model):
     abbreviation = models.CharField(
         null=True, blank=True, max_length=100, verbose_name=_("abbreviation")
     )
-    created_at = models.DateField(verbose_name=_("Creating Date"))
+    created_at = models.DateTimeField(
+        null=True, verbose_name=_("Creating Date")
+    )
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
@@ -74,6 +78,9 @@ class Ingredient(models.Model):
         verbose_name=_("User"),
     )
     storage_date = models.DateField(verbose_name=_("Storage Date"))
+    updated_at = models.DateTimeField(
+        null=True, auto_now=True, verbose_name=_("Time of updating")
+    )
     name = models.CharField(max_length=100, verbose_name=_("Ingredient Name"))
     meal_type = models.ForeignKey(
         MealType,
@@ -139,6 +146,9 @@ class Ingredient(models.Model):
         return quantity
 
     def get_consuming_quantity(self, date_end):
+
+        if self.storage_date < date_end:
+            return 0
         consumptions = self.cleaned_consumptions
         if not consumptions:
             return 0
@@ -152,6 +162,8 @@ class Ingredient(models.Model):
         return quantity
 
     def get_remaining_quantity(self, date_end):
+        if self.storage_date < date_end:
+            return 0
         return self.quantity - self.get_consuming_quantity(date_end)
 
     @property

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

@@ -42,7 +42,7 @@
           onclick="list_consumptions();">{% trans "Refresh" %}</button>
 </div>
 </div>
-<div class="table table-responsive table-container">
+<div class="table-responsive table-container">
   <table class="table table-consumptions cotable-bordered table-striped table-hover table-condensed scroll-vertical ">
     <thead>
       <tr>
@@ -97,7 +97,8 @@
   </table>
 </div>
 <div class="">
-  <button onclick="generate_spreadsheet();"
+  <button id="generate_spreadsheet_btn"
+          onclick="generate_spreadsheet();"
           class="btn btn-submit-consumptions btn-success float-end">
     {% trans "Generate Spreadsheet" %}
   </button>
@@ -405,11 +406,11 @@
   }
 
   function set_consumptions_table_size() {
-    const submit_consumptions_btn = $(".btn-submit-consumptions")
+    const generate_spreadsheet_btn = $("#generate_spreadsheet_btn")
     const consumptions_table = $(".table-consumptions")
     const header = $("header")
     const footer = $("footer")
-    const height = Math.round((footer.offset().top - submit_consumptions_btn.height() - consumptions_table.offset().top) * 0.95)
+    const height = Math.round((footer.offset().top - generate_spreadsheet_btn.height() - consumptions_table.offset().top) * 0.95)
     consumptions_table.parent().height(height)
   }
   $(window).resize(function() {

fnschoo1/canteen/templates/canteen/ingredient/list.html

@@ -1,4 +1,5 @@
 {% extends "base/header_content_footer.html" %}
+{% load tz %}
 {% load crispy_forms_tags %}
 {% block title %}
   {% trans "Ingredient List" %}
@@ -34,77 +35,97 @@
        onclick="open_small_window('{% url 'canteen:create_ingredient' %}')">{% trans "Add one" %}</a>
   </div>
   <hr />
-  <table class="table table-bordered table-striped table-hover table-condensed">
-    <thead>
-      <tr>
-        <th scope="col">#</th>
-        {% for name,sort, header in headers %}
-          <th scope="col"
-              data-sort="sort_{{ name }} {{ sort }}"
-              onclick="sort_ingredients(this.dataset.sort);">
-            {{ header }}
-            {% if sort == "+" %}
-              &#8593;
-            {% elif sort == "-" %}
-              &#8595;
-            {% endif %}
-          </th>
-        {% endfor %}
-        <th scope="col"></th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for ingredient in page_obj %}
-        <tr>
-          <th scope="row">
-            <div class="form-check"
-                 title="{% trans 'It helps you check the ingredients.' %}">
-              <input type="checkbox"
-                     class="form-check-input"
-                     id="ingredient_free_nark_{{ ingredient.id }}" />
-              <label class="form-check-label"
-                     for="ingredient_free_nark_{{ ingredient.id }}">
-                {{ forloop.counter }}
-              </label>
-            </div>
-          </th>
-          <td>{{ ingredient.storage_date }}</td>
-          <td>{{ ingredient.name }}</td>
-          <td>{{ ingredient.meal_type }}</td>
-          <td>{{ ingredient.category }}</td>
-          <td>{{ ingredient.quantity }}</td>
-          <td>{{ ingredient.quantity_unit_name }}</td>
-          <td>{{ ingredient.total_price }}</td>
-          <td>
-            {% if ingredient.is_ignorable %}
-              {% trans "Yes" %}
-            {% endif %}
-          </td>
-          <td>
-            {% if ingredient.is_disabled %}
-              {% trans "Yes" %}
-            {% endif %}
-          </td>
-          <td class="">
-            <a class=""
-               target="_blank"
-               onclick="open_small_window('{% url 'canteen:edit_ingredient' ingredient.id %}'); return false;">
-              {% trans "Edit" %}
-            </a>
-            |
-            <a class="text-danger"
-               target="_blank"
-               onclick="open_small_window('{% url 'canteen:delete_ingredient' ingredient.id %}'); return false;">
-              {% trans "Delete" %}
-            </a>
-          </td>
-        </tr>
-      {% empty %}
-      {% endfor %}
-    </tbody>
-  </table>
+  <div class="container">
+    <div class="table-responsive-lg  table-container">
+      <table class="table table-bordered table-ingredient table-striped table-hover table-condensed">
+        <thead>
+          <tr>
+            <th scope="col">#</th>
+            {% for name,sort, header in headers %}
+              <th scope="col"
+                  data-sort="sort_{{ name }} {{ sort }}"
+                  onclick="sort_ingredients(this.dataset.sort);">
+                {{ header }}
+                {% if sort == "+" %}
+                  &#8593;
+                {% elif sort == "-" %}
+                  &#8595;
+                {% endif %}
+              </th>
+            {% endfor %}
+            <th scope="col"></th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for ingredient in page_obj %}
+            <tr class="tr-ingredient"
+                data-ingredient_updated_at="{{ ingredient.updated_at|localtime|date:'Y/m/d H:i:s' }}"
+                data-ingredient_storage_date="{{ ingredient.storage_date|localtime|date:'Y/m/d' }}">
+              <th scope="row">
+                <div class="form-check"
+                     title="{% trans 'It helps you check the ingredients.' %}">
+                  <input type="checkbox"
+                         class="form-check-input"
+                         id="ingredient_free_nark_{{ ingredient.id }}" />
+                  <label class="form-check-label"
+                         for="ingredient_free_nark_{{ ingredient.id }}">
+                    {{ forloop.counter }}
+                  </label>
+                </div>
+              </th>
+              <td>{{ ingredient.storage_date }}</td>
+              <td>{{ ingredient.name }}</td>
+              <td>{{ ingredient.meal_type }}</td>
+              <td>{{ ingredient.category }}</td>
+              <td>{{ ingredient.quantity }}</td>
+              <td>{{ ingredient.quantity_unit_name }}</td>
+              <td>{{ ingredient.total_price }}</td>
+              <td>
+                {% if ingredient.is_ignorable %}
+                  {% trans "Yes" %}
+                {% endif %}
+              </td>
+              <td>
+                {% if ingredient.is_disabled %}
+                  {% trans "Yes" %}
+                {% endif %}
+              </td>
+              <td class="">
+                <a class=""
+                   target="_blank"
+                   onclick="open_small_window('{% url 'canteen:edit_ingredient' ingredient.id %}'); return false;">
+                  {% trans "Edit" %}
+                </a>
+                |
+                <a class="text-danger"
+                   target="_blank"
+                   onclick="open_small_window('{% url 'canteen:delete_ingredient' ingredient.id %}'); return false;">
+                  {% trans "Delete" %}
+                </a>
+              </td>
+            </tr>
+          {% empty %}
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
   {% include 'includes/_paginator.html' %}
   <script>
+    $(document).ready(function() {
+      var ingredient_table = $('.table-ingredient')
+      var pagination = $('.pagination')
+      var footer = $("footer")
+      var height = Math.round((footer.offset().top - pagination.height() - ingredient_table.offset().top) * 0.98)
+      ingredient_table.parent().height(
+        height
+      );
+    });
+    $(document).ready(
+      function() {
+        make_highlight(".tr-ingredient", "ingredient_updated_at")
+      });
+
     function clear_q() {
       update_href({
         "q": ""
@@ -136,4 +157,15 @@
       update_href(i_sort);
     }
   </script>
+  <style>
+    .table-container {
+      overflow: auto;
+    }
+
+    .table-container thead th {
+      position: sticky;
+      top: 0;
+    }
+  </style>
+
 {% endblock %}

fnschoo1/canteen/views.py

@@ -395,7 +395,31 @@ def edit_ingredient(request, ingredient_id):
     ingredient = get_object_or_404(Ingredient, pk=ingredient_id)
 
     if request.method == "POST":
+
         form = IngredientForm(request.POST, instance=ingredient)
+
+        total_price = form.instance.total_price
+        quantity = form.instance.quantity
+
+        [total_price0, quantity0], [total_price1, quantity1] = split_price(
+            total_price, quantity
+        )
+
+        if total_price1:
+            unit_price_error_msg = _(
+                "The unit pricei ({unit_price}) has more than 3 decimal places and cannot be saved. Please modify it again."
+            ).format(
+                unit_price=(
+                    Decimal(str(total_price)) / Decimal(str(float(quantity)))
+                ).normalize()
+            )
+            form.add_error("total_price", unit_price_error_msg)
+            form.add_error("quantity", unit_price_error_msg)
+            return render(
+                request, "canteen/ingredient/update.html", {"form": form}
+            )
+
+        form.instance.user = request.user
         if form.is_valid():
             form.save()
             return render(
@@ -413,9 +437,10 @@ def list_ingredients(request):
     search_query = request.GET.get("q", "")
     search_query_cp = search_query
     fields = [
-        f for f in Ingredient._meta.fields if f.name not in ["id", "user"]
+        f
+        for f in Ingredient._meta.fields
+        if f.name in IngredientForm._meta.fields
     ]
-
     if search_query:
         queries = Q(user=request.user)
 
@@ -846,6 +871,30 @@ class IngredientCreateView(LoginRequiredMixin, CreateView):
 
     def form_valid(self, form):
         form.instance.user = self.request.user
+        total_price = form.instance.total_price
+        quantity = form.instance.quantity
+
+        [total_price0, quantity0], [total_price1, quantity1] = split_price(
+            total_price, quantity
+        )
+
+        if form.is_valid() and total_price1:
+            Ingredient.objects.create(
+                user=form.instance.user,
+                storage_date=form.instance.storage_date,
+                name=form.instance.name + _("(2)"),
+                meal_type=form.instance.meal_type,
+                category=form.instance.category,
+                quantity=quantity1,
+                total_price=total_price1,
+                quantity_unit_name=form.instance.quantity_unit_name,
+                is_ignorable=form.instance.is_ignorable,
+            )
+            form.instance.name = form.instance.name + _("(1)")
+
+        form.instance.total_price = total_price0
+        form.instance.quantity = quantity0
+
         return super().form_valid(form)
 
 

fnschoo1/canteen/workbook/generate.py

@@ -20,6 +20,7 @@ from django.db.models import (
     DecimalField,
     ExpressionWrapper,
     F,
+    IntegerField,
     Q,
     Sum,
     Value,
@@ -185,8 +186,16 @@ def set_row_height_in_inches(worksheet, row, inches):
     worksheet.row_dimensions[row].height = points
 
 
-class CanteenWorkBook:
-    def __init__(self, request, month, meal_type):
+class MealTypeWorkbook:
+    def __init__(
+        self,
+        request,
+        year=None,
+        month=None,
+        ingredients=None,
+        meal_type=None,
+        categories=None,
+    ):
         self.wb = Workbook()
         self.wb[self.wb.sheetnames[0]].sheet_state = "hidden"
         self.cover_sheet = self.wb.create_sheet(title=_("Sheet Cover"))
@@ -227,15 +236,27 @@ class CanteenWorkBook:
         self.font_18_bold = Font(size=18, bold=True)
         self.font_20_bold = Font(size=20, bold=True)
 
+        self.year = year or datetime().now().year
+        self.month = month or datetime().now().month
+
+        self.first_date_of_month = datetime(self.year, self.month, 1).date()
+        self.last_date_of_month = datetime(
+            self.year, self.month, calendar.monthrange(self.year, self.month)[1]
+        ).date()
+        self.first_date_of_year = datetime(self.year, 1, 1)
+        self.last_date_of_year = datetime(self.year, 12, 31)
+
         self.request = request
         self.user = self.request.user
+        self.ingredients = ingredients
+        self.ignorable_ingredients = self.ingredients.filter(
+            Q(is_ignorable=True)
+        ).all()
+        self.storage_ingredients = self.ingredients.filter(
+            Q(is_ignorable=False)
+        ).all()
         self.meal_type = meal_type
-        self.year = int(month.split("-")[0])
-        self.month = int(month.split("-")[1])
-        self.date_start = datetime(self.year, self.month, 1).date()
-        self.date_end = datetime(
-            self.year, self.month, calendar.monthrange(self.year, self.month)[1]
-        ).date()
+        self.categories = categories
         self.is_zh_CN = is_zh_CN()
 
         self._is_school = None
@@ -294,7 +315,7 @@ class CanteenWorkBook:
             affiliation=user.affiliation,
             year=self.year,
             month=self.month,
-            day=self.date_end.day,
+            day=self.last_date_of_month.day,
         )
 
         header_row_num = 3
@@ -318,10 +339,7 @@ class CanteenWorkBook:
             cell.alignment = self.center_alignment
             cell.border = self.thin_border
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.38)
         set_row_height_in_inches(sheet, 2, 0.22)
         set_row_height_in_inches(sheet, 3, 0.32)
@@ -334,14 +352,10 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
-                & Q(category=category)
-                & Q(storage_date__gte=self.date_start)
-                & Q(storage_date__lte=self.date_end)
-                & Q(meal_type=self.meal_type)
-                & Q(is_disabled=False)
-                & Q(is_ignorable=True)
+            ingredients = self.ignorable_ingredients.filter(
+                Q(category=category)
+                & Q(storage_date__gte=self.first_date_of_month)
+                & Q(storage_date__lte=self.last_date_of_month)
             ).all()
             total_price_cell = sheet.cell(row_num, 2)
             total_price_cell.value = sum([i.total_price for i in ingredients])
@@ -353,13 +367,9 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=True)
+        ingredients = self.ignorable_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -464,7 +474,7 @@ class CanteenWorkBook:
             affiliation=user.affiliation,
             year=self.year,
             month=self.month,
-            day=self.date_end.day,
+            day=self.last_date_of_month.day,
         )
 
         header_row_num = 3
@@ -490,10 +500,7 @@ class CanteenWorkBook:
             cell.alignment = self.center_alignment
             cell.border = self.thin_border
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.38)
         set_row_height_in_inches(sheet, 2, 0.22)
         set_row_height_in_inches(sheet, 3, 0.32)
@@ -506,19 +513,14 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
-                & Q(category=category)
+            ingredients = self.storage_ingredients.filter(
+                Q(category=category)
                 & Q(
                     consumptions__date_of_using__range=(
-                        self.date_start,
-                        self.date_end,
+                        self.first_date_of_month,
+                        self.last_date_of_month,
                     )
                 )
-                & Q(meal_type=self.meal_type)
-                & Q(category__is_disabled=False)
-                & Q(is_disabled=False)
-                & Q(is_ignorable=False)
             ).distinct()
 
             total_price_cell = sheet.cell(row_num, 2)
@@ -526,8 +528,8 @@ class CanteenWorkBook:
             for i in ingredients:
                 consumptions = i.consumptions.filter(
                     Q(is_disabled=False)
-                    & Q(date_of_using__lte=self.date_end)
-                    & Q(date_of_using__gte=self.date_start)
+                    & Q(date_of_using__lte=self.last_date_of_month)
+                    & Q(date_of_using__gte=self.first_date_of_month)
                 ).all()
                 total_price_consumed += sum(
                     [c.amount_used * i.unit_price for c in consumptions]
@@ -541,18 +543,13 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(
+        ingredients = self.storage_ingredients.filter(
+            Q(
                 consumptions__date_of_using__range=(
-                    self.date_start,
-                    self.date_end,
+                    self.first_date_of_month,
+                    self.last_date_of_month,
                 )
             )
-            & Q(meal_type=self.meal_type)
-            & Q(category__is_disabled=False)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
         ).distinct()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -560,8 +557,8 @@ class CanteenWorkBook:
         for i in ingredients:
             consumptions = i.consumptions.filter(
                 Q(is_disabled=False)
-                & Q(date_of_using__lte=self.date_end)
-                & Q(date_of_using__gte=self.date_start)
+                & Q(date_of_using__lte=self.last_date_of_month)
+                & Q(date_of_using__gte=self.first_date_of_month)
             ).all()
             summary_total_price += sum(
                 [c.amount_used * i.unit_price for c in consumptions]
@@ -666,7 +663,7 @@ class CanteenWorkBook:
             affiliation=user.affiliation,
             year=self.year,
             month=self.month,
-            day=self.date_end.day,
+            day=self.last_date_of_month.day,
         )
 
         header_row_num = 3
@@ -690,10 +687,7 @@ class CanteenWorkBook:
             cell.alignment = self.center_alignment
             cell.border = self.thin_border
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.38)
         set_row_height_in_inches(sheet, 2, 0.22)
         set_row_height_in_inches(sheet, 3, 0.32)
@@ -706,15 +700,12 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
+            ingredients = self.storage_ingredients.filter(
+                Q(storage_date__gte=self.first_date_of_month)
+                & Q(storage_date__lte=self.last_date_of_month)
                 & Q(category=category)
-                & Q(storage_date__gte=self.date_start)
-                & Q(storage_date__lte=self.date_end)
-                & Q(meal_type=self.meal_type)
-                & Q(is_disabled=False)
-                & Q(is_ignorable=False)
             ).all()
+
             total_price_cell = sheet.cell(row_num, 2)
             total_price_cell.value = sum([i.total_price for i in ingredients])
 
@@ -725,13 +716,9 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
+        ingredients = self.storage_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -811,16 +798,10 @@ class CanteenWorkBook:
         sheet.sheet_properties.tabColor = "ff9e16"
         user = self.user
         consumption_rows_count = 21
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-        consumptions = Consumption.objects.filter(
-            Q(is_disabled=False)
-            & Q(ingredient__meal_type=self.meal_type)
-            & Q(ingredient__user=user)
-            & Q(date_of_using__gte=self.date_start)
-            & Q(date_of_using__lte=self.date_end)
-        ).all()
+        categories = self.categories
+        consumptions = []
+        for i in self.storage_ingredients:
+            consumptions += i.consumptions.filter(Q(is_disabled=False)).all()
         consumption_row_height = 0.18
         consumption_rows_height = consumption_rows_count * 0.18
 
@@ -880,7 +861,7 @@ class CanteenWorkBook:
                     Ingredient(
                         user=user,
                         name="",
-                        storage_date=self.date_start,
+                        storage_date=self.first_date_of_month,
                         meal_type=split_dated_consumption.ingredient.meal_type,
                         category=c,
                         quantity=0.0,
@@ -1204,22 +1185,16 @@ class CanteenWorkBook:
         sheet.sheet_properties.tabColor = "16b1ff"
         user = self.user
         ingredient_rows_count = 21
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-        ).all()
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
+        ingredients = self.storage_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
+        categories = self.categories
         ingredient_row_height = 0.18
         ingredient_rows_height = ingredient_rows_count * 0.18
         storage_dates = sorted(list(set([i.storage_date for i in ingredients])))
 
-        storaged_ingredients = []
+        formed_ingredients = []
         for storage_date in storage_dates:
             dated_ingredients = [
                 i for i in ingredients if i.storage_date == storage_date
@@ -1282,7 +1257,7 @@ class CanteenWorkBook:
                 )
 
                 storage_date_index = sub_storage_num
-                storaged_ingredients.append(
+                formed_ingredients.append(
                     [storage_date, storage_date_index, split_dated_ingredients]
                 )
 
@@ -1293,7 +1268,7 @@ class CanteenWorkBook:
             storage_date,
             storage_date_index,
             dated_ingredients,
-        ) in enumerate(storaged_ingredients):
+        ) in enumerate(formed_ingredients):
             row_num = (ingredient_rows_count + 6) * index + 1
 
             title_cell_row_num = row_num
@@ -1327,13 +1302,13 @@ class CanteenWorkBook:
                 storage_num += 1
 
             prev_storage_date = (
-                storaged_ingredients[index - 1][0]
-                if 0 <= index - 1 < len(storaged_ingredients)
+                formed_ingredients[index - 1][0]
+                if 0 <= index - 1 < len(formed_ingredients)
                 else None
             )
             next_storage_date = (
-                storaged_ingredients[index + 1][0]
-                if 0 < index + 1 < (len(storaged_ingredients) - 1)
+                formed_ingredients[index + 1][0]
+                if 0 < index + 1 < (len(formed_ingredients) - 1)
                 else None
             )
             sub_title_num_cell_row_num = title_cell_row_num + 1
@@ -1563,10 +1538,7 @@ class CanteenWorkBook:
             cell.border = self.thin_border
             cell.font = self.font_12_bold
 
-        categories = Category.objects.filter(
-            Q(user=user) & Q(is_disabled=False)
-        ).all()
-
+        categories = self.categories
         set_row_height_in_inches(sheet, 1, 0.60)
         set_row_height_in_inches(sheet, 2, 0.44)
 
@@ -1578,13 +1550,10 @@ class CanteenWorkBook:
             category_cell = sheet.cell(row_num, 1)
             category_cell.value = category.name
 
-            ingredients = Ingredient.objects.filter(
-                Q(user=user)
-                & Q(category=category)
-                & Q(storage_date__gte=self.date_start)
-                & Q(storage_date__lte=self.date_end)
-                & Q(meal_type=self.meal_type)
-                & Q(is_disabled=False)
+            ingredients = self.ingredients.filter(
+                Q(category=category)
+                & Q(storage_date__gte=self.first_date_of_month)
+                & Q(storage_date__lte=self.last_date_of_month)
             ).all()
             total_price_cell = sheet.cell(row_num, 2)
             total_price_cell.value = sum([i.total_price for i in ingredients])
@@ -1602,12 +1571,9 @@ class CanteenWorkBook:
                 cell.alignment = self.center_alignment
                 cell.border = self.thin_border
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
+        ingredients = self.ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         summary_row_num = len(categories) + header_row_num + 1
@@ -1644,12 +1610,8 @@ class CanteenWorkBook:
         user = self.user
         ingredient_rows_count = 17
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=False)
+        ingredients = self.storage_ingredients.filter(
+            Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         consumptions = []
@@ -1657,7 +1619,8 @@ class CanteenWorkBook:
             consumptions += [
                 c
                 for c in ingredient.consumptions.filter(
-                    Q(date_of_using__lte=self.date_end) & Q(is_disabled=False)
+                    Q(date_of_using__lte=self.last_date_of_month)
+                    & Q(is_disabled=False)
                 ).all()
             ]
 
@@ -1673,11 +1636,9 @@ class CanteenWorkBook:
                 inventory_days.append(date_of_using)
 
         if len(inventory_days) < 1:
-            inventory_days.insert(-1, self.date_end)
+            inventory_days.insert(-1, self.last_date_of_month)
 
-        inventory_days.insert(
-            0, (self.date_start.replace(day=1) - timedelta(days=1))
-        )
+        inventory_days.insert(0, (self.first_date_of_month - timedelta(days=1)))
         formed_ingredients = []
         for inventory_day in inventory_days:
             inventory_day_ingredients = []
@@ -1716,7 +1677,7 @@ class CanteenWorkBook:
             inventory_day_ingredients += [
                 Ingredient(
                     user=user,
-                    storage_date=self.date_start,
+                    storage_date=self.first_date_of_month,
                     name="",
                     meal_type=self.meal_type,
                     category=s_ingredient0.category,
@@ -1973,13 +1934,9 @@ class CanteenWorkBook:
         user = self.user
         ingredient_rows_count = 11
 
-        ingredients = Ingredient.objects.filter(
-            Q(user=user)
-            & Q(storage_date__gte=self.date_start)
-            & Q(storage_date__lte=self.date_end)
-            & Q(meal_type=self.meal_type)
-            & Q(is_disabled=False)
-            & Q(is_ignorable=True)
+        ingredients = self.ignorable_ingredients.filter(
+            Q(storage_date__gte=self.first_date_of_month)
+            & Q(storage_date__lte=self.last_date_of_month)
         ).all()
 
         categories = list(set([i.category for i in ingredients]))
@@ -1996,7 +1953,7 @@ class CanteenWorkBook:
                     _split_ingredients += [
                         Ingredient(
                             user=user,
-                            storage_date=self.date_end,
+                            storage_date=self.last_date_of_month,
                             name="",
                             meal_type=_split_ingredient0.meal_type,
                             category=_split_ingredient0.category,
@@ -2036,7 +1993,11 @@ class CanteenWorkBook:
             sub_title_date_cell = sheet.cell(sub_title_row_num, 4)
             sub_title_date_cell.value = _(
                 "{year}.{month:0>2}.{day:0>2} (Non-storage list sheet)"
-            ).format(year=self.year, month=self.month, day=self.date_end.day)
+            ).format(
+                year=self.year,
+                month=self.month,
+                day=self.last_date_of_month.day,
+            )
 
             for cell in [sub_title_affiliation_cell, sub_title_date_cell]:
                 cell.font = self.font_14
@@ -2170,29 +2131,7 @@ class CanteenWorkBook:
         date_end = date(year, 12, 31)
         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)
-            )
-            .prefetch_related("consumptions")
-            .all()
-        )
-        ingredients = [
-            i
-            for i in ingredients
-            if date_start <= i.storage_date <= date_end
-            or any(
-                [
-                    date_start <= c.date_of_using <= date_end
-                    for c in i.consumptions.all()
-                    if c.is_disabled == False
-                ]
-            )
-        ]
-
+        ingredients = self.storage_ingredients
         ingredient_names = list(set([i.name for i in ingredients]))
         for ingredient_name_index, ingredient_name in enumerate(
             ingredient_names
@@ -2417,16 +2356,16 @@ class CanteenWorkBook:
 
                     sheet.cell(
                         month_surplus_header_row_num,
-                        4,
+                        10,
                         remaining_quantity_last_month,
                     )
                     sheet.cell(
                         month_surplus_header_row_num,
-                        6,
+                        12,
                         remaining_total_price_last_month,
                     )
                     sheet.cell(
-                        month_surplus_header_row_num, 5, unit_price.normalize()
+                        month_surplus_header_row_num, 11, unit_price.normalize()
                     )
 
                 month_ingredients = []
@@ -2680,7 +2619,7 @@ class CanteenWorkBook:
         self.fill_in_consumption_sheet()
         self.fill_in_consumption_list_sheet()
         self.fill_in_surplus_sheet()
-        if self.request.GET.get("include_food_sheets","") == "true":
+        if self.request.GET.get("include_food_sheets", "") == "true":
             self.fill_in_food_sheets()
 
         return self.wb
@@ -2689,10 +2628,59 @@ class CanteenWorkBook:
 def get_workbook_zip(request, month):
     from ..views import meal_type_name_0
 
-    meal_types = MealType.objects.annotate(
-        ingredients_count=Count("ingredients")
-    ).filter(
-        Q(user=request.user) & Q(is_disabled=False) & Q(ingredients_count__gt=0)
+    year, month = [int(v) for v in month.split("-")]
+    first_date_of_year = datetime(year, 1, 1).date()
+    last_date_of_year = datetime(year, 12, 31).date()
+
+    meal_types = (
+        MealType.objects.annotate(ingredients_count=Count("ingredients"))
+        .filter(
+            Q(user=request.user)
+            & Q(is_disabled=False)
+            & Q(ingredients_count__gt=0)
+        )
+        .all()
+    )
+
+    categories = (
+        Category.objects.annotate(ingredients_count=Count("ingredients"))
+        .filter(
+            Q(user=request.user)
+            & Q(is_disabled=False)
+            & Q(ingredients_count__gt=0)
+        )
+        .order_by("priority")
+        .all()
+    )
+
+    user_ingredients = (
+        Ingredient.objects.annotate(
+            total_consumed=Coalesce(
+                Sum("consumptions__amount_used"), 0, output_field=IntegerField()
+            )
+        )
+        .filter(
+            Q(is_disabled=False)
+            & (
+                Q(
+                    consumptions__date_of_using__range=(
+                        first_date_of_year,
+                        last_date_of_year,
+                    )
+                )
+                | Q(quantity__gt=F("total_consumed"))
+                | (
+                    Q(storage_date__gte=first_date_of_year)
+                    & Q(storage_date__lte=last_date_of_year)
+                )
+            )
+            & Q(user=request.user)
+            & Q(category__is_disabled=False)
+            & Q(meal_type__is_disabled=False)
+        )
+        .select_related("meal_type", "category")
+        .prefetch_related("consumptions")
+        .distinct()
     )
 
     zip_buffer = io.BytesIO()
@@ -2707,13 +2695,20 @@ def get_workbook_zip(request, month):
                         if not meal_type.name == meal_type_name_0
                         else ""
                     ),
-                    month=month.replace("-", ""),
+                    month=f"{year}{month:0>2}",
                     affiliation=request.user.affiliation,
                 )
                 + ".xlsx"
             )
-
-            wb = CanteenWorkBook(request, month, meal_type).fill_in()
+            __ingredients = user_ingredients.filter(meal_type=meal_type).all()
+            wb = MealTypeWorkbook(
+                request,
+                year=year,
+                month=month,
+                ingredients=__ingredients,
+                meal_type=meal_type,
+                categories=categories,
+            ).fill_in()
             excel_buffer = io.BytesIO()
             wb.save(excel_buffer)
             excel_buffer.seek(0)
@@ -2722,3 +2717,6 @@ def get_workbook_zip(request, month):
 
     zip_buffer.seek(0)
     return zip_buffer
+
+
+# The end.

fnschoo1/fnschool/_settings.py

@@ -0,0 +1,3 @@
+
+
+

fnschoo1/fnschool/settings.py

@@ -126,7 +126,8 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
-TIME_ZONE = "UTC"
+USE_TZ = True
+TIME_ZONE = "Asia/Shanghai"
 
 USE_I18N = True
 USE_L10N = True
@@ -164,4 +165,14 @@ MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 
 LOGIN_URL = reverse_lazy("profiles:log_in")
+
+_settings_path = Path(__file__).parent / "_settings.py"
+if _settings_path.exists():
+    print(
+        ('Custom configuration "{_settings_path}" has been used.').format(
+            _settings_path=_settings_path.as_posix()
+        )
+    )
+    from ._settings import *
+
 # The end.

fnschoo1/static/css/fnschool.css

@@ -1,3 +1,7 @@
+.fn-highlight > td {
+  color: #00adff;
+}
+
 main {
   padding-top: 60px;
   padding-bottom: 120px;
@@ -24,3 +28,5 @@ main {
   padding: 1rem;
   display: none;
 }
+
+/* The end. */

fnschoo1/static/js/fnschool.js

@@ -1,3 +1,25 @@
+function make_highlight(query, time_data) {
+  var highlight_elements = $(query)
+  var highlight_elements_toggled = []
+  highlight_elements.each(function (index, element) {
+    var element = $(element)
+    var time_value = element.data(time_data)
+    var seconds_diff = Math.floor((new Date() - new Date(time_value)) / 1000)
+    if (seconds_diff < 46) {
+      highlight_elements_toggled.push(element)
+      element.toggleClass('fn-highlight')
+      $('html,body').animate({ scrollTop: element.offset().top }, 1)
+    }
+  })
+
+  setTimeout(function () {
+    $(highlight_elements_toggled).each(function (index, element) {
+      element = $(element)
+      element.toggleClass('fn-highlight')
+    })
+  }, 10 * 1000)
+}
+
 function get_cookie(name) {
   const cookies = document.cookie.split(';')
   for (const cookie of cookies) {
@@ -89,3 +111,5 @@ $(document).ready(function () {
 function set_page(num) {
   update_href({ page: num })
 }
+
+// The end.

{fnschool-20251018.81021.825.dist-info → fnschool-20251020.82239.858.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
-fnschoo1/__init__.py,sha256=cU-wRDCQ1k5lKflYAtz3btmy6XuybJdT6pNLtXeZwBE,197
+fnschoo1/__init__.py,sha256=rT-4fDJu76Ag8U4PoXAAd-4nAnLc2YFqPkwnObEVhqc,197
 fnschoo1/manage.py,sha256=VZIol9q_Dhg81_KJ9Jfq-L5O8ubQelShkA-cZVJ1S6E,1539
 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=PDPAzZZ_y533KtMxCixLXXsXok5gjUShCSXeonYgGqQ,2582
-fnschoo1/canteen/models.py,sha256=wvlmLzY2X7ez2hbCDkjxYCO3O12oJKuuIZyS1rXERgQ,6034
+fnschoo1/canteen/forms.py,sha256=JaN6SX9KIrJeUKRfTMf6bA0Op3mEGCc6xqUE6yWC8TU,2596
+fnschoo1/canteen/models.py,sha256=44GtfJbp6kiQYdcBmSXqHiW6JLLcmiRydf7DC6EToWY,6331
 fnschoo1/canteen/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 fnschoo1/canteen/urls.py,sha256=4GtrqC9L59c8zopfjRgqhbcvA5iPnGcAUVuM6CrKWpk,2797
-fnschoo1/canteen/views.py,sha256=S7ByVMcbmpisH50mF38YaeEUYSIuK15z-vwqvFiKRM8,27368
+fnschoo1/canteen/views.py,sha256=9qsNiCM4sUEUpV_8g874msSamrp-dqTb5mdUtyWvZmQ,29171
 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
@@ -24,6 +24,7 @@ fnschoo1/canteen/migrations/0013_alter_consumption_options_alter_ingredient_opti
 fnschoo1/canteen/migrations/0014_category_priority.py,sha256=AywjPQhwtwm8xttEEOGQ3yyQ8j890hL5J-wCUNEwbkE,677
 fnschoo1/canteen/migrations/0015_alter_category_options_alter_category_priority.py,sha256=l8WVVTaDDbB3-xBMdU402gsQo3mhfeUUEcIp_hYVEPk,720
 fnschoo1/canteen/migrations/0016_consumption_unique_ingredient_date_of_using.py,sha256=kiNr4ISVoy99U7LuJMItJYtNyE4BPYR_jSdnKoXxWt4,520
+fnschoo1/canteen/migrations/0017_ingredient_updated_at_alter_category_created_at_and_more.py,sha256=fvbJV9uf8lUrqASwPO2EsyW3ApXkFk4zBE1vlT2UV0o,872
 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=T33zbHRYUrWlLYSLAYZ14Y03Gw2tGMoYzBWUVv-I8pk,609
@@ -31,29 +32,30 @@ fnschoo1/canteen/templates/canteen/category/delete.html,sha256=iPmGAB2r8K9DqBTp9
 fnschoo1/canteen/templates/canteen/category/list.html,sha256=QLO2GA13Co48Ijd0DCCN4lcMm1fgJqT2CprH5VdLZPw,2148
 fnschoo1/canteen/templates/canteen/category/update.html,sha256=UnCI95eqsQXfdUMdJXWUf1qNVWM9ZgsP03ayZ_Nrak8,831
 fnschoo1/canteen/templates/canteen/consumption/_create.html,sha256=tXlJcd566D9sYbsnj5KN-m0lyobT2AwwYt9oxUHbn4M,1026
-fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=Wy30E3bnOcP7D1LdqtZhp6WUCuJfuCiUmmSmlj6HhGQ,16707
+fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=LSxyYQZfQLAekD84AQaJp_JRYge8I4IBF7DkTGLIGEI,16744
 fnschoo1/canteen/templates/canteen/ingredient/close.html,sha256=pLYeJmGaOEJKMUJdZmYzz_n--l28IRDQ4fXvetP_Vsc,200
 fnschoo1/canteen/templates/canteen/ingredient/create.html,sha256=i4ajPDpXBTUp08lIiwn0wZoNEohyXlX3G64zG1lmIcs,839
 fnschoo1/canteen/templates/canteen/ingredient/create_one.html,sha256=y9EAKXmyIrlp5-DxHd86l1rMtB16KuOjPMbPiLAN_ag,615
 fnschoo1/canteen/templates/canteen/ingredient/delete.html,sha256=npUtDGV7KK2jvc2AkiNlK6F2wUsKwLB5DQuBULm1pW8,1227
-fnschoo1/canteen/templates/canteen/ingredient/list.html,sha256=GVHpYU1aghnntVRrukbIq49ArwgbRiuVQ2pMYHU7Q7c,4655
+fnschoo1/canteen/templates/canteen/ingredient/list.html,sha256=QqPvNbfQCv74jOWpgMX9I-m-Omg3HR_k51XlDFMv3YE,5900
 fnschoo1/canteen/templates/canteen/ingredient/update.html,sha256=JwW8dVQ1fzvxjA32RvRSSqrYzPPaajObvy7D45gz5pc,835
 fnschoo1/canteen/templates/canteen/meal_type/create.html,sha256=OIxOcAa3Pp3OPT-Z0PRLINfZ08CO61ulNDU-YJA6EKI,612
 fnschoo1/canteen/templates/canteen/meal_type/delete.html,sha256=i9PBX3ShXU4Az62MEawAuDWM5jwOmKByywizhdvuSTI,1567
 fnschoo1/canteen/templates/canteen/meal_type/list.html,sha256=c5kJUE1OgpRtSrMV4wFwL_gbRSaX_XMM4Zt1JTx34_g,1907
 fnschoo1/canteen/templates/canteen/meal_type/update.html,sha256=vqqyuC1m2CnPd3KrcjA8t4hbJslT001s4XvcYpkQmO0,834
 fnschoo1/canteen/workbook/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschoo1/canteen/workbook/generate.py,sha256=P2I_L494IFkWrNVXmpr9UFADdtcGdyQAEfRSwxcpftQ,109430
+fnschoo1/canteen/workbook/generate.py,sha256=wmqt5eFxmZRZdasMTsuc1AbntwOpUN4uVOtjfpM2j1k,109350
 fnschoo1/fnschool/__init__.py,sha256=TmHhzykpKNMoMf6eD-EKvbvmnlzs1XGHtvD55ae1sXs,287
+fnschoo1/fnschool/_settings.py,sha256=ajz1GSNU9xYVrFEDSz6Xwg7amWQ_yvW75tQa1ZvRIWc,3
 fnschoo1/fnschool/asgi.py,sha256=kzkqosS10uBlyBX53EXcsATcvEZmac6nsPzyOHCuucE,393
-fnschoo1/fnschool/settings.py,sha256=l9Y1iQCivSfmsNfnHltfXLzxP6gG4VMIL4GEZgAp8YM,4357
+fnschoo1/fnschool/settings.py,sha256=4etVUGXK6YNv7xmNi95N4serk9JEr93kG8LsL0O3r5Y,4651
 fnschoo1/fnschool/urls.py,sha256=8WPemtCUuStd0R9gDP70c-NRQ5k7G4ksq6dYGH6xCDM,1036
 fnschoo1/fnschool/views.py,sha256=MfujMhFkRLxT-saID1xTU16v0khzIl6ceDl7_JgrgFs,152
 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=FgrQvpbmFej9tjCMnRf6evjeAbA0ofCuUpFlCIxkccs,22621
+fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=a70R8-JrOVyLEYOxZGLsqn7Q0DzKQkwi09-5p05Dlbc,22621
 fnschoo1/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/profiles/admin.py,sha256=93UCvdODI63KzCDfFFnKmfvCMGCp6FCG9WErE91i79Y,522
 fnschoo1/profiles/apps.py,sha256=WDu6eceFnDkBFMqquAolMZMo7XPb0ah6l2q2AruTrl4,215
@@ -75,11 +77,11 @@ fnschoo1/profiles/templates/profiles/edit.html,sha256=49afyNH7OsqEKfD9TFrDKbRZ7r
 fnschoo1/profiles/templates/profiles/log_in.html,sha256=9hcuxdxAUHdFBxrJTJ_X6IVwKC_Jw6mfA5Sqx9a4bZA,736
 fnschoo1/profiles/templates/profiles/log_out.html,sha256=RRb6K-0G1Jm4RhfY9VwftJgNwgI8jsKb_N5Gvp5XtiE,320
 fnschoo1/static/css/bootstrap.min.css,sha256=eGY1FwN6FhXUvbmXraT1t_q2vcNlQa8g5xQDwg8mG6w,280591
-fnschoo1/static/css/fnschool.css,sha256=nPjOh0vWuuFnZWrXcT2E3j3adL77v_PRyeml65MvkEE,418
+fnschoo1/static/css/fnschool.css,sha256=k71DBJi4EwUQSOPyXX6G-15m8HN_z4_Ac72Du0Zf9Co,476
 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=tq9QzYsq8S3CvCqLk2U9tQuwQTcE-hYpf5YanqIHi4g,2959
+fnschoo1/static/js/fnschool.js,sha256=M2hdpT_g6f77bDLzN3zWxjPybcfrWHRSpo6deNSxkH4,3684
 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
@@ -96,14 +98,14 @@ fnschoo1/templates/includes/_navigation.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 fnschoo1/templates/includes/_paginator.html,sha256=Q-FRCODFNlETjn2yX18IfhctRWfqEgEnIc5LcdHzKSo,1262
 fnschoo1/templates/registration/logged_out.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/registration/login.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fnschool-20251018.81021.825.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251018.81021.825.dist-info/METADATA,sha256=ybABvY8yWMb1doynfn_prJV9EHRUCi0VeG1wBqhniYg,4752
-fnschool-20251018.81021.825.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
-fnschool-20251018.81021.825.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251018.81021.825.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool-20251018.81021.825.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
-fnschool-20251018.81021.825.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
-fnschool-20251018.81021.825.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
-fnschool-20251018.81021.825.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251018.81021.825.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
-fnschool-20251018.81021.825.dist-info/RECORD,,
+fnschool-20251020.82239.858.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251020.82239.858.dist-info/METADATA,sha256=_e8pXoy9CHrKNnLPpki1a7kt3BWuBlOO5ZSwhX7HVZo,4752
+fnschool-20251020.82239.858.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
+fnschool-20251020.82239.858.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251020.82239.858.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschool-20251020.82239.858.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
+fnschool-20251020.82239.858.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
+fnschool-20251020.82239.858.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
+fnschool-20251020.82239.858.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251020.82239.858.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
+fnschool-20251020.82239.858.dist-info/RECORD,,