fnschool 20251018.80328.837__tar.gz → 20251018.81021.825__tar.gz

{fnschool-20251018.80328.837 → fnschool-20251018.81021.825}/PKG-INFO

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

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

{fnschool-20251018.80328.837 → fnschool-20251018.81021.825}/src/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() {

{fnschool-20251018.80328.837 → fnschool-20251018.81021.825}/src/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 → fnschool-20251018.81021.825}/src/fnschool.egg-info/PKG-INFO

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