fnschool 20241126.81759.821__tar.gz → 20250109.80500.803__tar.gz

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: fnschool
-Version: 20241126.81759.821
+Version: 20250109.80500.803
 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-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/__init__.py

@@ -21,7 +21,7 @@ from openpyxl.styles import numbers
 from openpyxl.styles import Font
 from fnschool.app import *
 from fnschool.language import _
-from fnschool.show import *
+from fnschool.inoutput import *
 from fnschool.path import *
 from fnschool.entry import *
 from fnschool.external import *
@@ -29,7 +29,7 @@ from fnschool.user import *
 from fnschool.config import *
 
 
-__version__ = "20241126.81759.821"
+__version__ = "20250109.80500.803"
 
 
 # The end.

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/bill.py

@@ -18,13 +18,19 @@ class Bill:
         self._operator_name = None
         self._food_classes = None
         self._operator = None
-        self.currency = Currency().CNY
+        self._currency = None
         self._consuming = None
         self.significant_digits = 2
         self._meal_type = None
 
         pass
 
+    @property
+    def currency(self):
+        if not self._currency:
+            self._currency = Currency().CNY if is_zh_CN else Currency().CNY
+        return self._currency
+
     @property
     def consuming(self):
         if not self._consuming:
@@ -156,6 +162,9 @@ class Bill:
         purchaser = self.foods[-1].purchaser
         return purchaser
 
+    def make_spreadsheets_g(self):
+        pass
+
     def make_spreadsheets(self):
         self.spreadsheet.update()
         pass
@@ -230,7 +239,7 @@ class Bill:
                     self._food_classes[fclass] = name_likes
 
             print_info(_("Ok! I know it. (Press any key to continue)"))
-            input0()
+            get_input()
 
         return self._food_classes
 

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/currency.py

@@ -12,6 +12,6 @@ class Currency:
 
     @property
     def CNY(self):
-        CNY = Currency("CNY", _("CNY"), "¥")
+        CNY = Currency("CNY", _("CNY"), "\u00a5")
 
         return CNY

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/entry.py

@@ -25,10 +25,16 @@ def parse_canteen(subparsers):
     )
     parser_canteen.add_argument(
         "action",
-        choices=["mk_bill", "merge_foodsheets"],
+        choices=[
+            "mk_bill",
+            "merge_foodsheets",
+        ],
         help=_(
             'The functions of canteen. "mk_bill": Make bill. '
             + '"merge_foodsheets": Merge food sheets.'
         ),
     )
     parser_canteen.set_defaults(func=set_canteen)
+
+
+# The end.

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/base.py

@@ -12,6 +12,7 @@ from fnschool import *
 class Base:
     def __init__(self, bill):
         self.bill = bill
+        self.currency = self.bill.currency
         self.spreadsheet = self.bill.spreadsheet
         self.s = self.spreadsheet
         self._bill_workbook = None
@@ -41,6 +42,13 @@ class Base:
         self.food_sheet0_name = "材料台账母表"
         self.food_form_title_like = "材料入库、出库台账"
 
+    def get_local_total_price(self, total_price):
+        return (
+            self.bill.get_CNY_chars(total_price)
+            if is_zh_CN
+            else self.bill.get_CNY_chars(total_price)
+        )
+
     @property
     def bill_workbook(self):
         if not self._bill_workbook:
@@ -113,12 +121,22 @@ class Base:
         return self._sheet
 
     def get_bill_year(self, wb=None):
+        return (
+            self.get_zh_CN_bill_year(wb)
+            if is_zh_CN
+            else self.get_zh_CN_bill_year(wb)
+        )
+
+    def get_zh_CN_bill_year(self, wb=None):
+        return self.get_bill_year_by_x_year(wb, "年")
+
+    def get_bill_year_by_x_year(self, wb=None, year_word="年"):
         wb = wb or self.bwb
         cover_sheet = wb[self.s.cover_name]
         year = str(cover_sheet.cell(1, 1).value)
         year0 = ""
-        year_char = "年"
-        year = year.split(year_char)[0]
+        year_word = year_word
+        year = year.split(year_word)[0]
         for i in range(len(year) - 1, -1, -1):
             if year[i].isnumeric():
                 year0 = year[i] + year0
