fnschool 20251015.80844.859__tar.gz → 20251016.81138.855__tar.gz

{fnschool-20251015.80844.859/src/fnschool.egg-info → fnschool-20251016.81138.855}/PKG-INFO

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

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

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

@@ -56,7 +56,16 @@
     <tbody>
       {% for ingredient in page_obj %}
         <tr>
-          <th scope="row">{{ forloop.counter }}</th>
+          <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>

{fnschool-20251015.80844.859 → fnschool-20251016.81138.855}/src/fnschoo1/canteen/views.py

@@ -246,7 +246,7 @@ def create_consumptions(request, ingredient_id=None):
         & Q(is_ignorable=False)
     )
     ingredients = Ingredient.objects
-    print("by_week", by_week, "rapidly", rapidly)
+
     ingredients = (
         ingredients.filter(queries).order_by(
             "name", "storage_date", "meal_type__name", "category__name"

{fnschool-20251015.80844.859 → fnschool-20251016.81138.855}/src/fnschoo1/canteen/workbook/generate.py

@@ -907,7 +907,9 @@ class CanteenWorkBook:
 
             title_cell_row_num = row_num
             title_cell = sheet.cell(title_cell_row_num, 1)
-            title_cell.value = _("Storage List (Storage Sheet)")
+            title_cell.value = _(
+                "Consumption List Title (Consumption List Sheet)"
+            )
             title_cell.alignment = self.center_alignment
             title_cell.font = self.font_20_bold
             sheet.merge_cells(f"A{title_cell_row_num}:H{title_cell_row_num}")
@@ -1177,7 +1179,7 @@ class CanteenWorkBook:
         ).all()
         ingredient_row_height = 0.18
         ingredient_rows_height = ingredient_rows_count * 0.18
-        storage_dates = list(set([i.storage_date for i in ingredients]))
+        storage_dates = sorted(list(set([i.storage_date for i in ingredients])))
 
         storaged_ingredients = []
         for storage_date in storage_dates:
@@ -1952,7 +1954,7 @@ class CanteenWorkBook:
                     _split_ingredients += [
                         Ingredient(
                             user=user,
-                            storage_date=None,
+                            storage_date=self.date_end,
                             name="",
                             meal_type=_split_ingredient0.meal_type,
                             category=_split_ingredient0.category,
@@ -1965,6 +1967,10 @@ class CanteenWorkBook:
                             ingredient_rows_count - len(_split_ingredients)
                         )
                     ]
+
+                _split_ingredients = sorted(
+                    _split_ingredients, key=lambda i: (i.storage_date)
+                )
                 category_ingredients.append([category, _split_ingredients])
 
         for index, (category, c_ingredients) in enumerate(category_ingredients):
@@ -2032,7 +2038,7 @@ class CanteenWorkBook:
                         month=ingredient.storage_date.month,
                         day=ingredient.storage_date.day,
                     )
-                    if ingredient.storage_date
+                    if ingredient.storage_date and ingredient.name
                     else ""
                 )
                 name_cell = sheet.cell(ingredient_row_num, 2)

fnschool-20251016.81138.855/src/fnschoo1/templates/home.html

@@ -0,0 +1,10 @@
+{% extends "base/header_content_footer.html" %}
+{% load static %}
+{% block title %}
+  {% trans "FNSCHOOL" %}
+{% endblock %}
+{% block content %}
+</div>
+<script></script>
+</style>
+{% endblock %}

{fnschool-20251015.80844.859 → fnschool-20251016.81138.855/src/fnschool.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251015.80844.859
+Version: 20251016.81138.855
 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-20251015.80844.859/src/fnschoo1/templates/home.html

@@ -1,51 +0,0 @@
-{% extends "base/header_content_footer.html" %}
-{% load static %}
-{% block title %}
-  {% trans "FNSCHOOL" %}
-{% endblock %}
-{% block content %}
-  <script>
-    // $('body').addClass( 'aurora');
-  </script>
-  <style>
-    .aurora {
-      width: 100%;
-      height: 100vh;
-      position: relative;
-      overflow: hidden;
-    }
-
-    .aurora::before {
-      content: "";
-      position: absolute;
-      top: -50%;
-      left: -50%;
-      width: 200%;
-      height: 200%;
-      background: linear-gradient(to right, #00ff00, #0000ff, #ff0000, #ff00ff, #00ff00);
-      animation: aurora-animation 50s linear infinite;
-    }
-
-    .aurora::after {
-      content: "";
-      position: absolute;
-      top: -50%;
-      left: -50%;
-      width: 200%;
-      height: 200%;
-      background: linear-gradient(to right, #00ff00, #0000ff, #ff0000, #ff00ff, #00ff00);
-      opacity: 0.1;
-      animation: aurora-animation 30s linear infinite;
-    }
-
-    @keyframes aurora-animation {
-      0% {
-        transform: rotate(0deg);
-      }
-
-      100% {
-        transform: rotate(360deg);
-      }
-    }
-  </style>
-{% endblock %}