fnschool 20251018.80328.837__py3-none-any.whl → 20251018.80430.821__py3-none-any.whl

fnschoo1/__init__.py

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

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

@@ -103,6 +103,15 @@
   </button>
   <select class="workbook-month-select form-select float-end mx-2"
           style="width:118px"></select>
+  <div class="form-check float-end mx-1 pt-2">
+    <label class="form-check-label" for="include_food_sheets">
+      {% trans 'Ingredient Sheets are also included.' %}
+    </label>
+    <input class="form-check-input"
+           type="checkbox"
+           value=""
+           id="include_food_sheets">
+  </div>
 </div>
 {{ ingredient_ids|json_script:'ingredient_ids' }}
 {{ months|json_script:'months' }}
@@ -115,7 +124,6 @@
   var months = JSON.parse($("#months").text())
   var meal_types = JSON.parse($("#meal_types").text())
   var date_range = JSON.parse($("#date_range").text())
-
   var storage_date_start = $('#storage_date_start').text().replace(new RegExp('"', 'g'), "")
 
   var dont_submit = false
@@ -387,8 +395,13 @@
   });
 
   function generate_spreadsheet() {
+    var include_food_sheets = $("#include_food_sheets").is(':checked')
     var month = $(".workbook-month-select").val()
-    window.open(`/canteen/generate_spreadsheet/${month}`, 'generate_spreadsheet');
+    if (include_food_sheets) {
+      window.open(`/canteen/generate_spreadsheet/${month}?include_food_sheets=true`, 'generate_spreadsheet');
+    } else {
+      window.open(`/canteen/generate_spreadsheet/${month}`, 'generate_spreadsheet');
+    }
   }
 
   function set_consumptions_table_size() {

fnschoo1/canteen/workbook/generate.py

@@ -2680,7 +2680,8 @@ class CanteenWorkBook:
         self.fill_in_consumption_sheet()
         self.fill_in_consumption_list_sheet()
         self.fill_in_surplus_sheet()
-        self.fill_in_food_sheets()
+        if self.request.GET.get("include_food_sheets") == "true":
+            self.fill_in_food_sheets()
 
         return self.wb
 

{fnschool-20251018.80328.837.dist-info → fnschool-20251018.80430.821.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-fnschoo1/__init__.py,sha256=c_LnpW6tPOARJtnF_efHFXOQLwezUB8GsfYPM-9dYRM,197
+fnschoo1/__init__.py,sha256=Pi_r5hmFJR0XScaHz6S3PM59J9kzXP8DDGlLmoPa97o,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
@@ -31,7 +31,7 @@ fnschoo1/canteen/templates/canteen/category/delete.html,sha256=iPmGAB2r8K9DqBTp9
 fnschoo1/canteen/templates/canteen/category/list.html,sha256=QLO2GA13Co48Ijd0DCCN4lcMm1fgJqT2CprH5VdLZPw,2148
 fnschoo1/canteen/templates/canteen/category/update.html,sha256=UnCI95eqsQXfdUMdJXWUf1qNVWM9ZgsP03ayZ_Nrak8,831
 fnschoo1/canteen/templates/canteen/consumption/_create.html,sha256=tXlJcd566D9sYbsnj5KN-m0lyobT2AwwYt9oxUHbn4M,1026
-fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=sKNR1UpY8L8fv2CYr8_GXln2mAKTPPMgvne_Gvj_ytw,16166
+fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=Wy30E3bnOcP7D1LdqtZhp6WUCuJfuCiUmmSmlj6HhGQ,16707
 fnschoo1/canteen/templates/canteen/ingredient/close.html,sha256=pLYeJmGaOEJKMUJdZmYzz_n--l28IRDQ4fXvetP_Vsc,200
 fnschoo1/canteen/templates/canteen/ingredient/create.html,sha256=i4ajPDpXBTUp08lIiwn0wZoNEohyXlX3G64zG1lmIcs,839
 fnschoo1/canteen/templates/canteen/ingredient/create_one.html,sha256=y9EAKXmyIrlp5-DxHd86l1rMtB16KuOjPMbPiLAN_ag,615
@@ -43,7 +43,7 @@ fnschoo1/canteen/templates/canteen/meal_type/delete.html,sha256=i9PBX3ShXU4Az62M
 fnschoo1/canteen/templates/canteen/meal_type/list.html,sha256=c5kJUE1OgpRtSrMV4wFwL_gbRSaX_XMM4Zt1JTx34_g,1907
 fnschoo1/canteen/templates/canteen/meal_type/update.html,sha256=vqqyuC1m2CnPd3KrcjA8t4hbJslT001s4XvcYpkQmO0,834
 fnschoo1/canteen/workbook/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschoo1/canteen/workbook/generate.py,sha256=XsBIZ1ys15k83D4c_YhAhmJLwAbjMzv8TxYrvZF9T0w,109357
+fnschoo1/canteen/workbook/generate.py,sha256=Jc22Fpg-xAcAOgkzl-LK81NxxaNR05x1Js9kMTtG5XM,109427
 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=fMzSRfnUnUJb5sJIIzgLL8W1MDeZHbJuoWrkuDDT8GQ,22546
+fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=FgrQvpbmFej9tjCMnRf6evjeAbA0ofCuUpFlCIxkccs,22621
 fnschoo1/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/profiles/admin.py,sha256=93UCvdODI63KzCDfFFnKmfvCMGCp6FCG9WErE91i79Y,522
 fnschoo1/profiles/apps.py,sha256=WDu6eceFnDkBFMqquAolMZMo7XPb0ah6l2q2AruTrl4,215
@@ -96,14 +96,14 @@ fnschoo1/templates/includes/_navigation.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 fnschoo1/templates/includes/_paginator.html,sha256=Q-FRCODFNlETjn2yX18IfhctRWfqEgEnIc5LcdHzKSo,1262
 fnschoo1/templates/registration/logged_out.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/registration/login.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fnschool-20251018.80328.837.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251018.80328.837.dist-info/METADATA,sha256=8mr8gBEBgU6CAmFFKkp6at0p4idkpbWM34QTlqCVDNg,4752
-fnschool-20251018.80328.837.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
-fnschool-20251018.80328.837.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251018.80328.837.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool-20251018.80328.837.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
-fnschool-20251018.80328.837.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
-fnschool-20251018.80328.837.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
-fnschool-20251018.80328.837.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251018.80328.837.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
-fnschool-20251018.80328.837.dist-info/RECORD,,
+fnschool-20251018.80430.821.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251018.80430.821.dist-info/METADATA,sha256=B1JtREEGlCidGobUBN1c7_kJtw1UkNVfAn_KSkB3h0Q,4752
+fnschool-20251018.80430.821.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
+fnschool-20251018.80430.821.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251018.80430.821.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschool-20251018.80430.821.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
+fnschool-20251018.80430.821.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
+fnschool-20251018.80430.821.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
+fnschool-20251018.80430.821.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251018.80430.821.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
+fnschool-20251018.80430.821.dist-info/RECORD,,