fnschool 20251013.81919.815__py3-none-any.whl → 20251013.81959.843__py3-none-any.whl

fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251013.81919.815"
+__version__ = "20251013.81959.843"

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

@@ -22,8 +22,8 @@
         <input class="  form-control"
                onkeydown="if(event.keyCode==13){list_consumptions();}"
                title="{% trans 'The starting date of storage.' %}"
-               id="storage_date_start"
-               value="{{ request.COOKIES.storage_date_start }}">
+               id="storage_date_start_input"
+               value="{{ storage_date_start|date:"Y/m/d" }}">
       </input>
     </div>
     <div class="col col-3 col-md-2 col-lg-2">
@@ -96,14 +96,18 @@
 {{ months|json_script:'months' }}
 {{ meal_types|json_script:'meal_types' }}
 {{ date_range|json_script:'date_range' }}
+{{ storage_date_start|json_script:'storage_date_start' }}
 <script>
   var ingredient_ids = JSON.parse($("#ingredient_ids").text())
   var ingredient_ids_length = ingredient_ids.length
   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
 
-  date_range = JSON.parse($("#date_range").text())
 
   function list_consumptions_rapidly() {
     query = {
@@ -154,6 +158,13 @@
 
   });
 
+  $(document).ready(function() {
+    if (get_cookie('storage_date_start') === null) {
+      set_cookies({
+        "storage_date_start": storage_date_start
+      })
+    }
+  });
 
   $(document).ready(function() {
     var last_meal_type = ""
@@ -391,20 +402,20 @@
   });
 
   function list_consumptions() {
-    var storage_date_start = $('#storage_date_start').val()
-    var storage_date_end = $('#storage_date_end').val()
+    var new_storage_date_start = $('#storage_date_start_input').val()
+    var new_storage_date_end = $('#storage_date_end_input').val()
     query = {}
-    if (storage_date_start) {
-      query["storage_date_start"] = storage_date_start
-      set_simple_cookie("storage_date_start", storage_date_start)
+    if (new_storage_date_start) {
+      query["storage_date_start"] = new_storage_date_start
+      set_simple_cookie("storage_date_start", new_storage_date_start)
     } else {
       query["storage_date_start"] = ""
       delete_cookie("storage_date_start")
     }
 
-    if (storage_date_end) {
-      query["storage_date_end"] = storage_date_end
-      set_simple_cookie("storage_date_end", storage_date_end)
+    if (new_storage_date_end) {
+      query["storage_date_end"] = new_storage_date_end
+      set_simple_cookie("storage_date_end", new_storage_date_end)
     } else {
       query["storage_date_end"] = ""
       delete_cookie("storage_date_end")
@@ -420,7 +431,7 @@
     position: absolute;
   }
 
-  #storage_date_start,
+  #storage_date_start_input,
   #storage_date_end {
     text-align: center;
     font-family: Mono;

fnschoo1/canteen/views.py

@@ -297,6 +297,7 @@ def create_consumptions(request, ingredient_id=None):
             "meal_types": meal_types,
             "ingredient_ids": ingredient_ids,
             "months": months,
+            "storage_date_start": date_start,
         },
     )
 

{fnschool-20251013.81919.815.dist-info → fnschool-20251013.81959.843.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-fnschoo1/__init__.py,sha256=WSDGaE349YUVvVkCJW2Z7ZyVBVTTahlxerGH_D7vSY0,197
+fnschoo1/__init__.py,sha256=P5QYmb7ozN6bO6SBiWzHKv5mAxye_K2A3X_5bGBmfXc,197
 fnschoo1/manage.py,sha256=Cr5OtPrRWfEc7KEjW4yYnMKj_qlb0-qpwFRz3vFXvC0,1565
 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=4Y75VHpnONdN5hM8aShyr7tbQSElLa-22PQK7fDRflw,229
 fnschoo1/canteen/models.py,sha256=20r24iNJW0hmPwhY96pQLYaIgqf8kc_Tx76IqORR_LE,5219
 fnschoo1/canteen/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 fnschoo1/canteen/urls.py,sha256=4GtrqC9L59c8zopfjRgqhbcvA5iPnGcAUVuM6CrKWpk,2797
-fnschoo1/canteen/views.py,sha256=gY-dcBqIAxvZS5ToIHNijU-DDj2GAAaSnP31VTYHF_w,26269
+fnschoo1/canteen/views.py,sha256=AXMO6dEMjBMTO-D6sWEV2sDwYZcms0L6hSgq8NHvVfw,26315
 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
@@ -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=UQOwZ5yS5g98LSxzSdRxUCzzR5R_RID0DGkbq9M_HFc,15568
+fnschoo1/canteen/templates/canteen/consumption/create.html,sha256=NOUKb48EueRHHN3tb1KwTkCsmpWwdWWCwX3Kwqi-A7o,15954
 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
@@ -93,14 +93,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-20251013.81919.815.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251013.81919.815.dist-info/METADATA,sha256=yixkF9j3Fzj8y4Qz2QpRMoMB9rQwEV3_vJvgLfl7KZU,4752
-fnschool-20251013.81919.815.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
-fnschool-20251013.81919.815.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251013.81919.815.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool-20251013.81919.815.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
-fnschool-20251013.81919.815.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
-fnschool-20251013.81919.815.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
-fnschool-20251013.81919.815.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251013.81919.815.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
-fnschool-20251013.81919.815.dist-info/RECORD,,
+fnschool-20251013.81959.843.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251013.81959.843.dist-info/METADATA,sha256=DC-zwFsEtLabNxJmkbl26HyKqHjaJ_6S-Mm5MvvktP8,4752
+fnschool-20251013.81959.843.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
+fnschool-20251013.81959.843.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251013.81959.843.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschool-20251013.81959.843.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
+fnschool-20251013.81959.843.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
+fnschool-20251013.81959.843.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
+fnschool-20251013.81959.843.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251013.81959.843.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
+fnschool-20251013.81959.843.dist-info/RECORD,,