diff --git a/SpreadsheetsService/models/assignment.py b/SpreadsheetsService/models/assignment.py index d24f096..7e85fa7 100644 --- a/SpreadsheetsService/models/assignment.py +++ b/SpreadsheetsService/models/assignment.py @@ -1,7 +1,8 @@ class Assignment: """Задание.""" - def __init__(self, weight: float, values): + def __init__(self, name: str, values: list, weight: float=1): + self.name = name self.weight = weight self.values = values diff --git a/SpreadsheetsService/models/student.py b/SpreadsheetsService/models/student.py index df2952d..75be056 100644 --- a/SpreadsheetsService/models/student.py +++ b/SpreadsheetsService/models/student.py @@ -4,10 +4,11 @@ from .assignment import Assignment class Student: """Позволяет выполнять операции над студентами.""" - def __init__(self, number: int, name: str): + def __init__(self, number: int, name: str, group_id : int, tg_id : int = None): self.number: int = number self.name: str = name - self.tg_id = None + self.group_id: int = group_id + self.tg_id: int = tg_id self.assignments = [] def add_assignment(self, assignment: Assignment):