Update calendar_app.py

calendar_app.py

@@ -114,71 +114,75 @@ class Calendar:
                     print_counter+=1
 
 
+#############################
+# Input validation functions
+def check_valid_menu_choice(choice):
+    """Input sanitation for valid menu choice from 1 and 7."""
+    if not choice.isdigit() or int(choice) < 1 or int(choice) > 7:
+        print(f"Invalid choice: {choice}. Please choose an option number from 1 to 7.")
+        return "invalid_choice"
+    else:
+        return "valid_choice"
+
+def check_valid_date(date):
+    """Input sanitation for valid date format"""
+    date_parts = date.split("-")
+    count_date_parts = len(date_parts)
+
+    # check 3 date parts are found: YYYY, MM, DD
+    if count_date_parts<3:
+        print(f"You entered {date} containing only {count_date_parts} date parts. Please enter date in YYYY-MM-DD format")
+        return "invalid_date"
+
+    # check separator of date parts
+    elif "." in date:
+        print(f"You entered {date} split on '.'. Please enter date in YYYY-MM-DD format split by '-'")
+        return "invalid_date"
+    elif "/" in date:
+        print(f"You entered {date} split on '/'. Please enter date in YYYY-MM-DD format split by '-'")
+        return "invalid_date"
+
+    # check length of date parts
+    elif len(date_parts[0])!=4:
+        print(f"You entered {date} with year value {date_parts[0]}. Please enter date in YYYY-MM-DD format, starting with a 4-digit year")
+        return "invalid_date"
+    elif len(date_parts[1])!=2:
+        print(f"You entered {date} with month value {date_parts[1]}. Please enter date in YYYY-MM-DD format, with a 2-digit month in the middle")
+        return "invalid_date"
+    elif len(date_parts[2])!=2:
+        print(f"You entered {date} with day value {date_parts[2]}. Please enter date in YYYY-MM-DD format, with a 2-digit day at the end")
+        return "invalid_date"
+
+    # in this last scenario, we have a valid date
+    else:
+        return "valid_date"
+        
+def check_valid_date_range(date_start, date_end):
+    """Input sanitation for start date before OR equal to the end date."""
+    if datetime.datetime.strptime(date_start, '%Y-%m-%d') > datetime.datetime.strptime(date_end, '%Y-%m-%d'):
+        print(f"Error: Start date {date_start} is after end date {date_end}.\nPlease enter end date after the start date {date_start}.")
+        return "invalid_range"
+    else:
+        return "valid_range"
+
+def check_valid_month(month):
+    """Input sanitation for month string between 1 and 12."""
+    if not month.isdigit() or int(month) < 1 or int(month) > 12:
+        print(f"Invalid month: {month}. Please enter a month from 01 to 12.")
+        return "invalid_month"
+    else:
+        return "valid_month"
+
+def check_valid_reminder(reminder):
+    """Input sanitation for reminder description."""
+    if len(reminder.strip())<1 or reminder is None:
+        print("Error: Reminder description cannot be empty.")
+        return "invalid_reminder"
+    else:
+        return "valid_reminder"
+#############################
 
-    def check_valid_menu_choice(choice):
-        """Input sanitation for valid menu choice from 1 and 7."""
-        if not choice.isdigit() or int(choice) < 1 or int(choice) > 7:
-            print(f"Invalid choice: {choice}. Please choose an option number from 1 to 7.")
-            return "invalid_choice"
-        else:
-            return "valid_choice"
-    
-    def check_valid_date(date):
-        """Input sanitation for valid date format"""
-        date_parts = date.split("-")
-        count_date_parts = len(date_parts)
-
-        # check 3 date parts are found: YYYY, MM, DD
-        if count_date_parts<3:
-            print(f"You entered {date} containing only {count_date_parts} date parts. Please enter date in YYYY-MM-DD format")
-            return "invalid_date"
-
-        # check separator of date parts
-        elif "." in date:
-            print(f"You entered {date} split on '.'. Please enter date in YYYY-MM-DD format split by '-'")
-            return "invalid_date"
-        elif "/" in date:
-            print(f"You entered {date} split on '/'. Please enter date in YYYY-MM-DD format split by '-'")
-            return "invalid_date"
-
-        # check length of date parts
-        elif len(date_parts[0])!=4:
-            print(f"You entered {date} with year value {date_parts[0]}. Please enter date in YYYY-MM-DD format, starting with a 4-digit year")
-            return "invalid_date"
-        elif len(date_parts[1])!=2:
-            print(f"You entered {date} with month value {date_parts[1]}. Please enter date in YYYY-MM-DD format, with a 2-digit month in the middle")
-            return "invalid_date"
-        elif len(date_parts[2])!=2:
-            print(f"You entered {date} with day value {date_parts[2]}. Please enter date in YYYY-MM-DD format, with a 2-digit day at the end")
-            return "invalid_date"
-
-        # in this last scenario, we have a valid date
-        else:
-            return "valid_date"
-            
-    def check_valid_date_range(date_start, date_end):
-        """Input sanitation for start date before OR equal to the end date."""
-        if datetime.strptime(date_start, '%Y-%m-%d') > datetime.strptime(date_end, '%Y-%m-%d'):
-            print(f"Error: Start date {date_start} is after end date {date_end}.\nPlease enter end date after the start date {date_start}.")
-            return "invalid_range"
-        else:
-            return "valid_range"
 
-    def check_valid_month(month):
-        """Input sanitation for month string between 1 and 12."""
-        if not month.isdigit() or int(month) < 1 or int(month) > 12:
-            print(f"Invalid month: {month}. Please enter a month from 01 to 12.")
-            return "invalid_month"
-        else:
-            return "valid_month"
-
-    def check_valid_reminder(reminder):
-        """Input sanitation for reminder description."""
-        if len(reminder)<1 or reminder is None:
-            print("Error: Reminder description cannot be empty.")
-            return "invalid_reminder"
-        else:
-            return "valid_reminder"
 
 
 if __name__ == "__main__":
@@ -225,10 +229,10 @@ if __name__ == "__main__":
             elif choice == "2":
                 while True:
                     date_start = input("Enter start date (YYYY-MM-DD): ")
-                        if check_valid_date(date_start) == "invalid_date":
-                            continue
-                        else:
-                            break
+                    if check_valid_date(date_start) == "invalid_date":
+                        continue
+                    else:
+                        break
                 
                 while True:
                     date_end = input("Enter end date (YYYY-MM-DD): ")
@@ -279,7 +283,7 @@ if __name__ == "__main__":
             elif choice == "6":
                 while True:
                     user_mth = input("Enter month number (MM): ")
-                    if check_valid_month(month) == "invalid_month":
+                    if check_valid_month(user_mth) == "invalid_month":
                         continue
                     else:
                         break