fnschool 20251016.81138.855__tar.gz → 20251018.80328.837__tar.gz

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

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

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

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

@@ -113,6 +113,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:
@@ -186,6 +190,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-20251018.80328.837}/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-20251018.80328.837}/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-20251018.80328.837}/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-20251018.80328.837}/src/fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -9,10 +9,14 @@
   <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"
@@ -49,10 +53,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 +69,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 +80,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>
@@ -92,7 +98,9 @@
 </div>
 <div class="">
   <button onclick="generate_spreadsheet();"
-          class="btn btn-submit-consumptions btn-success float-end">{% trans "Generate Spreadsheet" %}</button>
+          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>
@@ -112,6 +120,20 @@
 
   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 +238,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

{fnschool-20251016.81138.855 → fnschool-20251018.80328.837}/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-20251018.80328.837}/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-20251018.80328.837}/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>

{fnschool-20251016.81138.855 → fnschool-20251018.80328.837}/src/fnschoo1/canteen/templates/canteen/ingredient/list.html

@@ -63,7 +63,9 @@
                      class="form-check-input"
                      id="ingredient_free_nark_{{ ingredient.id }}" />
               <label class="form-check-label"
-                     for="ingredient_free_nark_{{ ingredient.id }}">{{ forloop.counter }}</label>
+                     for="ingredient_free_nark_{{ ingredient.id }}">
+                {{ forloop.counter }}
+              </label>
             </div>
           </th>
           <td>{{ ingredient.storage_date }}</td>

{fnschool-20251016.81138.855 → fnschool-20251018.80328.837}/src/fnschoo1/canteen/templates/canteen/ingredient/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-20251018.80328.837}/src/fnschoo1/canteen/templates/canteen/meal_type/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-20251018.80328.837}/src/fnschoo1/canteen/templates/canteen/meal_type/delete.html

@@ -47,7 +47,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-20251018.80328.837}/src/fnschoo1/canteen/templates/canteen/meal_type/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-20251018.80328.837}/src/fnschoo1/canteen/views.py

@@ -57,6 +57,9 @@ from .forms import (
 from .models import Category, Consumption, Ingredient, MealType
 
 # Create your views here.
+
+meal_type_name_0 = _("Meal type 0")
+
 decimal_prec = getattr(settings, "DECIMAL_PREC", 2)
 
 storage_date_header = (
@@ -197,6 +200,15 @@ def create_consumptions(request, ingredient_id=None):
         consumptions = ingredient.consumptions.filter(
             Q(is_disabled=False)
         ).all()
+
+        consumptions_len = len(consumptions)
+        for c_index in range(consumptions_len):
+            consumption = consumptions[c_index]
+            for c0_index in range(c_index + 1, consumptions_len):
+                consumption0 = consumptions[c0_index]
+                if consumption.date_of_using == consumption0.date_of_using:
+                    consumption.delete()
+
         consumption_dates = list(set([c.date_of_using for c in consumptions]))
 
         for per_day in date_range:
@@ -206,9 +218,6 @@ def create_consumptions(request, ingredient_id=None):
                     c for c in consumptions if c.date_of_using == per_day
                 ]
                 consumption = consumptions_per_day[0]
-                if len(consumptions_per_day) > 1:
-                    for c in consumptions_per_day[1:]:
-                        c.delete()
 
             else:
                 consumption = Consumption()
@@ -239,8 +248,7 @@ def create_consumptions(request, ingredient_id=None):
     ) == "true" or not by_week
 
     queries = (
-        Q(storage_date__gte=date_start)
-        & Q(storage_date__lte=date_end)
+        Q(storage_date__lte=date_end)
         & Q(user=request.user)
         & Q(is_disabled=False)
         & Q(is_ignorable=False)
@@ -266,6 +274,13 @@ def create_consumptions(request, ingredient_id=None):
             {"ingredients": ingredients, "date_range": date_range},
         )
 
+    ingredients = [
+        i
+        for i in ingredients
+        if i.get_remaining_quantity(date_end) > 0
+        or i.storage_date >= date_start
+    ]
+
     ingredients_pinned = []
     ingredients_unpinned = []
     categories_top = Category.objects.filter(
@@ -282,6 +297,9 @@ def create_consumptions(request, ingredient_id=None):
 
     ingredients = ingredients_pinned + ingredients_unpinned
 
+    for ingredient in ingredients:
+        ingredient.quantity_used = ingredient.get_consuming_quantity(date_start)
+
     date_range_cp = date_range
     date_range_cp = [d.strftime("%Y-%m-%d") for d in date_range]
     meal_types = list(set([i.meal_type.name for i in ingredients]))
@@ -298,6 +316,7 @@ def create_consumptions(request, ingredient_id=None):
             "ingredient_ids": ingredient_ids,
             "months": months,
             "storage_date_start": date_start,
+            "meal_type_name_0": meal_type_name_0,
         },
     )
 
@@ -508,6 +527,11 @@ def create_ingredients(request):
             for index, row in df.iterrows():
                 category_name = row[category_header[0]]
                 meal_type_name = row[meal_type_header[0]]
+                meal_type_name = (
+                    meal_type_name_0
+                    if meal_type_name is np.nan
+                    else meal_type_name
+                )
 
                 category = Category.objects.filter(
                     Q(name=category_name) & Q(user=request.user)