From c3596e14eb8b5381439c13cc0ffa32ae3fdd8a72 Mon Sep 17 00:00:00 2001 From: BackGwa Date: Sat, 5 Nov 2022 20:42:34 +0900 Subject: [PATCH] Improve source code and fix bugs [Improvement points] -> Some conditional statements have been changed to ternary operators. [Fixed bug] -> The problem of printing the meal information after two days has been fixed. --- johnson.py | 7 ++----- main.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/johnson.py b/johnson.py index b46de55..03c1ee7 100644 --- a/johnson.py +++ b/johnson.py @@ -57,7 +57,7 @@ def meal_zone(JSON, usetime, meal_value): mealzone = 'lunch' elif(hour > 14): mealzone = 'dinner' - + elif(islc): mealzone = 'lunch' @@ -65,10 +65,7 @@ def meal_zone(JSON, usetime, meal_value): mealzone = 'None' if(usetime): - if(mealzone != 'None'): - result = [mealzone] + data['menu'][0][f'{mealzone}'] - else: - result = ['급식 정보가 존재하지 않습니다.'] + result = ([mealzone] + data['menu'][0][f'{mealzone}']) if (mealzone != 'None') else ['급식 정보가 존재하지 않습니다.'] elif((data['menu'][0][mealzone]) != []): result = [mealzone] + data['menu'][0][f'{mealzone}'] diff --git a/main.py b/main.py index 9d2f82d..59788e6 100644 --- a/main.py +++ b/main.py @@ -8,8 +8,8 @@ # 알레르기 정보 >> [표시] : True | [숨기기] : False # 급식 시간대 >> [조식] : breakfast | [중식] : lunch | [석식] : dinner -date = [0, 0, 2] # 날짜추가 : 현재 날짜에서 추가하고 싶은 [년, 월, 일] -result = meal.now('high', 'N100000164', date, True, True) # meal.now(학교타입, 학교코드, 날짜추가, 알레르기 정보 표시, 자동 가져오기, 급식 시간대) +date = [0, 0, 0] # 날짜추가 : 현재 날짜에서 추가하고 싶은 [년, 월, 일] +result = meal.now('high', 'N100000164', date, False, True) # meal.now(학교타입, 학교코드, 날짜추가, 알레르기 정보 표시, 자동 가져오기, 급식 시간대) for value in result: print(value) \ No newline at end of file