fnschool 20251013.80821.836__py3-none-any.whl → 20251013.81200.824__py3-none-any.whl

fnschoo1/__init__.py

@@ -6,7 +6,7 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251013.80821.836"
+__version__ = "20251013.81200.824"
 
 FNSCHOOL_PATH = Path(__file__).parent
 if FNSCHOOL_PATH.as_posix() not in sys.path:
@@ -46,7 +46,7 @@ def main():
             if is_windows:
                 os.startfile(local_url)
             else:
-                os.system("open " + local_url)
+                os.system("sleep 5 && open " + local_url)
         except Exception as e:
             print(e)
 

fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -8,6 +8,9 @@
   <hr>
   <div class="container">
     <div class="row justify-content-end">
+      <button class="btn btn-success col-md-1 col-lg-1 col-2"
+          onclick="list_consumptions();">{% trans "Refresh" %}</button>
+
       <div class="col col-3 col-md-2 col-lg-2">
         <input class="  form-control"
                onkeydown="if(event.keyCode==13){list_consumptions();}"

fnschoo1/canteen/workbook/generate.py

@@ -15,7 +15,15 @@ from dateutil.relativedelta import relativedelta
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
-from django.db.models import DecimalField, ExpressionWrapper, F, Q, Sum, Value
+from django.db.models import (
+    Count,
+    DecimalField,
+    ExpressionWrapper,
+    F,
+    Q,
+    Sum,
+    Value,
+)
 from django.db.models.functions import Coalesce
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
@@ -1603,7 +1611,7 @@ class CanteenWorkBook:
             consumptions += [
                 c
                 for c in ingredient.consumptions.filter(
-                    Q(is_disabled=False)
+                    Q(date_of_using__lte=self.date_end) & Q(is_disabled=False)
                 ).all()
             ]
 
@@ -1617,10 +1625,13 @@ class CanteenWorkBook:
                     inventory_days.append(date_of_using)
             else:
                 inventory_days.append(date_of_using)
+
+        if len(inventory_days) < 1:
+            inventory_days.insert(-1, self.date_end)
+
         inventory_days.insert(
             0, (self.date_start.replace(day=1) - timedelta(days=1))
         )
-
         formed_ingredients = []
         for inventory_day in inventory_days:
             inventory_day_ingredients = []
@@ -2107,8 +2118,10 @@ class CanteenWorkBook:
 
 
 def get_workbook_zip(request, month):
-    meal_types = MealType.objects.filter(
-        Q(user=request.user) & Q(is_disabled=False)
+    meal_types = MealType.objects.annotate(
+        ingredients_count=Count("ingredients")
+    ).filter(
+        Q(user=request.user) & Q(is_disabled=False) & Q(ingredients_count__gt=0)
     )
 
     zip_buffer = io.BytesIO()

{fnschool-20251013.80821.836.dist-info → fnschool-20251013.81200.824.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251013.80821.836
+Version: 20251013.81200.824
 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-20251013.80821.836.dist-info → fnschool-20251013.81200.824.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fnschoo1/__init__.py,sha256=GeuZo0S1MIWL867jcYL4Zkuw_G1hZSc2SJs9eyxvd_g,1496
+fnschoo1/__init__.py,sha256=SbSXFTr7zEcgWFHg92chlgThEpDfsUOXtDTKRjyh-Ns,1507
 fnschoo1/manage.py,sha256=pMv0yE2eTcNrgskSHDUdRrnY51iTm1DXg32I8mWDDqw,696
 fnschoo1/canteen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/canteen/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
@@ -28,7 +28,7 @@ fnschoo1/canteen/templates/canteen/category/delete.html,sha256=MnPyFzjO3HonOljwx
 fnschoo1/canteen/templates/canteen/category/list.html,sha256=aj81uoA-jmdv8mZT-Y9DxjOHVGrSfI1z0DB1YnJWb4w,2045
 fnschoo1/canteen/templates/canteen/category/update.html,sha256=8Nzdbe8UorrJHzElkrdqvLaPnUvcvGhrViZB4D86wqo,815
 fnschoo1/canteen/templates/canteen/consumption/_create.html,sha256=lpST1R0vL1PEI1YE9d0-bcWWpCMH-INjIF-7pweAHuU,1008
-fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=uqS5rEWdAn3u7L7F4SgpOHK931u60rGMDQAA7IofRlk,14714
+fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=KQbx4htFR_KjBJXqVvcZcZFDmRdASD5Hltu7NZF7-g0,14849
 fnschoo1/canteen/templates/canteen/ingredient/close.html,sha256=pLYeJmGaOEJKMUJdZmYzz_n--l28IRDQ4fXvetP_Vsc,200
 fnschoo1/canteen/templates/canteen/ingredient/create.html,sha256=xZvh0tP_cv2HPQ96JSHChO6Ni23tzHc5YJCUhE2yEqM,807
 fnschoo1/canteen/templates/canteen/ingredient/create_one.html,sha256=O8EPSvAnEZ-4VJiwFdoyxJrMOoMpRkH6CyfvWwHaVgc,599
@@ -40,7 +40,7 @@ fnschoo1/canteen/templates/canteen/meal_type/delete.html,sha256=1UmCyXD-6lbYl-IE
 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=dSIhK0SKr7w_q7rFgdgjfvD68RRtdkiLW9wk3Z0vzWE,83686
+fnschoo1/canteen/workbook/generate.py,sha256=n6q0s3qoHbKQ-DpaqcJarnTHsomndOb3DtfC66vHprE,83946
 fnschoo1/fnschool/__init__.py,sha256=TmHhzykpKNMoMf6eD-EKvbvmnlzs1XGHtvD55ae1sXs,287
 fnschoo1/fnschool/asgi.py,sha256=kzkqosS10uBlyBX53EXcsATcvEZmac6nsPzyOHCuucE,393
 fnschoo1/fnschool/settings.py,sha256=l9Y1iQCivSfmsNfnHltfXLzxP6gG4VMIL4GEZgAp8YM,4357
@@ -93,9 +93,9 @@ 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-20251013.80821.836.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251013.80821.836.dist-info/METADATA,sha256=Y1gulE_dYuQ74rqKBzcmPOJcrTpFiZyZwY14XsxoXLw,4752
-fnschool-20251013.80821.836.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251013.80821.836.dist-info/entry_points.txt,sha256=To2PDA9r0qhE0Wq1-M8hEE8uXxTrTe16BOcpKPT-q5g,47
-fnschool-20251013.80821.836.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251013.80821.836.dist-info/RECORD,,
+fnschool-20251013.81200.824.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251013.81200.824.dist-info/METADATA,sha256=b-copPlDf-Am6WcOCl1KGXm7KtzvYxL59wSYY5TL9Kk,4752
+fnschool-20251013.81200.824.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251013.81200.824.dist-info/entry_points.txt,sha256=To2PDA9r0qhE0Wq1-M8hEE8uXxTrTe16BOcpKPT-q5g,47
+fnschool-20251013.81200.824.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251013.81200.824.dist-info/RECORD,,