Frozenverse/ANALYSE-8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added postcode validation

Browse Source
This commit is contained in:
Nick Leeman 2022-10-09 14:32:55 +02:00
parent 8a09d27bf4
commit 274549f04b
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/input_menu.py
View File

@ -34,6 +34,11 @@ class Validator:
regex = re.compile(r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,31}$') regex = re.compile(r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,31}$')
return re.fullmatch(regex, input) return re.fullmatch(regex, input)
@staticmethod
def check_postcode(input):
regex = re.compile(r'\b\d{4}[A-Z]{2}\b')
return re.fullmatch(regex, input)
class InputMenu: class InputMenu:
def __init__(self, title): def __init__(self, title):

4
views/advisor_menu.py
View File

@ -62,7 +62,7 @@ class AdvisorMenu:
form.add_option("FIRSTNAME", "Firstname", "STR", None, 1, 250, None) form.add_option("FIRSTNAME", "Firstname", "STR", None, 1, 250, None)
form.add_option("LASTNAME", "Lastname", "STR", None, 1, 250, None) form.add_option("LASTNAME", "Lastname", "STR", None, 1, 250, None)
form.add_option("ADDRESS", "Address", "STR", None, 1, 250, None) form.add_option("ADDRESS", "Address", "STR", None, 1, 250, None)
form.add_option("ZIPCODE", "Zipcode", "STR", None, 6, 6, None) form.add_option("ZIPCODE", "Zipcode", "STR", None, 6, 6, Validator.check_postcode)
form.add_option("EMAIL", "Email", "STR", None, 1, 250, Validator.check_email) form.add_option("EMAIL", "Email", "STR", None, 1, 250, Validator.check_email)
form.add_option("PHONE", "Phone (+31-6)", "STR", None, 8, 8, None) form.add_option("PHONE", "Phone (+31-6)", "STR", None, 8, 8, None)
form.add_option("PASSWORD", "Password", "STR", None, 1, 255, Validator.check_password) form.add_option("PASSWORD", "Password", "STR", None, 1, 255, Validator.check_password)
@ -97,7 +97,7 @@ class AdvisorMenu:
edit_form.add_option("FIRSTNAME", "Firstname", "STR", user.firstname, 1, 250, None) edit_form.add_option("FIRSTNAME", "Firstname", "STR", user.firstname, 1, 250, None)
edit_form.add_option("LASTNAME", "Lastname", "STR", user.lastname, 1, 250, None) edit_form.add_option("LASTNAME", "Lastname", "STR", user.lastname, 1, 250, None)
edit_form.add_option("ADDRESS", "Address", "STR", user.address, 1, 250, None) edit_form.add_option("ADDRESS", "Address", "STR", user.address, 1, 250, None)
edit_form.add_option("ZIPCODE", "Zipcode", "STR", user.zipcode, 6, 6, None) edit_form.add_option("ZIPCODE", "Zipcode", "STR", user.zipcode, 6, 6, Validator.check_postcode)
edit_form.add_option("EMAIL", "Email", "STR", user.email, 1, 250, Validator.check_email) edit_form.add_option("EMAIL", "Email", "STR", user.email, 1, 250, Validator.check_email)
edit_form.add_option("PHONE", "Phone (+31-6)", "STR", user.phone, 8, 8, None) edit_form.add_option("PHONE", "Phone (+31-6)", "STR", user.phone, 8, 8, None)
edit_form.do_input() edit_form.do_input()

4
views/member_menu.py
View File

