From 660bf14cad1e272d5ecde7658043e53e37b845ec Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 30 Jul 2019 16:07:54 +0200 Subject: [PATCH 1/2] added class subject and grade --- subject.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 subject.py diff --git a/subject.py b/subject.py new file mode 100644 index 0000000..d113228 --- /dev/null +++ b/subject.py @@ -0,0 +1,22 @@ +from datetime import datetime as str_date + + +class Subject: + def __init__(self, name, main_subject, oral_exam): + self.name = name + self.grades = {} + self.main_subject = main_subject + self.oral_exam = oral_exam + + def add_grade_category(self, name, rating): + self.grades[name] = ([], rating) + + def add_grade(self, category, grade): + self.grades[category][0].append(grade) + + +class Grade: + def __init__(self, grade, name, date=str(str_date.now())): + self.grade = grade + self.name = name + self.date = date From 5f4b4c491eb230d6687d5ca7e1410be1687fb4bd Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 30 Jul 2019 16:18:20 +0200 Subject: [PATCH 2/2] edited class subject and grade --- subject.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/subject.py b/subject.py index d113228..6e19562 100644 --- a/subject.py +++ b/subject.py @@ -14,6 +14,12 @@ class Subject: def add_grade(self, category, grade): self.grades[category][0].append(grade) + def return_grades(self, category): + return self.grades[category][0] + + def return_grade_categories(self): + return [i for i in self.grades] + class Grade: def __init__(self, grade, name, date=str(str_date.now())):