@@ -186,6 +204,9 @@ class Base:
                     pass
                 pass
             pass
+        pass
+
+    pass
 
 
 # The end.

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/consumingsum.py

@@ -38,28 +38,34 @@ class ConsumingSum(Base):
             cssheet.cell(row[0].row, 2).number_format = numbers.FORMAT_NUMBER_00
 
         total_price = round(total_price, self.sd + 1)
-        total_price_CNY = self.bill.get_CNY_chars(total_price)
+        local_total_price = self.get_local_total_price(total_price)
         cssheet.cell(
             1,
             1,
             (
                 self.bill.operator.superior_department
-                + "食堂食品、材料出库汇总报销单"
+                + _("食堂食品、材料出库汇总报销单")
             ),
         )
         cssheet.cell(
             2,
             1,
-            f"编制单位：{self.purchaser}       "
-            + f"单位：元         "
-            + f"{year}年{month}月{day}日",
+            _("编制单位：")
+            + f"{self.purchaser}       "
+            + _("单位：元")
+            + f"         "
+            + _("{0}年{1}月{2}日").format(year, month, day),
         )
         cssheet.cell(
             11,
             1,
-            (f"总金额（大写)：{total_price_CNY}    " + f"¥{total_price}"),
+            (
+                _("总金额（大写）")
+                + f"：{local_total_price}    "
+                + f"{self.currency.mark}{total_price}"
+            ),
         )
-        cssheet.cell(12, 1, f"经办人：{self.operator.name}  ")
+        cssheet.cell(12, 1, _("经办人：") + f"{self.operator.name}  ")
 
         wb = self.bwb
         wb.active = cssheet

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/ctspreadsheet.py

@@ -165,7 +165,7 @@ class CtSpreadSheet:
             ).format(self.operator.bill_fpath)
         )
 
-        s_input = input0()
+        s_input = get_input()
 
         print()
         print_info(_("Saving. . ."))

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/food.py

@@ -177,14 +177,14 @@ class Food(Base):
                     print_error(
                         _(
                             "cannot find the starting index of form in "
-                            + '"{0}". (row {1})'
+                            + 'Sheet "{0}". (row {1})'
                         ).format(sheet.title, row[0].row)
                     )
                 if not row_index1:
                     print_error(
                         _(
                             "cannot find the ending index of form in "
-                            + '"{0}". (row {1})'
+                            + 'Sheet "{0}". (row {1})'
                         ).form(sheet.title, row[0].row)
                     )
                 if row_index0 and row_index1:
@@ -282,13 +282,69 @@ class Food(Base):
                         sheet.cell(
                             row_indexp1,
                             12,
-                            i_unit_price * (i_count + w_count_n - c_count_n),
+                            i_unit_price * (i_count + w_count_n - c_count_n)
                         )
 
                         pass
                     pass
                 pass
+
+            for row_index in range(ri0,ri1+1):
+                w_count = sheet.cell(row_index, 4).value
+                w_unit_price = sheet.cell(row_index, 5).value
+                if str(w_count).replace(".", "").isnumeric():
+                    w_count = float(w_count)
+                else:
+                    w_count = 0
+                if str(w_unit_price).replace(".", "").isnumeric():
+                    w_unit_price = float(w_unit_price)
+                else:
+                    w_unit_price = 0
+                w_total_price = w_count * w_unit_price
+                
+                if not sheet.cell(row_index,6).value:
+                    sheet.cell(row_index, 6, w_total_price)
+
+                c_count = sheet.cell(row_index, 7).value
+                c_unit_price = sheet.cell(row_index, 8).value
+                if str(c_count).replace(".", "").isnumeric():
+                    c_count = float(c_count)
+                else:
+                    c_count = 0
+                if str(c_unit_price).replace(".", "").isnumeric():
+                    c_unit_price = float(c_unit_price)
+                else:
+                    c_unit_price = 0
+                c_total_price = c_count * c_unit_price
+
+                if not sheet.cell(row_index, 9).value:
+                    sheet.cell(row_index, 9, c_total_price)
+
+                i_count = sheet.cell(row_index, 10).value
+                i_unit_price = sheet.cell(row_index, 11).value
+                if str(i_count).replace(".", "").isnumeric():
+                    i_count = float(i_count)
+                else:
+                    i_count = 0
+                if str(i_unit_price).replace(".", "").isnumeric():
+                    i_unit_price = float(i_unit_price)
+                else:
+                    i_unit_price = 0
+                i_total_price = i_count * i_unit_price
+
+                if i_count == 0:
+                    sheet.cell(row_index, 10, "0")
+
+                if not sheet.cell(row_index, 12).value:
+                    sheet.cell(row_index, 12, i_total_price)
+
+
+
+
+            pass
+
         print_info(_("Update completed!"))
