fnschool 20251015.80844.859__py3-none-any.whl → 20251016.81138.855__py3-none-any.whl

fnschoo1/__init__.py

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

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>

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"

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)

fnschoo1/templates/home.html

@@ -4,48 +4,7 @@
   {% 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>
+</div>
+<script></script>
+</style>
 {% endblock %}

{fnschool-20251015.80844.859.dist-info → fnschool-20251016.81138.855.dist-info}/METADATA

@@ -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.dist-info → fnschool-20251016.81138.855.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fnschoo1/__init__.py,sha256=HBLOmzqg5FFfmx379TSB_PObJsSxnw7HwrGFgbv--rk,197
+fnschoo1/__init__.py,sha256=FWI2MnMOAtU8xB9gFsN1qfkRHMWY_ZRoyvYuzl53BXc,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
@@ -7,7 +7,7 @@ fnschoo1/canteen/forms.py,sha256=PDPAzZZ_y533KtMxCixLXXsXok5gjUShCSXeonYgGqQ,258
 fnschoo1/canteen/models.py,sha256=l0E-kBNZxZnFnVVUbvfGYl39Le-poE218XyV4zFNWfU,5907
 fnschoo1/canteen/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 fnschoo1/canteen/urls.py,sha256=4GtrqC9L59c8zopfjRgqhbcvA5iPnGcAUVuM6CrKWpk,2797
-fnschoo1/canteen/views.py,sha256=8ZbAEjiZ5vkO9NOWy1rUaGTQFlYBQKWaP446nLHLhRY,26680
+fnschoo1/canteen/views.py,sha256=D80gYpQieIc45f0zeb3J803TrUftVdeDy-8MsP_Ff68,26631
 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
@@ -36,14 +36,14 @@ fnschoo1/canteen/templates/canteen/ingredient/close.html,sha256=pLYeJmGaOEJKMUJd
 fnschoo1/canteen/templates/canteen/ingredient/create.html,sha256=xZvh0tP_cv2HPQ96JSHChO6Ni23tzHc5YJCUhE2yEqM,807
 fnschoo1/canteen/templates/canteen/ingredient/create_one.html,sha256=O8EPSvAnEZ-4VJiwFdoyxJrMOoMpRkH6CyfvWwHaVgc,599
 fnschoo1/canteen/templates/canteen/ingredient/delete.html,sha256=w1GK8vLTTBz4xolFce6ITZMNeBgv-XgMx9dkOykE8-A,1211
-fnschoo1/canteen/templates/canteen/ingredient/list.html,sha256=b3FC5bcprUau-TtRPdBlOdtbqlcIdDSdelzXvfm57OI,4205
+fnschoo1/canteen/templates/canteen/ingredient/list.html,sha256=7w9Yyz_TuCxJHaFadTUedh_tQLvKTCYAh583vfEBT18,4623
 fnschoo1/canteen/templates/canteen/ingredient/update.html,sha256=VTlNSvTb-kck0S3bGtvxdJbYAtfszjtUEXP7OYva1FA,819
 fnschoo1/canteen/templates/canteen/meal_type/create.html,sha256=7Pe0RSGtd2G2IMHwnggr0Gzs23oBqpaPqWH5zlNzc_4,596
 fnschoo1/canteen/templates/canteen/meal_type/delete.html,sha256=1UmCyXD-6lbYl-IE63EnQCEXJr82rUCDvycI4bGuMoo,1551
 fnschoo1/canteen/templates/canteen/meal_type/list.html,sha256=c5kJUE1OgpRtSrMV4wFwL_gbRSaX_XMM4Zt1JTx34_g,1907
 fnschoo1/canteen/templates/canteen/meal_type/update.html,sha256=Rfv1TamSFIKHzvUNlgnmrPmfmzrehPpuo5Hv8VF0yek,818
 fnschoo1/canteen/workbook/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschoo1/canteen/workbook/generate.py,sha256=ZOJzlVJPPdG5MtvTELt1QoL5KKkzUqQRqAyEWLP9mw8,84998
+fnschoo1/canteen/workbook/generate.py,sha256=zXUhk2UPbndo_2YZG4N0KT2LFZpikYs4PYtJjAN6ftA,85219
 fnschoo1/fnschool/__init__.py,sha256=TmHhzykpKNMoMf6eD-EKvbvmnlzs1XGHtvD55ae1sXs,287
 fnschoo1/fnschool/asgi.py,sha256=kzkqosS10uBlyBX53EXcsATcvEZmac6nsPzyOHCuucE,393
 fnschoo1/fnschool/settings.py,sha256=l9Y1iQCivSfmsNfnHltfXLzxP6gG4VMIL4GEZgAp8YM,4357
@@ -53,7 +53,7 @@ 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=3Ipol-cSR0HI3vvp7gbK1jxLGR7ZzeKncXX__rzyJCw,20121
+fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=Na8PMortGCPTRVhmJ8EBYdre6894lyuVAtmDXhF5VvY,20423
 fnschoo1/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/profiles/admin.py,sha256=93UCvdODI63KzCDfFFnKmfvCMGCp6FCG9WErE91i79Y,522
 fnschoo1/profiles/apps.py,sha256=WDu6eceFnDkBFMqquAolMZMo7XPb0ah6l2q2AruTrl4,215
@@ -84,7 +84,7 @@ fnschoo1/static/js/jquery.min.js,sha256=np_WnfpAmUmEO_iheFAJKf6mbm0_laW3Ns4x7kjS
 fnschoo1/static/js/jquery.slim.min.js,sha256=p5YkbOjgHxX3hTadKlGuDW58NvJ1ldjjokDuDQ_5yXs,129962
 fnschoo1/static/js/popper.min.js,sha256=O2xdmtEow7gq3I7-0lKjshvxHkBe0hTWrMkbX2fy0XQ,36887
 fnschoo1/templates/close.html,sha256=pLYeJmGaOEJKMUJdZmYzz_n--l28IRDQ4fXvetP_Vsc,200
-fnschoo1/templates/home.html,sha256=4iq52z9BuEHyFk4jKcJSZEQBB6VqJ4dvr47L6C57tss,1106
+fnschoo1/templates/home.html,sha256=34Sc9pdUN679YQE15Yp8jXtaPAcG5lyuGfX-GYJZOUc,193
 fnschoo1/templates/base/_content.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/base/_css.html,sha256=I7We2o3BzNq4PBN72UOKAtXHkZ1Xb-eYP8N4bF3rm1w,16
 fnschoo1/templates/base/_js.html,sha256=E2mgj6LQjd37r660iG2cAIOfofwuwMC6SZ59fj6wUnA,443
@@ -96,14 +96,14 @@ fnschoo1/templates/includes/_navigation.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 fnschoo1/templates/includes/_paginator.html,sha256=Z-Hxcdmun4SJ1YcHnWTDLfW8wrngROiBTwr4NZWaPP4,1246
 fnschoo1/templates/registration/logged_out.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/registration/login.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fnschool-20251015.80844.859.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251015.80844.859.dist-info/METADATA,sha256=_S8w7K-l7LZ0JYPc7Z3u1h824dxK2NnBLVvm9OpJy-U,4752
-fnschool-20251015.80844.859.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
-fnschool-20251015.80844.859.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251015.80844.859.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool-20251015.80844.859.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
-fnschool-20251015.80844.859.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
-fnschool-20251015.80844.859.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
-fnschool-20251015.80844.859.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251015.80844.859.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
-fnschool-20251015.80844.859.dist-info/RECORD,,
+fnschool-20251016.81138.855.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251016.81138.855.dist-info/METADATA,sha256=dkcTkCZiTOvL0rbT0RvqHfIeYbeBKK4XRbS_--BX0po,4752
+fnschool-20251016.81138.855.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
+fnschool-20251016.81138.855.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251016.81138.855.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschool-20251016.81138.855.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
+fnschool-20251016.81138.855.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
+fnschool-20251016.81138.855.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
+fnschool-20251016.81138.855.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251016.81138.855.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
+fnschool-20251016.81138.855.dist-info/RECORD,,