fnschool 20251016.81138.855__tar.gz → 20251111.81414.856__tar.gz

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/PKG-INFO

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

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251016.81138.855"
+__version__ = "20251111.81414.856"

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/forms.py

@@ -1,6 +1,7 @@
 from datetime import date, datetime
 
 from django import forms
+
 from fnschool import _
 
 from .models import Category, Consumption, Ingredient, MealType
@@ -20,7 +21,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", "created_at"]
         ]
 
         current_year = date.today().year
@@ -55,7 +56,7 @@ class ConsumptionForm(forms.ModelForm):
         widgets = {
             "amount_used": forms.NumberInput(
                 attrs={
-                    "style": "width: 109px; text-align: center; font-family: Mono;"
+                    "style": "width: 95px; text-align: center; font-family: Mono;"
                 }
             ),
             "date_of_using": forms.HiddenInput(),

fnschool-20251111.81414.856/src/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="创建日期"),
+        ),
+    ]

fnschool-20251111.81414.856/src/fnschoo1/canteen/migrations/0018_alter_ingredient_updated_at.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.25 on 2025-10-20 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "canteen",
+            "0017_ingredient_updated_at_alter_category_created_at_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ingredient",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+    ]

fnschool-20251111.81414.856/src/fnschoo1/canteen/migrations/0019_category_updated_at_ingredient_created_at_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.2.25 on 2025-10-24 01:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0018_alter_ingredient_updated_at"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="category",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+        migrations.AddField(
+            model_name="ingredient",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="Time of creating"
+            ),
+        ),
+        migrations.AddField(
+            model_name="mealtype",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建日期"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建日期"
+            ),
+        ),
+    ]

fnschool-20251111.81414.856/src/fnschoo1/canteen/migrations/0020_alter_ingredient_created_at.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.25 on 2025-10-24 15:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0019_category_updated_at_ingredient_created_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ingredient",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建时间"
+            ),
+        ),
+    ]

fnschool-20251111.81414.856/src/fnschoo1/canteen/migrations/0021_alter_category_updated_at_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.2.26 on 2025-11-10 02:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0020_alter_ingredient_created_at"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="category",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="Time of updating"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="Time of creating"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="Time of updating"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="Time of updating"
+            ),
+        ),
+    ]

fnschool-20251111.81414.856/src/fnschoo1/canteen/migrations/0022_alter_category_updated_at_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.2.26 on 2025-11-11 06:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0021_alter_category_updated_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="category",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建时间"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ingredient",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+    ]

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/models.py

@@ -7,6 +7,7 @@ from django.core.validators import MinValueValidator
 # Create your models here.
 from django.db import models
 from django.db.models import Q
+
 from fnschool import _
 
 
@@ -21,7 +22,16 @@ 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,
+        blank=True,
+        auto_now_add=True,
+        verbose_name=_("Creating Date"),
+    )
+    updated_at = models.DateTimeField(
+        null=True, blank=True, auto_now=True, verbose_name=_("Time of updating")
+    )
+
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
@@ -41,7 +51,13 @@ 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, auto_now_add=True, verbose_name=_("Creating Date")
+    )
+    updated_at = models.DateTimeField(
+        null=True, blank=True, auto_now=True, verbose_name=_("Time of updating")
+    )
+
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
@@ -74,6 +90,18 @@ class Ingredient(models.Model):
         verbose_name=_("User"),
     )
     storage_date = models.DateField(verbose_name=_("Storage Date"))
+
+    created_at = models.DateTimeField(
+        null=True,
+        blank=True,
+        auto_now_add=True,
+        verbose_name=_("Time of creating"),
+    )
+
+    updated_at = models.DateTimeField(
+        null=True, blank=True, auto_now=True, verbose_name=_("Time of updating")
+    )
+
     name = models.CharField(max_length=100, verbose_name=_("Ingredient Name"))
     meal_type = models.ForeignKey(
         MealType,
@@ -113,6 +141,10 @@ class Ingredient(models.Model):
         default=False, verbose_name=_("Is Ingredient Disabled")
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.quantity_used = Decimal("0")
+
     @property
     def unit_price(self):
         if self.quantity > 0:
@@ -135,6 +167,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
@@ -148,6 +183,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
@@ -186,6 +223,7 @@ class Consumption(models.Model):
     )
 
     class Meta:
+
         verbose_name = _("Consumption Record")
         verbose_name_plural = _("Consumption Records")
         ordering = ["-date_of_using"]

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/category/create.html

@@ -11,7 +11,9 @@
     {{ form|crispy }}
     <div class="py-3 fixed-bottom text-end bg-dark">
       <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
-      <button type="button" class="btn btn-danger" onclick="window.close();">{% trans "Cancel" %}</button>
+      <button type="button" class="btn btn-danger" onclick="window.close();">
+        {% trans "Cancel" %}
+      </button>
     </div>
   </form>
 {% endblock %}

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/category/delete.html

@@ -55,7 +55,9 @@
           style="display: inline">
       {% csrf_token %}
       <button type="submit" class="btn btn-danger">{% trans 'Delete' %}</button>
