fnschool 20251018.81021.825__tar.gz → 20251020.82239.858__tar.gz

{fnschool-20251018.81021.825 → fnschool-20251020.82239.858}/PKG-INFO

@@ -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 → fnschool-20251020.82239.858}/src/fnschoo1/__init__.py

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

{fnschool-20251018.81021.825 → fnschool-20251020.82239.858}/src/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

fnschool-20251020.82239.858/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-20251018.81021.825 → fnschool-20251020.82239.858}/src/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

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

fnschool-20251020.82239.858/src/fnschoo1/canteen/templates/canteen/ingredient/list.html

@@ -0,0 +1,171 @@
+{% extends "base/header_content_footer.html" %}
+{% load tz %}
+{% load crispy_forms_tags %}
+{% block title %}
+  {% trans "Ingredient List" %}
+{% endblock %}
+{% block content %}
+  <h1>{% trans "Ingredient List" %}</h1>
+  <form method="get"
+        action="{% url 'canteen:list_ingredients' %}"
+        class="d-flex justify-content-between align-items-center">
+    <input type="text"
+           name="q"
+           onkeydown="if(event.keyCode==13){submit_q();return false;}"
+           value="{{ search_query }}"
+           placeholder="{% trans 'Search ingredient ...' %}"
+           class="form-control" />
+    <button type="button"
+            onclick="submit_q();"
+            class="btn btn-primary text-nowrap">{% trans "Search" %}</button>
+    {% if search_query %}
+      <a onclick="clear_q();" class="text-nowrap">{% trans "Clear" %}</a>
+    {% endif %}
+  </form>
+  <div class="d-flex justify-content-end pt-2">
+    <a class="btn btn-primary mx-1"
+       href="{% url "canteen:list_meal_types" %}">{% trans "Ingredient Meal Types" %}</a>
+    <a class="btn btn-primary mx-1"
+       href="{% url "canteen:list_categories" %}">{% trans "Ingredient Categories" %}</a>
+    <a class="btn btn-warning mx-1"
+       href="{% url "canteen:create_consumptions" %}">{% trans "Consume" %}</a>
+    <a class="btn btn-primary mx-1"
+       onclick="open_small_window('{% url 'canteen:create_ingredients' %}')">{% trans "Add via template" %}</a>
+    <a class="btn btn-primary"
+       onclick="open_small_window('{% url 'canteen:create_ingredient' %}')">{% trans "Add one" %}</a>
+  </div>
+  <hr />
+  <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": ""
+      })
+    }
+
+    function submit_q() {
+      const q_value = document.querySelector('input[name="q"]').value;
+      update_href({
+        q: q_value
+      });
+    }
+
+    function sort_ingredients(value) {
+      value = value.trim().split(/\s+/);
+      name = value[0];
+      value = value[1] || "";
+      const url = new URL(window.location.href);
+      const params = new URLSearchParams(url.search);
+      if (value == "-") {
+        value = "";
+      } else if (value == "") {
+        value = "+";
+      } else {
+        value = "-";
+      }
+      i_sort = {};
+      i_sort[name] = value;
+      update_href(i_sort);
+    }
+  </script>
+  <style>
+    .table-container {
+      overflow: auto;
+    }
+
+    .table-container thead th {
+      position: sticky;
+      top: 0;
+    }
+  </style>
+
+{% endblock %}

{fnschool-20251018.81021.825 → fnschool-20251020.82239.858}/src/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)