+
         pass
 
     def update_summation(self, sheet):

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/merging.py

@@ -154,7 +154,9 @@ class Merging(Base):
             if rc1_value and "材料名称：（）" in rc1_value:
                 unit = [f.unit_name for f in bfoods if f.name == name]
                 unit = unit[0] if len(unit) > 0 else "斤"
-                sheet.cell(row_index, 1, f"材料名称：{name}（{unit}）")
+                sheet.cell(
+                    row_index, 1, "材料名称：{0}（{1}）".format(name, unit)
+                )
 
         return sheet
 
@@ -195,12 +197,7 @@ class Merging(Base):
                 break
             elif row_diff < 0:
                 row_diff = abs(row_diff)
-                lsheet.insert_rows(lrow0 + 1, row_diff)
-                for row_index_f in range(lrow0 + 1, lrow0 + 1 + row_diff):
-                    for col_index_f in range(1, 14):
-                        cell = lsheet.cell(row_index_f, col_index_f)
-                        cell.border = self.cell_border0
-                        cell.alignment = self.cell_alignment0
+                csheet.delete_rows(lrow0 + 1, row_diff)
                 self.make_row_counts_same(lsheet, csheet)
                 break
 

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/preconsuming.py

@@ -150,22 +150,26 @@ class PreConsuming(Base):
                 sheet.cell(row_index, 2, wbfood.get_remainder(mday_m1))
                 sheet.cell(row_index, 4, wbfood.unit_price)
                 if wbfood.meal_type and not last_meal_type == wbfood.meal_type:
+                    new_meal_type_rows.append([wbfood.meal_type, row_index])
                     last_meal_type = wbfood.meal_type
-                    new_meal_type_rows.append(row_index)
 
             for row_index in range(row_index + 1, sheet.max_row + 1):
                 sheet.cell(row_index, 1, "")
                 sheet.cell(row_index, 2, "")
                 sheet.cell(row_index, 4, "")
+                pass
 
             new_meal_type_rows = [
-                [new_meal_type_rows[i], new_meal_type_rows[i + 1]]
+                [new_meal_type_rows[i][1], new_meal_type_rows[i + 1][1]]
                 for i in range(0, len(new_meal_type_rows), 2)
                 if i + 1 < len(new_meal_type_rows)
             ]
+
             for [row_index0, row_index1] in new_meal_type_rows:
+                colored_cols = self.get_colored_cols(days_diff)
+
                 for row_index in range(row_index0, row_index1):
-                    for col_index in self.get_colored_cols(days_diff):
+                    for col_index in colored_cols:
                         cell = sheet.cell(row_index, col_index)
                         cell.fill = self.cell_fill0
                         cell.border = self.cell_border1
@@ -223,7 +227,7 @@ class PreConsuming(Base):
                     + "(Ok, I know [press any key to continue])"
                 )
             )
-            input0()
+            get_input()
             wb.close()
             open_path(wb_fpath)
             print_info(
@@ -231,7 +235,7 @@ class PreConsuming(Base):
                     "Ok! I have updated spreadsheet '{0}'. (Press any key)"
                 ).format(wb_fpath)
             )
-            input0()
+            get_input()
 
             wb = load_workbook(wb_fpath)
             sheet = wb[self.sheet_name0]
@@ -315,7 +319,7 @@ class PreConsuming(Base):
                 _("Yes, they are all right. (Press any key to continue)")
             )
 
-            input0()
+            get_input()
 
             pass
 

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/purchasing.py

@@ -344,7 +344,7 @@ class Purchasing(Base):
                     + "(Press any key to check the file)"
                 )
             )
-            input0()
+            get_input()
             open_path(self.path)
             print_info(
                 _(
@@ -353,7 +353,7 @@ class Purchasing(Base):
                     + "file. (Press any key to continue)"
                 )
             )