-      <button type="button" class="btn btn-primary" onclick="window.close();">{% trans "Cancel" %}</button>
+      <button type="button" class="btn btn-primary" onclick="window.close();">
+        {% trans "Cancel" %}
+      </button>
     </form>
   </div>
   <script>

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/category/list.html

@@ -1,4 +1,4 @@
-{% extends "base/header_content_footer.html" %}
+{% extends "base/document.html" %}
 {% load crispy_forms_tags %}
 {% block title %}
   {% trans "Category list" %}

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/category/update.html

@@ -17,7 +17,9 @@
     {% csrf_token %} {{ form|crispy }}
     <div class="py-3 fixed-bottom text-end bg-dark">
       <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
-      <button type="button" class="btn btn-danger" onclick="window.close();">{% trans "Cancel" %}</button>
+      <button type="button" class="btn btn-danger" onclick="window.close();">
+        {% trans "Cancel" %}
+      </button>
     </div>
   </form>
 {% endblock %}

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -1,4 +1,4 @@
-{% extends "base/header_content_footer.html" %}
+{% extends "base/document.html" %}
 {% load crispy_forms_tags %}
 {% block title %}
   {% trans "Consume Ingredients" %}
@@ -9,15 +9,24 @@
   <div class="container">
     <div class="row justify-content-end">
       <button class="btn btn-outline-success col-md-1 col-lg-1 col-2 mx-2"
-              onclick="list_consumptions_by_week();">{% trans "Consume by Week" %}</button>
+              onclick="list_consumptions_by_week();">
+        {% trans "Consume by Week" %}
+      </button>
 
       <button class="btn btn-outline-success col-md-1 col-lg-1 col-2"
-              onclick="list_consumptions_rapidly();">{% trans "Rapid Consumption" %}</button>
+              onclick="list_consumptions_rapidly();">
+        {% trans "Rapid Consumption" %}
+      </button>
 
       <a class="btn btn-success col-md-1 col-lg-1 col-2 mx-2"
          target="canteen_list_categories"
          href="{% url "canteen:list_categories" %}">{% trans "Ingredient Categories" %}</a>
 
+      <a class="btn btn-primary col-md-1 col-lg-1 col-2 "
+         target="canteen_list_meal_types"
+         href="{% url "canteen:list_meal_types" %}">{% trans "Ingredient Meal Types" %}</a>
+
+
       <div class="col col-3 col-md-2 col-lg-2">
         <input class="  form-control"
                onkeydown="if(event.keyCode==13){list_consumptions();}"
@@ -38,7 +47,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>
@@ -49,10 +58,10 @@
         {% for date_h in date_range %}
           <th data-date_of_using="{{ date_h }}" class="consumption-date">
             {{ date_h }}
-            <br />
-            |
-            <br />
-            |
+            {% for meal_type in meal_types %}
+              <br />
+              |
+            {% endfor %}
           </th>
         {% empty %}
           <th></th>
@@ -65,6 +74,9 @@
             data-ingredient_id="{{ ingredient.id }}"
             data-ingredient_name="{{ ingredient.name }}"
             data-ingredient_quantity="{{ ingredient.quantity }}"
+            data-ingredient_quantity_used="{{ ingredient.quantity_used }}"
+            data-ingredient_remaining_quantity="{{ ingredient.remaining_quantity }}"
+            data-ingredient_consuming_quantity="{{ ingredient.consuming_quantity }}"
             data-ingredient_total_price="{{ ingredient.total_price }}"
             data-ingredient_meal_type="{{ ingredient.meal_type }}"
             data-ingredient_quantity_unit_name="{{ ingredient.quantity_unit_name }}"
@@ -73,16 +85,15 @@
           <td title="{% blocktrans with storage_date=ingredient.storage_date %}Storaged on {{ storage_date }} .{% endblocktrans %}"
               class="">
             <div class='ingredient-progress'
-                 style="width:{% widthratio ingredient.remaining_quantity ingredient.quantity 100 %}%"></div>
+                 style="width:{% widthratio ingredient.remaining_quantity ingredient.quantity 100 %}%">
+            </div>
             {{ ingredient.name }}
-            {% if ingredient.meal_type %}
+            {% if ingredient.meal_type != meal_type_name_0 %}
               <br />
               ({{ ingredient.meal_type }})
             {% endif %}
           </td>
-          <td name="remaining_{{ ingredient.id }}">
-            {{ ingredient.quantity }}-{{ ingredient.consuming_quantity }}={{ ingredient.remaining_quantity }}
-          </td>
+          <td name="remaining_{{ ingredient.id }}"></td>
         </tr>
       {% empty %}
         <tr>{% trans "No ingredient found." %}</tr>
@@ -91,10 +102,22 @@
   </table>
 </div>
 <div class="">
-  <button onclick="generate_spreadsheet();"
-          class="btn btn-submit-consumptions btn-success float-end">{% trans "Generate Spreadsheet" %}</button>
+  <button id="generate_spreadsheet_btn"
+          onclick="generate_spreadsheet();"
+          class="btn btn-submit-consumptions btn-success float-end">
+    {% trans "Generate Spreadsheet" %}
+  </button>
   <select class="workbook-month-select form-select float-end mx-2"
           style="width:118px"></select>
