From 614e24fad168c2e05ed0da4e9e0f73e352e5e5ed Mon Sep 17 00:00:00 2001 From: tstst334 Date: Fri, 2 Aug 2019 14:10:46 +0200 Subject: [PATCH 1/7] user outepu --- subject.py | 6 +++--- user_IO.py | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/subject.py b/subject.py index 2c8c6eb..f2454a5 100644 --- a/subject.py +++ b/subject.py @@ -14,13 +14,13 @@ class Subject: def add_grade(self, category, grade): self.grades[category][0].append(grade) - def return_grades(self, category): + def return_grades(self, category): # Return all grades in one category return self.grades[category][0] - def return_grade_categories(self): + def return_grade_categories(self): # Return all categories return [i for i in self.grades] - def return_average_of_category(self, category): + def return_average_of_category(self, category): # Return average of one categorie return sum(self.grades[category][0]) / len(self.grades[category][0]) def return_average_of_subject(self): diff --git a/user_IO.py b/user_IO.py index f399d07..a7fc11a 100644 --- a/user_IO.py +++ b/user_IO.py @@ -33,6 +33,10 @@ def user_input(): return "input", "grade", subject, category, grade, grade_name -def user_output(i): - # just filled with some standard output, has to be filled further - print(i) \ No newline at end of file +def user_output(subject, categories, average): + print("\n\n In the subject [] are the following categories:".format(subject)) + for counter, category in enumerate(categories): + print("The average in [] is [] with these grades:".format(category, average[counter])) + for grade in category: + print(grade) + print("\n") -- 2.39.5 From 74ed08e01127497293264341bcc2945c00493ec0 Mon Sep 17 00:00:00 2001 From: tstst334 Date: Fri, 2 Aug 2019 14:19:41 +0200 Subject: [PATCH 2/7] user_outeput --- user_IO.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user_IO.py b/user_IO.py index a7fc11a..db33578 100644 --- a/user_IO.py +++ b/user_IO.py @@ -1,15 +1,15 @@ def user_input(): - todo = input("Ok, do you want to see them or to edit them? [see/edit]\n") + todo = input("Ok, do you want to see them or to edit them [see/edit]?\n") if todo == "see": print("Which subject do you want to know the information?") subject = input() return "output", subject elif todo == "edit": - print("Do you want to add a subject, a category or a grade? [subject/category/grade]") + print("Do you want to add a subject, a category or a grade [subject/category/grade]?") user_add = input() if user_add == "subject": subject = input("Which subject do you want to add? \n") - main_subject = input("Is this subject a main subject (Hauptfach)[y/n]? \n") + main_subject = input("Is this subject a main subject [y/n]? \n") if main_subject == 'y': main_subject = True elif main_subject == 'n': @@ -34,9 +34,9 @@ def user_input(): def user_output(subject, categories, average): - print("\n\n In the subject [] are the following categories:".format(subject)) + print("\n\n In the subject {} are the following categories:".format(subject)) for counter, category in enumerate(categories): - print("The average in [] is [] with these grades:".format(category, average[counter])) - for grade in category: + print("The average in {} is {} with these grades:".format(category, average[counter])) + for grade in categories[category]: print(grade) print("\n") -- 2.39.5 From 80d34b8bcc7354d807b990a0e95201e2a41cec4b Mon Sep 17 00:00:00 2001 From: tstst334 Date: Fri, 2 Aug 2019 14:23:02 +0200 Subject: [PATCH 3/7] user_outeput --- user_IO.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_IO.py b/user_IO.py index db33578..9e95b31 100644 --- a/user_IO.py +++ b/user_IO.py @@ -37,6 +37,7 @@ def user_output(subject, categories, average): print("\n\n In the subject {} are the following categories:".format(subject)) for counter, category in enumerate(categories): print("The average in {} is {} with these grades:".format(category, average[counter])) + string = "" for grade in categories[category]: - print(grade) + string += str(grade) + ", " print("\n") -- 2.39.5 From 0bde875b3d4a91965cce1bfe2287d6335989d9de Mon Sep 17 00:00:00 2001 From: tstst334 Date: Fri, 2 Aug 2019 14:24:10 +0200 Subject: [PATCH 4/7] user_outeput --- user_IO.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_IO.py b/user_IO.py index 9e95b31..c9d8d23 100644 --- a/user_IO.py +++ b/user_IO.py @@ -40,4 +40,5 @@ def user_output(subject, categories, average): string = "" for grade in categories[category]: string += str(grade) + ", " - print("\n") + + print(string + "\n") -- 2.39.5 From 5fe13cc7523488a3a45d43e5afae0d549c0da508 Mon Sep 17 00:00:00 2001 From: tstst334 Date: Fri, 2 Aug 2019 14:26:40 +0200 Subject: [PATCH 5/7] user_outeput --- user_IO.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_IO.py b/user_IO.py index c9d8d23..42a61d5 100644 --- a/user_IO.py +++ b/user_IO.py @@ -33,12 +33,12 @@ def user_input(): return "input", "grade", subject, category, grade, grade_name -def user_output(subject, categories, average): +def user_output(subject, categories, average, average_subject): print("\n\n In the subject {} are the following categories:".format(subject)) for counter, category in enumerate(categories): print("The average in {} is {} with these grades:".format(category, average[counter])) string = "" for grade in categories[category]: string += str(grade) + ", " - print(string + "\n") + print("The average of {} is {}.".format(subject, average_subject)) -- 2.39.5 From 8022eb889961c7677b34da1ea11cb313f8e9024a Mon Sep 17 00:00:00 2001 From: tstst334 Date: Fri, 2 Aug 2019 15:15:41 +0200 Subject: [PATCH 6/7] serializr --- serializer.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 serializer.py diff --git a/serializer.py b/serializer.py new file mode 100644 index 0000000..b0b496b --- /dev/null +++ b/serializer.py @@ -0,0 +1,6 @@ +def serialize(subject): + string = subject.__dict__ + for category in string["grades"]: + for counter, grade in enumerate(string["grades"][category][0]): + string["grades"][category][0][counter] = grade.__dict__ + return str(string) -- 2.39.5 From 44a392aca9059f60390e36bb8372d5ab30d8caed Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Fri, 2 Aug 2019 15:33:11 +0200 Subject: [PATCH 7/7] encryption --- encryption.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 encryption.py diff --git a/encryption.py b/encryption.py new file mode 100644 index 0000000..2a05c95 --- /dev/null +++ b/encryption.py @@ -0,0 +1,31 @@ +from Crypto.Cipher import AES +import random +import string + + +def encrypt(password, text): + random.seed(password) + letters = string.ascii_lowercase + password = ''.join(random.choice(letters) for i in range(32)) + add = 16 - (len(text) % 16) + for i in range(add): + text += " " + chiffre = AES.new(password, AES.MODE_ECB) + chiffrat = chiffre.encrypt(text) + return chiffrat + + +def decrypt(password, chiffrat): + random.seed(password) + letters = string.ascii_lowercase + password = ''.join(random.choice(letters) for i in range(32)) + chiffre = AES.new(password, AES.MODE_ECB) + text = chiffre.decrypt(chiffrat) + temp_text = text.decode('ascii') + for counter, letter in enumerate(reversed(text.decode('ascii'))): + if letter == " ": + temp_text = temp_text[:-1] + else: + break + text = temp_text + return text -- 2.39.5