From 15295d92ad7d08895fae34dd7f7c13b0aa2f4ea7 Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Fri, 2 Aug 2019 14:06:58 +0200 Subject: [PATCH] main change names --- main.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/main.py b/main.py index 3d7b3f9..4c44759 100644 --- a/main.py +++ b/main.py @@ -5,19 +5,30 @@ subjects = [] try: while True: user_input = user_IO.user_input() - if user_input[0] == "input": - if user_input[1] == "grade": - subject_edit = subject.get_subject(subjects, user_input[2]) + input_or_output = user_input[0] + if input_or_output == "input": + _edit = user_input[1] + _subject = user_input[2] + if _edit == "grade": + _category = user_input[3] + _grade = user_input[4] + _grade_name = user_input[5] + subject_edit = subject.get_subject(subjects, _subject) if subject_edit: - subject_edit.add_grade(user_input[3], subject.Grade(user_input[4], user_input[5])) - elif user_input[1] == "category": - subject_edit = subject.get_subject(subjects, user_input[2]) + subject_edit.add_grade(_category, subject.Grade(_grade, _grade_name)) + elif _edit == "category": + _category = user_input[3] + _rating = user_input[4] + subject_edit = subject.get_subject(subjects, _subject) if subject_edit: - subject_edit.add_grade_category(user_input[3], user_input[4]) - elif user_input[1] == "subject": - subjects.append(subject.Subject(user_input[2], user_input[3], user_input[4])) - elif user_input[0] == "output": - subject_get = subject.get_subject(subjects, user_input[1]) + subject_edit.add_grade_category(_category, _rating) + elif _edit == "subject": + _main = user_input[3] + _oral = user_input[4] + subjects.append(subject.Subject(_subject, _main, _oral)) + elif input_or_output == "output": + _subject = user_input[1] + subject_get = subject.get_subject(subjects, _subject) user_IO.user_output(subject_get.return_average_subject) raise SystemError