+  <div class="form-check float-end mx-1 pt-2">
+    <label class="form-check-label" for="include_food_sheets">
+      {% trans 'Ingredient Sheets are also included.' %}
+    </label>
+    <input class="form-check-input"
+           type="checkbox"
+           value=""
+           id="include_food_sheets">
+  </div>
 </div>
 {{ ingredient_ids|json_script:'ingredient_ids' }}
 {{ months|json_script:'months' }}
@@ -107,11 +130,24 @@
   var months = JSON.parse($("#months").text())
   var meal_types = JSON.parse($("#meal_types").text())
   var date_range = JSON.parse($("#date_range").text())
-
   var storage_date_start = $('#storage_date_start').text().replace(new RegExp('"', 'g'), "")
 
   var dont_submit = false
 
+  $(document).ready(function() {
+    $(ingredient_ids).each(function(index, ingredient_id) {
+      var td = $(`td[name='remaining_${ingredient_id}']`)
+      var tr = $(td.closest("tr"))
+      var ingredient_quantity = parseInt(tr.data("ingredient_quantity")) || 0
+      var ingredient_quantity_used = parseInt(tr.data("ingredient_quantity_used")) || 0
+      var ingredient_consuming_quantity = parseInt(tr.data("ingredient_consuming_quantity")) || 0
+      var ingredient_remaining_quantity = parseInt(tr.data("ingredient_remaining_quantity")) || 0
+      td.text(
+        `${ingredient_quantity-ingredient_quantity_used}-${ingredient_consuming_quantity-ingredient_quantity_used}=${ingredient_remaining_quantity}`
+      )
+    });
+
+  });
 
   function list_consumptions_rapidly() {
     query = {
@@ -216,8 +252,10 @@
 
   function amount_used_input_blur(element) {
     element = $(element)
-    var ingredient_quantity = element.closest('tr').data("ingredient_quantity")
-    ingredient_quantity = parseInt(ingredient_quantity) || 0
+    var ingredient_quantity = parseInt(element.closest('tr').data("ingredient_quantity")) || 0
+    var ingredient_quantity_used = parseInt(element.closest("tr").data("ingredient_quantity_used")) || 0
+    ingredient_quantity = ingredient_quantity - ingredient_quantity_used
+
     var $consumption_form = element.closest("form")
     var amount_used = parseInt($consumption_form.data("amount_used")) || 0
     var new_amount_used = parseInt($.trim(element.val())) || 0
@@ -363,16 +401,21 @@
   });
 
   function generate_spreadsheet() {
+    var include_food_sheets = $("#include_food_sheets").is(':checked')
     var month = $(".workbook-month-select").val()
-    window.open(`/canteen/generate_spreadsheet/${month}`, 'generate_spreadsheet');
+    if (include_food_sheets) {
+      window.open(`/canteen/generate_spreadsheet/${month}?include_food_sheets=true`, 'generate_spreadsheet');
+    } else {
+      window.open(`/canteen/generate_spreadsheet/${month}`, 'generate_spreadsheet');
+    }
   }
 
   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() {

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/ingredient/create.html

@@ -12,8 +12,12 @@
   <form method="post" enctype="multipart/form-data">
     {% csrf_token %} {{ form|crispy }}
     <div class="py-3 fixed-bottom text-end bg-dark">
-      <button type="submit button" class="btn btn-outline-primary">{% trans "Upload" %}</button>
-      <button type="button" class="btn btn-danger" onclick="window.close();">{% trans "Cancel" %}</button>
+      <button type="submit button" class="btn btn-outline-primary">
+        {% trans "Upload" %}
+      </button>
+      <button type="button" class="btn btn-danger" onclick="window.close();">
+        {% trans "Cancel" %}
+      </button>
     </div>
   </form>
 {% endblock %}

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/ingredient/create_one.html

@@ -11,7 +11,9 @@
     {{ form|crispy }}
     <div class="py-3 fixed-bottom text-end bg-dark">
       <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
-      <button type="button" class="btn btn-danger" onclick="window.close();">{% trans "Cancel" %}</button>
+      <button type="button" class="btn btn-danger" onclick="window.close();">
+        {% trans "Cancel" %}
+      </button>
     </div>
   </form>
 {% endblock %}

{fnschool-20251016.81138.855 → fnschool-20251111.81414.856}/src/fnschoo1/canteen/templates/canteen/ingredient/delete.html

@@ -32,7 +32,9 @@
           style="display: inline">
       {% csrf_token %}
       <button type="submit" class="btn btn-danger">{% trans 'Delete' %}</button>
-      <button type="button" class="btn btn-primary" onclick="window.close();">{% trans "Cancel" %}</button>
+      <button type="button" class="btn btn-primary" onclick="window.close();">
+        {% trans "Cancel" %}
+      </button>
     </form>
   </div>
   <script>