@ -62,7 +62,7 @@ class MemberMenu:
form.add_option("FIRSTNAME", "Firstname", "STR", None, 1, 250, None) form.add_option("FIRSTNAME", "Firstname", "STR", None, 1, 250, None)
form.add_option("LASTNAME", "Lastname", "STR", None, 1, 250, None) form.add_option("LASTNAME", "Lastname", "STR", None, 1, 250, None)
form.add_option("ADDRESS", "Address", "STR", None, 1, 250, None) form.add_option("ADDRESS", "Address", "STR", None, 1, 250, None)
form.add_option("ZIPCODE", "Zipcode", "STR", None, 6, 6, None) form.add_option("ZIPCODE", "Zipcode", "STR", None, 6, 6, Validator.check_postcode)
form.add_option("EMAIL", "Email", "STR", None, 1, 250, Validator.check_email) form.add_option("EMAIL", "Email", "STR", None, 1, 250, Validator.check_email)
form.add_option("PHONE", "Phone (+31-6)", "STR", None, 8, 8, None) form.add_option("PHONE", "Phone (+31-6)", "STR", None, 8, 8, None)
form.do_input() form.do_input()
@ -95,7 +95,7 @@ class MemberMenu:
edit_form.add_option("FIRSTNAME", "Firstname", "STR", user.firstname, 1, 250, None) edit_form.add_option("FIRSTNAME", "Firstname", "STR", user.firstname, 1, 250, None)
edit_form.add_option("LASTNAME", "Lastname", "STR", user.lastname, 1, 250, None) edit_form.add_option("LASTNAME", "Lastname", "STR", user.lastname, 1, 250, None)
edit_form.add_option("ADDRESS", "Address", "STR", user.address, 1, 250, None) edit_form.add_option("ADDRESS", "Address", "STR", user.address, 1, 250, None)
edit_form.add_option("ZIPCODE", "Zipcode", "STR", user.zipcode, 6, 6, None) edit_form.add_option("ZIPCODE", "Zipcode", "STR", user.zipcode, 6, 6, Validator.check_postcode)
edit_form.add_option("EMAIL", "Email", "STR", user.email, 1, 250, Validator.check_email) edit_form.add_option("EMAIL", "Email", "STR", user.email, 1, 250, Validator.check_email)
edit_form.add_option("PHONE", "Phone (+31-6)", "STR", user.phone, 8, 8, None) edit_form.add_option("PHONE", "Phone (+31-6)", "STR", user.phone, 8, 8, None)
edit_form.do_input() edit_form.do_input()

5
views/system_admin_menu.py
View File

@ -62,7 +62,7 @@ class SystemAdminMenu:
form.add_option("FIRSTNAME", "Firstname", "STR", None, 1, 250, None) form.add_option("FIRSTNAME", "Firstname", "STR", None, 1, 250, None)
form.add_option("LASTNAME", "Lastname", "STR", None, 1, 250, None) form.add_option("LASTNAME", "Lastname", "STR", None, 1, 250, None)
form.add_option("ADDRESS", "Address", "STR", None, 1, 250, None) form.add_option("ADDRESS", "Address", "STR", None, 1, 250, None)
form.add_option("ZIPCODE", "Zipcode", "STR", None, 6, 6, None) form.add_option("ZIPCODE", "Zipcode", "STR", None, 6, 6, Validator.check_postcode)
form.add_option("EMAIL", "Email", "STR", None, 1, 250, Validator.check_email) form.add_option("EMAIL", "Email", "STR", None, 1, 250, Validator.check_email)
form.add_option("PHONE", "Phone (+31-6)", "STR", None, 8, 8, None) form.add_option("PHONE", "Phone (+31-6)", "STR", None, 8, 8, None)
form.add_option("PASSWORD", "Password", "STR", None, 1, 255, Validator.check_password) form.add_option("PASSWORD", "Password", "STR", None, 1, 255, Validator.check_password)
@ -100,8 +100,7 @@ class SystemAdminMenu:
edit_form.add_option("FIRSTNAME", "Firstname", "STR", user.firstname, 1, 250, None) edit_form.add_option("FIRSTNAME", "Firstname", "STR", user.firstname, 1, 250, None)
edit_form.add_option("LASTNAME", "Lastname", "STR", user.lastname, 1, 250, None) edit_form.add_option("LASTNAME", "Lastname", "STR", user.lastname, 1, 250, None)
edit_form.add_option("ADDRESS", "Address", "STR", user.address, 1, 250, None) edit_form.add_option("ADDRESS", "Address", "STR", user.address, 1, 250, None)
edit_form.add_option("ZIPCODE", "Zipcode", "STR", user.zipcode, 6, 6, None) edit_form.add_option("ZIPCODE", "Zipcode", "STR", user.zipcode, 6, 6, Validator.check_postcode)
edit_form.add_option("CITY_ID", "City", "STR", user.city_id, 1, 250, None)
edit_form.add_option("EMAIL", "Email", "STR", user.email, 1, 250, Validator.check_email) edit_form.add_option("EMAIL", "Email", "STR", user.email, 1, 250, Validator.check_email)
edit_form.add_option("PHONE", "Phone (+31-6)", "STR", user.phone, 8, 8, None) edit_form.add_option("PHONE", "Phone (+31-6)", "STR", user.phone, 8, 8, None)
edit_form.do_input() edit_form.do_input()