fnschool 20251020.82239.858__tar.gz → 20251021.80058.842__tar.gz

{fnschool-20251020.82239.858 → fnschool-20251021.80058.842}/PKG-INFO

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

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251020.82239.858"
+__version__ = "20251021.80058.842"

fnschool-20251021.80058.842/src/fnschoo1/canteen/migrations/0018_alter_ingredient_updated_at.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.25 on 2025-10-20 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "canteen",
+            "0017_ingredient_updated_at_alter_category_created_at_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ingredient",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+    ]

{fnschool-20251020.82239.858 → fnschool-20251021.80058.842}/src/fnschoo1/canteen/views.py

@@ -97,6 +97,9 @@ quantity_header = (
         "To prevent the number of decimal places in the unit "
         + 'price from becoming too large, "quantity" is '
         + "only allowed to be an integer."
+        + " If your unit price is a decimal, please use a "
+        + "smaller quantity unit and then expand the "
+        + "quantity to an integer."
     ),
 )
 
@@ -396,25 +399,26 @@ def edit_ingredient(request, ingredient_id):
 
     if request.method == "POST":
 
-        form = IngredientForm(request.POST, instance=ingredient)
-
-        total_price = form.instance.total_price
-        quantity = form.instance.quantity
+        total_price = request.POST.get("total_price")
+        quantity = request.POST.get("quantity")
 
         [total_price0, quantity0], [total_price1, quantity1] = split_price(
             total_price, quantity
         )
 
+        form = IngredientForm(request.POST, instance=ingredient)
         if total_price1:
             unit_price_error_msg = _(
-                "The unit pricei ({unit_price}) has more than 3 decimal places and cannot be saved. Please modify it again."
+                "The unit pricei ({unit_price}) has more than {decimal_prec} decimal places and cannot be saved. Please modify it again."
             ).format(
                 unit_price=(
                     Decimal(str(total_price)) / Decimal(str(float(quantity)))
-                ).normalize()
+                ).normalize(),
+                decimal_prec=decimal_prec,
             )
             form.add_error("total_price", unit_price_error_msg)
             form.add_error("quantity", unit_price_error_msg)
+            form.fields["total_price"].widget.attrs.update({"autofocus": ""})
             return render(
                 request, "canteen/ingredient/update.html", {"form": form}
             )
@@ -578,7 +582,7 @@ def create_ingredients(request):
                         created_at=datetime.now().date(),
                     )
 
-                storage_date = row[storage_date_header[0]]
+                storage_date = date_parser.parse(row[storage_date_header[0]])
                 name = row[ingredient_name_header[0]]
                 quantity_unit_name = row[quantity_unit_name_header[0]]
                 is_ignorable = not row[is_ignorable_header[0]] is np.nan
@@ -591,19 +595,6 @@ def create_ingredients(request):
                 )
 
                 if total_price1:
-
-                    Ingredient.objects.create(
-                        user=request.user,
-                        storage_date=storage_date,
-                        name=name + _("(1)"),
-                        meal_type=meal_type,
-                        category=category,
-                        quantity=quantity0,
-                        total_price=total_price0,
-                        quantity_unit_name=quantity_unit_name,
-                        is_ignorable=is_ignorable,
-                    )
-
                     Ingredient.objects.create(
                         user=request.user,
                         storage_date=storage_date,
@@ -615,19 +606,19 @@ def create_ingredients(request):
                         quantity_unit_name=quantity_unit_name,
                         is_ignorable=is_ignorable,
                     )
-
-                else:
-                    Ingredient.objects.create(
-                        user=request.user,
-                        storage_date=storage_date,
-                        name=name,
-                        meal_type=meal_type,
-                        category=category,
-                        quantity=quantity0,
-                        total_price=total_price0,
-                        quantity_unit_name=quantity_unit_name,
-                        is_ignorable=is_ignorable,
-                    )
+                    name = name + _("(1)")
+
+                Ingredient.objects.create(
+                    user=request.user,
+                    storage_date=storage_date,
+                    name=name,
+                    meal_type=meal_type,
+                    category=category,
+                    quantity=quantity0,
+                    total_price=total_price0,
+                    quantity_unit_name=quantity_unit_name,
+                    is_ignorable=is_ignorable,
+                )
 
             return redirect("canteen:close_window")
 
@@ -674,7 +665,7 @@ def get_template_workbook_of_purchased_ingredients(request):
         ws.column_dimensions[column_letter].width = len(h) + hans_len + 2
         if c:
             h_cell.comment = Comment(c, _("the FNSCHOOL Authors"))
-
+    ws.freeze_panes = "B2"
     buffer = io.BytesIO()
     wb.save(buffer)
     buffer.seek(0)

{fnschool-20251020.82239.858 → fnschool-20251021.80058.842}/src/fnschoo1/static/js/fnschool.js

@@ -8,7 +8,17 @@ function make_highlight(query, time_data) {
     if (seconds_diff < 46) {
       highlight_elements_toggled.push(element)
       element.toggleClass('fn-highlight')
-      $('html,body').animate({ scrollTop: element.offset().top }, 1)
+      var table_container = $(element.closest('.table-container'))
+      if (table_container.length) {
+        var container = table_container
+        var thead = $(element.closest('table').find('thead'))
+        var pos =
+          element.offset().top -
+          container.offset().top +
+          container.scrollTop() -
+          thead.height()
+        container.animate({ scrollTop: pos }, 1)
+      }
     }
   })
 

{fnschool-20251020.82239.858 → fnschool-20251021.80058.842}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251020.82239.858
+Version: 20251021.80058.842
 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-20251020.82239.858 → fnschool-20251021.80058.842}/src/fnschool.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ src/fnschoo1/canteen/migrations/0014_category_priority.py
 src/fnschoo1/canteen/migrations/0015_alter_category_options_alter_category_priority.py
 src/fnschoo1/canteen/migrations/0016_consumption_unique_ingredient_date_of_using.py
 src/fnschoo1/canteen/migrations/0017_ingredient_updated_at_alter_category_created_at_and_more.py
+src/fnschoo1/canteen/migrations/0018_alter_ingredient_updated_at.py
 src/fnschoo1/canteen/migrations/__init__.py
 src/fnschoo1/canteen/templates/canteen/close.html
 src/fnschoo1/canteen/templates/canteen/category/create.html