fnschool 20251013.80821.836__tar.gz → 20251013.81257.813__tar.gz

{fnschool-20251013.80821.836 → fnschool-20251013.81257.813}/PKG-INFO

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

@@ -6,7 +6,7 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251013.80821.836"
+__version__ = "20251013.81257.813"
 
 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)
 

{fnschool-20251013.80821.836 → fnschool-20251013.81257.813}/src/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();}"

{fnschool-20251013.80821.836 → fnschool-20251013.81257.813}/src/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 = []
@@ -1808,9 +1819,10 @@ class CanteenWorkBook:
                 ingredient_name_cell.value = ingredient.name
                 if ingredient.name:
                     ingredient_name_cell.comment = Comment(
-                        _("{meal_type} ({category})").format(
+                        _("{meal_type} ({category}, Checked/Storaged at {storage_date})").format(
                             meal_type=ingredient.meal_type,
                             category=ingredient.category,
+                            storage_date = ingredient.storage_date,
                         ),
                         user.username,
                     )
@@ -2107,8 +2119,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 → fnschool-20251013.81257.813}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251013.80821.836
+Version: 20251013.81257.813
 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>