From ac30775f21182384baf1ee2ef8a50e53c5eea99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Sun, 5 Mar 2023 20:28:55 +0900 Subject: [PATCH 01/13] fix(parsing.py): resolve some Merge Conflicts & file existence check logic --- parsing.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/parsing.py b/parsing.py index dcb0b9a..7fae5e8 100644 --- a/parsing.py +++ b/parsing.py @@ -8,7 +8,6 @@ from meal import KOR, ENG from meal import BREAKFAST, LUNCH, DINNER from meal import BLDG1_1ST, BLDG1_2ND, BLDG2_1ST -from meal import DATE_LEN, DATE_2nd,DATE_1st from meal import MEAL_KIND from meal import BLDG_KIND from meal import EXCEL_COL_BLDG, INDEX_ENDPOINTS, DATE_INDEX @@ -85,18 +84,6 @@ def parsing(excel_path: str, bldgType: int, langType: int) -> list: bldg, date, kind, menu, special) parsing_result.append(meal.__dict__) return parsing_result - - - if bldgType == 0 & langType == 1: #1학 영어 엑셀 - for (dateType, date_str) in enumerate(DATE_1st): - date_sheet = sheet[date_str] - date = parsing_date(time_index, date_sheet) - for kindType in [BREAKFAST, LUNCH, DINNER]: - kind = MEAL_KIND[langType][kindType] - menu, special = parsing_meal[kindType](endpoint, date_sheet, langType, dateType, bldgType) - meal = Meal(bldgType, langType, dateType, kindType, - bldg, date, kind, menu, special) - parsing_result.append(meal.__dict__) # 2학 elif bldgType == BLDG2_1ST: @@ -147,18 +134,17 @@ def parsingTest(): print("-------------------------------------------------") print("parsing xlsx to json...") - if exists(filepath_bldg1_1_kor) and exists(filepath_bldg1_1_eng): + if exists(filepath_bldg1_1_kor): parsing_result.extend(parsing(filepath_bldg1_1_kor, BLDG1_1ST, KOR)) #1학 1층, 한글 + if exists(filepath_bldg1_1_eng): parsing_result.extend(parsing(filepath_bldg1_1_eng, BLDG1_1ST, ENG)) #1학 1층, 영어 - None - if exists(filepath_bldg1_2_kor) and exists(filepath_bldg1_2_eng): + if exists(filepath_bldg1_2_kor): parsing_result.extend(parsing(filepath_bldg1_2_kor, BLDG1_2ND, KOR)) #1학 2층, 한글 + if exists(filepath_bldg1_2_eng): parsing_result.extend(parsing(filepath_bldg1_2_eng, BLDG1_2ND, ENG)) #1학 2층, 영어 - None if exists(filepath_bldg2): parsing_result.extend(parsing(filepath_bldg2, BLDG2_1ST, KOR)) #2학 1층, 한글 parsing_result.extend(parsing(filepath_bldg2, BLDG2_1ST, ENG)) #2학 1층, 영어 - None print("-------------------------------------------------") From 3d3dc0620e203e064dcc52016d2a1f2b8cf9578f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Mon, 6 Mar 2023 13:22:44 +0900 Subject: [PATCH 02/13] fix(meal.py): amend Row range of Bldg.2 Excel (close #14) --- meal.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meal.py b/meal.py index 81c6bf7..7e8c6c7 100644 --- a/meal.py +++ b/meal.py @@ -82,7 +82,9 @@ def __init__(self) -> None: INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st INDEX_ENDPOINTS_BLDG1 = [[0, 0], [2, 12], [0, 0], [0, 0]] # Bldg.1 2nd INDEX_ENDPOINTS_BLDG1_EXCEPT = [4, 6] # 1학2층 엑셀은 숨겨진 행(5,7번) 존재하고 dummy 들어가있어 제외해야함. -INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 20], [22, 29], [20, 22]] # Bldg.2 1st +# INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 20], [22, 29], [20, 22]] # Bldg.2 1st +# 2023.03.06 식단부터 조식 메뉴 1개 줄었음. +INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st # allergy type according to allergy code ALGY_1_ING_KOR = ["난류", "우유", "메밀", "대두", "땅콩", "밀", From 3a86edf2a62ced138066b7d57eaa59f6a6162d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Tue, 14 Mar 2023 19:14:54 +0900 Subject: [PATCH 03/13] bug(excel): Fix row range (#14) --- .DS_Store | Bin 6148 -> 0 bytes meal.py | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 957934633b8788d3c889ebb17118bd8b18926102..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c!5S)c8f@o4w`U{Zw11Gu^6g2PyD5MNZMSm6F#g_rI4~AO*e@@b5#TJNCjU zF+Lp}q6Huh42N+Zy#%p&fY=MCL`G~;gpzkSlrBW>Sn7B#o~6x zTcpE!qDCno1&$Rs&*jqV|AziU|9?! None: INDEX_ENDPOINTS_BLDG1_EXCEPT = [4, 6] # 1학2층 엑셀은 숨겨진 행(5,7번) 존재하고 dummy 들어가있어 제외해야함. # INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 20], [22, 29], [20, 22]] # Bldg.2 1st # 2023.03.06 식단부터 조식 메뉴 1개 줄었음. -INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st - +# INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st +# 2023.03.13 식단부터 조식은 되돌아오고, 중식 메뉴 1개 줄었음. +INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 19], [21, 28], [19, 21]] # Bldg.2 1st # allergy type according to allergy code ALGY_1_ING_KOR = ["난류", "우유", "메밀", "대두", "땅콩", "밀", "새우", "돼지고기", "닭고기", "쇠고기", "오징어", From a315c88aead8ff712231fc9f2a5cc69ab1d783cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Sun, 2 Apr 2023 13:31:44 +0900 Subject: [PATCH 04/13] feat: Add morning special menu(remen) --- meal.py | 10 ++++++++-- util.py | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/meal.py b/meal.py index 5f3afd2..27ba71a 100644 --- a/meal.py +++ b/meal.py @@ -79,14 +79,20 @@ def __init__(self) -> None: DATE_INDEX_BLDG1 = 1 # Bldg.1 2nd DATE_INDEX_BLDG2 = 1 # Bldg.2 1st -INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st +# INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st +# 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 +INDEX_ENDPOINTS_BLDG0 = [[5, 15], [16, 23], [24, 31], [23, 24]] # Bldg.1 1st INDEX_ENDPOINTS_BLDG1 = [[0, 0], [2, 12], [0, 0], [0, 0]] # Bldg.1 2nd INDEX_ENDPOINTS_BLDG1_EXCEPT = [4, 6] # 1학2층 엑셀은 숨겨진 행(5,7번) 존재하고 dummy 들어가있어 제외해야함. # INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 20], [22, 29], [20, 22]] # Bldg.2 1st # 2023.03.06 식단부터 조식 메뉴 1개 줄었음. # INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st # 2023.03.13 식단부터 조식은 되돌아오고, 중식 메뉴 1개 줄었음. -INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 19], [21, 28], [19, 21]] # Bldg.2 1st +# INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 19], [21, 28], [19, 21]] # Bldg.2 1st +# 2023.03.20 식단의 메뉴 바뀜. +INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st + + # allergy type according to allergy code ALGY_1_ING_KOR = ["난류", "우유", "메밀", "대두", "땅콩", "밀", "새우", "돼지고기", "닭고기", "쇠고기", "오징어", diff --git a/util.py b/util.py index fd0e3ca..6140641 100644 --- a/util.py +++ b/util.py @@ -28,6 +28,11 @@ def parsing_breakfast(endpoint: list, data_sheet: list, langType: int, dateType: row_range = endpoint[BREAKFAST] menu = parsing_menu(row_range, data_sheet, langType, bldgType) special = "" + if bldgType == 0: + if langType == 0: + special = "셀프 즉석라면코너(라면*계란*흰밥*김치*시리얼*우유*토스트*야채샐러드)\n" + else: + special += "self ramen corner(ramen*egg*rice*kimchi* salad*toast*serial)\n" return menu, special From 514efe12801dcd3c61326f250e695275bc8cabb2 Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Mon, 15 May 2023 13:43:17 +0900 Subject: [PATCH 05/13] fix(Meal): remove Bldg.1 - morning - special menu parsing --- meal.py | 4 +++- util.py | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meal.py b/meal.py index 27ba71a..376c8f6 100644 --- a/meal.py +++ b/meal.py @@ -81,7 +81,9 @@ def __init__(self) -> None: # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st # 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 -INDEX_ENDPOINTS_BLDG0 = [[5, 15], [16, 23], [24, 31], [23, 24]] # Bldg.1 1st +# INDEX_ENDPOINTS_BLDG0 = [[5, 15], [16, 23], [24, 31], [23, 24]] # Bldg.1 1st +# 2023.05.06 조식 '즉석라면코너' 삭제됨 +INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st INDEX_ENDPOINTS_BLDG1 = [[0, 0], [2, 12], [0, 0], [0, 0]] # Bldg.1 2nd INDEX_ENDPOINTS_BLDG1_EXCEPT = [4, 6] # 1학2층 엑셀은 숨겨진 행(5,7번) 존재하고 dummy 들어가있어 제외해야함. # INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 20], [22, 29], [20, 22]] # Bldg.2 1st diff --git a/util.py b/util.py index 6140641..0046edd 100644 --- a/util.py +++ b/util.py @@ -28,11 +28,11 @@ def parsing_breakfast(endpoint: list, data_sheet: list, langType: int, dateType: row_range = endpoint[BREAKFAST] menu = parsing_menu(row_range, data_sheet, langType, bldgType) special = "" - if bldgType == 0: - if langType == 0: - special = "셀프 즉석라면코너(라면*계란*흰밥*김치*시리얼*우유*토스트*야채샐러드)\n" - else: - special += "self ramen corner(ramen*egg*rice*kimchi* salad*toast*serial)\n" + # if bldgType == 0: + # if langType == 0: + # special = "셀프 즉석라면코너(라면*계란*흰밥*김치*시리얼*우유*토스트*야채샐러드)\n" + # else: + # special += "self ramen corner(ramen*egg*rice*kimchi* salad*toast*serial)\n" return menu, special From e3bf84e1362c694106943e0b29a85e9e8e2b890d Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sun, 4 Jun 2023 23:03:49 +0900 Subject: [PATCH 06/13] =?UTF-8?q?1=ED=95=99=201=EC=B8=B5=20=EC=A1=B0?= =?UTF-8?q?=EC=8B=9D=20=EC=85=80=ED=94=84=20=EC=BD=94=EB=84=88=20=EC=9E=AC?= =?UTF-8?q?=EA=B0=9C=20=EB=B0=8F=20=EC=9D=B4=EB=B2=88=EC=A3=BC=20sheet=20?= =?UTF-8?q?=EC=88=98=201=EA=B0=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meal.py | 4 ++-- parsing.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meal.py b/meal.py index 376c8f6..14172b6 100644 --- a/meal.py +++ b/meal.py @@ -81,9 +81,9 @@ def __init__(self) -> None: # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st # 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 -# INDEX_ENDPOINTS_BLDG0 = [[5, 15], [16, 23], [24, 31], [23, 24]] # Bldg.1 1st +INDEX_ENDPOINTS_BLDG0 = [[5, 15], [16, 23], [24, 31], [23, 24]] # Bldg.1 1st # 2023.05.06 조식 '즉석라면코너' 삭제됨 -INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st +# INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st INDEX_ENDPOINTS_BLDG1 = [[0, 0], [2, 12], [0, 0], [0, 0]] # Bldg.1 2nd INDEX_ENDPOINTS_BLDG1_EXCEPT = [4, 6] # 1학2층 엑셀은 숨겨진 행(5,7번) 존재하고 dummy 들어가있어 제외해야함. # INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 20], [22, 29], [20, 22]] # Bldg.2 1st diff --git a/parsing.py b/parsing.py index 7fae5e8..8937926 100644 --- a/parsing.py +++ b/parsing.py @@ -31,7 +31,7 @@ def parsing(excel_path: str, bldgType: int, langType: int) -> list: index_col=None, header=None, names=None, engine='openpyxl') # 맨 뒤에서 2번째 sheet가 이번주 sheet - last_sheet = list(xl.keys())[-2] + last_sheet = list(xl.keys())[-1] sheet = xl[last_sheet] # 짝수 column만 사용 From fa900ee74637b255f23ad407b8e56d6784dc93bf Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sun, 4 Jun 2023 23:08:01 +0900 Subject: [PATCH 07/13] =?UTF-8?q?1=ED=95=99=201=EC=B8=B5=20=EC=A1=B0?= =?UTF-8?q?=EC=8B=9D=20=EC=85=80=ED=94=84=20=EC=BD=94=EB=84=88=20=ED=8C=8C?= =?UTF-8?q?=EC=8B=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util.py b/util.py index 0046edd..6140641 100644 --- a/util.py +++ b/util.py @@ -28,11 +28,11 @@ def parsing_breakfast(endpoint: list, data_sheet: list, langType: int, dateType: row_range = endpoint[BREAKFAST] menu = parsing_menu(row_range, data_sheet, langType, bldgType) special = "" - # if bldgType == 0: - # if langType == 0: - # special = "셀프 즉석라면코너(라면*계란*흰밥*김치*시리얼*우유*토스트*야채샐러드)\n" - # else: - # special += "self ramen corner(ramen*egg*rice*kimchi* salad*toast*serial)\n" + if bldgType == 0: + if langType == 0: + special = "셀프 즉석라면코너(라면*계란*흰밥*김치*시리얼*우유*토스트*야채샐러드)\n" + else: + special += "self ramen corner(ramen*egg*rice*kimchi* salad*toast*serial)\n" return menu, special From 18622c985d31f5c12768b59f11a5f81db65d9279 Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Mon, 12 Jun 2023 09:20:47 +0900 Subject: [PATCH 08/13] Bldg 1, 1F meal plan file is changed --- parsing.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/parsing.py b/parsing.py index 8937926..a4dea69 100644 --- a/parsing.py +++ b/parsing.py @@ -51,9 +51,13 @@ def parsing(excel_path: str, bldgType: int, langType: int) -> list: # 1학 1층 영어 elif bldgType == BLDG1_1ST and langType == 1: - sheet = pd.read_excel(excel_path, sheet_name=0, + xl = pd.read_excel(excel_path, sheet_name=None, index_col=None, header=None, names=None, engine='openpyxl') + # 맨 뒤에서 2번째 sheet가 이번주 sheet + last_sheet = list(xl.keys())[-1] + sheet = xl[last_sheet] + # 짝수 column만 사용 sheet_keys = sheet.keys()[start_col_idx: end_col_idx] sheet_keys = sheet_keys[0::2] From 9d06bbb9a8770d5bdaa4e2ac7860cbc18ba9693f Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sun, 12 Nov 2023 22:21:48 +0900 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20Bldg1.=201F=20=EC=97=91=EC=85=80?= =?UTF-8?q?=20=ED=8F=AC=EB=A7=B7=20=EB=B0=94=EB=80=9C.=20=EC=98=81?= =?UTF-8?q?=EC=96=91=EC=82=AC=20=EC=84=A0=EC=83=9D=EB=8B=98=20=EB=B0=94?= =?UTF-8?q?=EB=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meal.py | 8 ++++---- parsing.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meal.py b/meal.py index 14172b6..84d6091 100644 --- a/meal.py +++ b/meal.py @@ -70,18 +70,18 @@ def __init__(self) -> None: column 예외 존재 (2023.2.6의 1학1층한글 엑셀보면 쓸모없는 col이 있을 수 있음) 이를 위해 요일 있는 행의 index로 접근 ''' -EXCEL_COL_BLDG0 = [2, 11] +EXCEL_COL_BLDG0 = [2, 7] EXCEL_COL_BLDG0_EXCEPT = [] EXCEL_COL_BLDG1 = [1, 6] EXCEL_COL_BLDG2 = [3, 10] -DATE_INDEX_BLDG0 = 4 # Bldg.1 1st +DATE_INDEX_BLDG0 = 5 # Bldg.1 1st DATE_INDEX_BLDG1 = 1 # Bldg.1 2nd DATE_INDEX_BLDG2 = 1 # Bldg.2 1st # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st -# 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 -INDEX_ENDPOINTS_BLDG0 = [[5, 15], [16, 23], [24, 31], [23, 24]] # Bldg.1 1st +# 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 -> constant로 관리. 따로 파싱 row 안만듦. +INDEX_ENDPOINTS_BLDG0 = [[6, 16], [17, 25], [26, 33], [25, 26]] # Bldg.1 1st # 2023.05.06 조식 '즉석라면코너' 삭제됨 # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st INDEX_ENDPOINTS_BLDG1 = [[0, 0], [2, 12], [0, 0], [0, 0]] # Bldg.1 2nd diff --git a/parsing.py b/parsing.py index a4dea69..1c1f77f 100644 --- a/parsing.py +++ b/parsing.py @@ -36,7 +36,7 @@ def parsing(excel_path: str, bldgType: int, langType: int) -> list: # 짝수 column만 사용 sheet_keys = sheet.keys()[start_col_idx : end_col_idx] - sheet_keys = sheet_keys[0::2] + # sheet_keys = sheet_keys[0::2] for (dateType, date_str) in enumerate(sheet_keys): date_sheet = sheet[date_str] From dd3c8062993bb0327f44cf61ebfe1b526a4440eb Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sat, 25 Nov 2023 22:35:42 +0900 Subject: [PATCH 10/13] fix: Bldg.2 1F Excel format changed since nutritionist is changed --- meal.py | 6 ++++-- parsing.py | 2 +- util.py | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meal.py b/meal.py index 84d6091..7c8393e 100644 --- a/meal.py +++ b/meal.py @@ -77,7 +77,7 @@ def __init__(self) -> None: DATE_INDEX_BLDG0 = 5 # Bldg.1 1st DATE_INDEX_BLDG1 = 1 # Bldg.1 2nd -DATE_INDEX_BLDG2 = 1 # Bldg.2 1st +DATE_INDEX_BLDG2 = 5 # Bldg.2 1st # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st # 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 -> constant로 관리. 따로 파싱 row 안만듦. @@ -92,7 +92,9 @@ def __init__(self) -> None: # 2023.03.13 식단부터 조식은 되돌아오고, 중식 메뉴 1개 줄었음. # INDEX_ENDPOINTS_BLDG2 = [[2, 12], [12, 19], [21, 28], [19, 21]] # Bldg.2 1st # 2023.03.20 식단의 메뉴 바뀜. -INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st +# INDEX_ENDPOINTS_BLDG2 = [[2, 11], [11, 18], [20, 27], [18, 20]] # Bldg.2 1st +# 2023.11.25 2학 영양사님 바뀌셔서 양식 바뀜 +INDEX_ENDPOINTS_BLDG2 = [[6, 15], [17, 24], [24, 31], [15, 17]] # Bldg.2 1st # allergy type according to allergy code diff --git a/parsing.py b/parsing.py index 1c1f77f..aceeada 100644 --- a/parsing.py +++ b/parsing.py @@ -148,7 +148,7 @@ def parsingTest(): parsing_result.extend(parsing(filepath_bldg1_2_eng, BLDG1_2ND, ENG)) #1학 2층, 영어 if exists(filepath_bldg2): parsing_result.extend(parsing(filepath_bldg2, BLDG2_1ST, KOR)) #2학 1층, 한글 - parsing_result.extend(parsing(filepath_bldg2, BLDG2_1ST, ENG)) #2학 1층, 영어 + # parsing_result.extend(parsing(filepath_bldg2, BLDG2_1ST, ENG)) #2학 1층, 영어 print("-------------------------------------------------") diff --git a/util.py b/util.py index 6140641..2d21efc 100644 --- a/util.py +++ b/util.py @@ -89,6 +89,9 @@ def sanitize_menu(menu: str): return "" if type(menu) != str: return "" + if "---" in menu: + # dummy data in Bldg.2 (2023.11.25) + return "" return menu.rstrip("0123456789. ") From 5185a8c3ffcd5c890ea359388fee83dec6c88c49 Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:51:18 +0900 Subject: [PATCH 11/13] fix: Bldg.1 1F(eng) column interval is changed --- parsing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsing.py b/parsing.py index aceeada..7cf85ae 100644 --- a/parsing.py +++ b/parsing.py @@ -60,7 +60,7 @@ def parsing(excel_path: str, bldgType: int, langType: int) -> list: # 짝수 column만 사용 sheet_keys = sheet.keys()[start_col_idx: end_col_idx] - sheet_keys = sheet_keys[0::2] + # sheet_keys = sheet_keys[0::2] for (dateType, date_str) in enumerate(sheet_keys): date_sheet = sheet[date_str] From 1e7cae634e76f58535f42dffc6baf87e205c4aff Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sun, 24 Dec 2023 12:58:25 +0900 Subject: [PATCH 12/13] chore: Bldg.1-1F Dinner row range Changed --- meal.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meal.py b/meal.py index 7c8393e..9b5af21 100644 --- a/meal.py +++ b/meal.py @@ -81,7 +81,10 @@ def __init__(self) -> None: # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st # 2023.03.27 식단부터 조식에 '즉석라면코너' 신설됨 -> constant로 관리. 따로 파싱 row 안만듦. -INDEX_ENDPOINTS_BLDG0 = [[6, 16], [17, 25], [26, 33], [25, 26]] # Bldg.1 1st +# INDEX_ENDPOINTS_BLDG0 = [[6, 16], [17, 25], [26, 33], [25, 26]] # Bldg.1 1st +# 2023.12.24 dinner 메뉴 하나 줄음 +INDEX_ENDPOINTS_BLDG0 = [[6, 16], [17, 25], [26, 32], [25, 26]] # Bldg.1 1st + # 2023.05.06 조식 '즉석라면코너' 삭제됨 # INDEX_ENDPOINTS_BLDG0 = [[5, 15], [15, 22], [23, 30], [22, 23]] # Bldg.1 1st INDEX_ENDPOINTS_BLDG1 = [[0, 0], [2, 12], [0, 0], [0, 0]] # Bldg.1 2nd From 1fdf093b7437b7e732a1059490142e902ef2009f Mon Sep 17 00:00:00 2001 From: san <55998816+kimtks456@users.noreply.github.com> Date: Sun, 31 Mar 2024 17:32:21 +0900 Subject: [PATCH 13/13] =?UTF-8?q?chore:=20Bldg1-1F=20=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=ED=8C=8C=EC=8B=B1=20=EC=9A=A9=EC=9D=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util.py b/util.py index 2d21efc..4fcb4c3 100644 --- a/util.py +++ b/util.py @@ -8,6 +8,8 @@ def parsing_date(time_index: int, data_sheet: list): date = str(data_sheet[time_index]) + if '.' in date: + date = date.replace('.', '-') return date[:DATE_LEN] if len(date) > DATE_LEN else date