-            input0()
+            get_input()
         pass
 
     @property
@@ -568,7 +568,7 @@ class Purchasing(Base):
                 ).format(self.path)
             )
 
-            f_input = input0().replace(" ", "")
+            f_input = get_input().replace(" ", "")
             if len(f_input) > 0 and f_input in "Yy":
                 update_yn = True
                 max_row = len(
@@ -647,12 +647,12 @@ class Purchasing(Base):
                     )
                 )
             )
-            input0()
+            get_input()
             open_path(self.path)
             print_info(
                 _("Ok, I checked it, it's ok. " + "(Press any key to continue)")
             )
-            input0()
+            get_input()
             pass
 
         pass
@@ -724,7 +724,7 @@ class Purchasing(Base):
                             + ")"
                         ).format(f.name)
                     )
-                    split_mode = input0()
+                    split_mode = get_input()
 
                 if split_mode and split_mode in "Ss":
                     return
@@ -827,7 +827,7 @@ class Purchasing(Base):
                 + "(Yes: 'Y' or 'y'. Default: No.)"
             ).format(self.path)
         )
-        re_edit_yn = input0()
+        re_edit_yn = get_input()
         if re_edit_yn and re_edit_yn in "Yy":
             open_path(self.path)
             print_info(
@@ -836,7 +836,7 @@ class Purchasing(Base):
                     + "(Press any key to continue)"
                 )
             )
-            input0()
+            get_input()
             return False
 
         return True

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/purchasingsum.py

@@ -23,7 +23,7 @@ class PurchasingSum(Base):
             1,
             (
                 self.bill.operator.superior_department
-                + "食堂食品、材料入库汇总报销单"
+                + _("食堂食品、材料入库汇总报销单")
             ),
         )
         pssheet.cell(
@@ -31,26 +31,30 @@ class PurchasingSum(Base):
             1,
             (
                 self.bill.operator.superior_department
-                + "食堂食品、材料未入库汇总报销单"
+                + _("食堂食品、材料未入库汇总报销单")
             ),
         )
         pssheet.cell(
             2,
             1,
-            f"编制单位：{self.purchaser}"
+            _("编制单位：")
+            + f"{self.purchaser}"
             + f"        "
-            + f"单位：元"
+            + _("单位：")
+            + f"{self.currency.unit}"
             + f"         "
-            + f"{year}年{month}月{day}日",
+            + _("{0}年{1}月{2}日").format(year, month, day),
         )
         pssheet.cell(
             20,
             1,
-            f"编制单位：{self.purchaser}"
+            _("编制单位：")
+            + f"{self.purchaser}"
             + f"        "
-            + f"单位：元"
+            + _("单位：")
+            + self.currency.unit
             + f"         "
-            + f"{year}年{month}月{day}日",
+            + _("{0}年{1}月{2}日").format(year, month, day),
         )
         foods = [f for f in self.bfoods if (not f.is_inventory)]
 
@@ -72,20 +76,30 @@ class PurchasingSum(Base):
             total_price += _total_price
 
         total_price = round(total_price, self.sd + 1)
-        total_price_CNY = self.bill.get_CNY_chars(total_price)
+        local_total_price = self.get_local_total_price(total_price)
         pssheet.cell(
-            11, 1, f"总金额（大写)：{total_price_CNY}    ¥{total_price}"
+            11,
+            1,
+            (
+                _("总金额（大写）：")
+                + f"{local_total_price}    "
+                + f"{self.currency.mark}{total_price}"
+            ),
         )
-        pssheet.cell(12, 1, f"经办人：{self.operator.name}  ")
+        pssheet.cell(12, 1, _("经办人：") + f"{self.operator.name}  ")
 
         total_price = sum([f.count * f.unit_price for f in uwfoods])
-        total_price_CNY = self.bill.get_CNY_chars(total_price)
+        local_total_price = self.bill.get_CNY_chars(total_price)
         pssheet.cell(27, 2, total_price)
         pssheet.cell(
-            29, 1, f"总金额（大写)：{total_price_CNY}    ¥{total_price}"
+            29,
+            1,
+            _("总金额（大写）：")
+            + f"{local_total_price}    "
+            + f"{self.currency.mark}{total_price}",
         )
 
