fnschool 20250109.80500.803__py3-none-any.whl → 20250109.80531.837__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- fnschool/__init__.py +1 -1
- fnschool/canteen/spreadsheet/base.py +3 -2
- fnschool/canteen/spreadsheet/food.py +1 -1
- {fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/METADATA +1 -1
- {fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/RECORD +9 -9
- {fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/LICENSE +0 -0
- {fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/WHEEL +0 -0
- {fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/entry_points.txt +0 -0
- {fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/top_level.txt +0 -0
fnschool/__init__.py
CHANGED
|
@@ -147,9 +147,10 @@ class Base:
|
|
|
147
147
|
|
|
148
148
|
return bill_year
|
|
149
149
|
|
|
150
|
-
def update_food_sheet_year(self, sheet):
|
|
150
|
+
def update_food_sheet_year(self, sheet, year=None):
|
|
151
151
|
wb = sheet.parent
|
|
152
|
-
bill_year = self.get_bill_year(wb)
|
|
152
|
+
bill_year = year or self.get_bill_year(wb)
|
|
153
|
+
bill_year = str(bill_year)
|
|
153
154
|
csheet = sheet
|
|
154
155
|
for row_index in range(1, csheet.max_row + 1):
|
|
155
156
|
cell0_value = str(csheet.cell(row_index, 1).value).replace(" ", "")
|
|
@@ -641,7 +641,7 @@ class Food(Base):
|
|
|
641
641
|
self.update_inventories(sheet)
|
|
642
642
|
|
|
643
643
|
self.format(sheet)
|
|
644
|
-
self.update_food_sheet_year(sheet)
|
|
644
|
+
self.update_food_sheet_year(sheet, year)
|
|
645
645
|
print_info(_("Sheet '%s' was updated.") % sheet.title)
|
|
646
646
|
|
|
647
647
|
wb[self.sheet_name].sheet_state = "hidden"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: fnschool
|
|
3
|
-
Version: 20250109.
|
|
3
|
+
Version: 20250109.80531.837
|
|
4
4
|
Summary: Just some school related scripts, without any ambition.
|
|
5
5
|
Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
|
|
6
6
|
Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
fnschool/__init__.py,sha256=
|
|
1
|
+
fnschool/__init__.py,sha256=Pmq2mN2mO6f1CZoCJqNNUcx1Wk02xpcl4135c6NHjmI,702
|
|
2
2
|
fnschool/__main__.py,sha256=oGh9O_iIErV4v8AggpUwrakCVfCfcm1HDOysOr9L6ro,235
|
|
3
3
|
fnschool/app.py,sha256=DxfVStj4s-v-56WjJcTpObc7zruw00GK_hJWSePDsIE,5301
|
|
4
4
|
fnschool/config.py,sha256=ut6QTRska_PvU1REJt3KmLkVxS8Vjj-uuq0B6MFU70U,1175
|
|
@@ -34,12 +34,12 @@ fnschool/canteen/data/bill.xlsx,sha256=6PaeLAc0mn8gvie4oeqwonm1o0HA3nTMKmz80I0Nb
|
|
|
34
34
|
fnschool/canteen/data/consuming.xlsx,sha256=gfshtLXWZGOlUWSkuIuI3kpcIdtBb67hADqeOtI5LOg,47446
|
|
35
35
|
fnschool/canteen/data/purchase_list.xlsx,sha256=U14BZWTsN4b-J0qwCBVbBKm3t-Hyv5GcbztLyez2Iuk,16095
|
|
36
36
|
fnschool/canteen/spreadsheet/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
37
|
-
fnschool/canteen/spreadsheet/base.py,sha256=
|
|
37
|
+
fnschool/canteen/spreadsheet/base.py,sha256=_6iRdUJtI2B9WsM1nJ61CNP2NzAyc5AW5OcfNGBGC34,6388
|
|
38
38
|
fnschool/canteen/spreadsheet/consuming.py,sha256=olEWj7nkvUIpd_vo4VKKVLsAjJ08dzjBBeNkXkxEDsU,11019
|
|
39
39
|
fnschool/canteen/spreadsheet/consumingsum.py,sha256=TaSWS9bY1p4LnwlXRDxKZSKAxZ90U6wOo--p7Y-6FUE,2303
|
|
40
40
|
fnschool/canteen/spreadsheet/cover.py,sha256=R71ChxnBVYXM5PB2eCPbNglMXv3cHMtTC-zVrw-wz_c,1878
|
|
41
41
|
fnschool/canteen/spreadsheet/ctspreadsheet.py,sha256=yRz-cYMfHl97Udsm1m7juJjF1NduEri7u9GtTjDGrag,10424
|
|
42
|
-
fnschool/canteen/spreadsheet/food.py,sha256=
|
|
42
|
+
fnschool/canteen/spreadsheet/food.py,sha256=BKdb1bg6E7UZw9vFsGGYTFWFaru-5c2UzzKa8H5mRKo,25237
|
|
43
43
|
fnschool/canteen/spreadsheet/inventory.py,sha256=4YQeV5r31GEoqESLbEUddLwdEoiDxJOrltDMQeeOw64,12992
|
|
44
44
|
fnschool/canteen/spreadsheet/merging.py,sha256=smKVK1Go6m4kNWc8a1BFin_yP9ccjiT0xXpSD0r_dLk,10955
|
|
45
45
|
fnschool/canteen/spreadsheet/preconsuming.py,sha256=AYeXay3Rq3k-HIaTOSY5XqxXpDYggM6PrreNThGOP5Q,11414
|
|
@@ -70,9 +70,9 @@ fnschool/locales/zh_CN/LC_MESSAGES/fnschool.mo,sha256=kiWFce9J90sDES-LVtnV528PkP
|
|
|
70
70
|
fnschool/locales/zh_HK/LC_MESSAGES/fnschool.mo,sha256=LIkwykEwzZo3FOcbPfNhiCp3Eb0Io7LNrWcYNcT_bVU,454
|
|
71
71
|
fnschool/locales/zh_SG/LC_MESSAGES/fnschool.mo,sha256=m9eWOXQFgvCkJQviab0O3fMFzHcTfSLhY9-VPpnfVAI,454
|
|
72
72
|
fnschool/locales/zh_TW/LC_MESSAGES/fnschool.mo,sha256=mH6DlWIQVbR18YrbMUNI951vj8eLa3ZE_DHBOpWvFu8,454
|
|
73
|
-
fnschool-20250109.
|
|
74
|
-
fnschool-20250109.
|
|
75
|
-
fnschool-20250109.
|
|
76
|
-
fnschool-20250109.
|
|
77
|
-
fnschool-20250109.
|
|
78
|
-
fnschool-20250109.
|
|
73
|
+
fnschool-20250109.80531.837.dist-info/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
|
|
74
|
+
fnschool-20250109.80531.837.dist-info/METADATA,sha256=1_KR6FPFH2cxTtskPxvTFLgY-y3o9VKOEVy7VcnZr9w,13640
|
|
75
|
+
fnschool-20250109.80531.837.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
|
76
|
+
fnschool-20250109.80531.837.dist-info/entry_points.txt,sha256=XKudeSpooEfGtZrthDxc7wwIaKDA_SPz_dciI3YMsnI,99
|
|
77
|
+
fnschool-20250109.80531.837.dist-info/top_level.txt,sha256=1mt3yGbyMzI2A8F9tn4FtkU1eMSYnigdp9BwVWmvtng,9
|
|
78
|
+
fnschool-20250109.80531.837.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
{fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/entry_points.txt
RENAMED
|
File without changes
|
{fnschool-20250109.80500.803.dist-info → fnschool-20250109.80531.837.dist-info}/top_level.txt
RENAMED
|
File without changes
|