-        pssheet.cell(30, 1, f"经办人：{self.operator.name}  ")
+        pssheet.cell(30, 1, _("经办人：") + f"{self.operator.name}  ")
 
         wb = self.bwb
         wb.active = pssheet

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/canteen/spreadsheet/spreadsheet.py

@@ -166,7 +166,7 @@ class SpreadSheet:
             ).format(self.operator.bill_fpath)
         )
 
-        s_input = input0()
+        s_input = get_input()
 
         print()
         print_info(_("Saving. . ."))

fnschool-20250109.80500.803/src/fnschool/canteen/spreadsheet/translating.py

@@ -0,0 +1,12 @@
+# Why does this file appear?
+# In fact, this project was not built from scratch. At first, I just wanted
+# to complete the tasks assigned by the superior department, so I didn't think
+# too much because there were many things that needed to be urgently completed.
+# So some files in this project inevitably contain a large number of Chinese
+# characters in their text. When this project can successfully complete many
+# tasks, internationalization has become very troublesome and difficult to
+# start (and I don't have that much time). So, this file is responsible for
+# translating an international copy.
+
+
+# The end.

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/entry.py

@@ -16,20 +16,18 @@ entry_name = "entry.py"
 def get_entries():
     entries = [
         ".".join(
-            os.path.splitext(p.relative_to(module_dpath.parent.as_posix()))[0]
-            .replace("\\", "/")
-            .split("/")
+            os.path.splitext(
+                p.relative_to(module_dpath.parent.as_posix()).as_posix()
+            )[
+                0
+            ].split("/")
         )
         for p in module_dpath.glob(f"*/{entry_name}")
     ]
+    print(entries)
     return entries
 
 
-def show_gui():
-    print_info(_("Just wait."))
-    pass
-
-
 def read_cli():
     parser = argparse.ArgumentParser(
         prog=_("fnschool"),
@@ -38,15 +36,21 @@ def read_cli():
     )
     subparsers = parser.add_subparsers(help=_("The modules to run."))
     entries = get_entries()
+    added_entries = []
 
     for entry in entries:
+        entry_name = entry
         entry = importlib.import_module(entry)
         names = dir(entry)
         for name in names:
             attr = getattr(entry, name)
             if inspect.isfunction(attr):
-                if name.startswith("parse_"):
+                if name.startswith("parse_") and not name in added_entries:
                     attr(subparsers)
+                    added_entries.append(name)
+                    pass
+
+    del added_entries
 
     args = parser.parse_args()
 
@@ -57,5 +61,7 @@ def read_cli():
 
     print_sponsor()
 
+    del parser
+
 
 # The end.

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/exam/email.py

@@ -129,7 +129,7 @@ class Email:
                 + " to chaperones? (Yes: 'Y','y')"
             ).format(self.teacher.name)
         )
-        s_input = input0()
+        s_input = get_input()
         if s_input and s_input in "Yy":
             scores_img_fpaths = self.score.scores_img_fpaths
             msg_subject = _('The scores of Test "{0}"').format(
@@ -332,14 +332,14 @@ class Email:
                         + "me. [Press any key to open it])"
                     ).format(fpath)
                 )
-                input0()
+                get_input()
                 open_path(fpath)
                 print_info(
                     _(
                         "(Ok! I have filled them in? [Press any key to continue])"
                     )
                 )
-                input0()
+                get_input()
 
             self._fpath = fpath
 

{fnschool-20241126.81759.821 → fnschool-20250109.80500.803}/src/fnschool/exam/entry.py

@@ -19,18 +19,18 @@ def set_exam(args):
 
 
 def parse_exam(subparsers):
-    parser_canteen = subparsers.add_parser(
+    parser_exam = subparsers.add_parser(
         "exam", help=_("Examination related functions.")
     )
-    parser_canteen.add_argument(
+    parser_exam.add_argument(
         "action",
         choices=["enter", "read"],
         help=_(
             '"enter": Enter the examination scores. '
-            + '"read":Read the examination scores.'
+            + '"read": Read the examination scores.'
         ),
     )
-    parser_canteen.set_defaults(func=set_exam)
+    parser_exam.set_defaults(func=set_exam)
 
 
 # The end.