diff --git a/GoogleService/manager/manager.py b/GoogleService/manager/manager.py index 0730a30..52fd182 100644 --- a/GoogleService/manager/manager.py +++ b/GoogleService/manager/manager.py @@ -263,7 +263,7 @@ class Manager: assignment_value = list(map(toFloat, assignment_values[student.number - 1])) notes_range, n_row = row[ASSIGNMENT_NOTES_RANGES].split(",") note = self.get_values(notes_range)[student.number - 1][int(n_row)] - note = "Замечаний по работе нет." if note == "-" else f"Замечания:\n{note}" + note = "" if note == "-" else f"Замечания:\n{note}" student.add_assignment( Assignment( name=row[ASSIGNMENT_NAMES], diff --git a/TelegramBot/messages/messages.py b/TelegramBot/messages/messages.py index b7f297b..9db7f2f 100644 --- a/TelegramBot/messages/messages.py +++ b/TelegramBot/messages/messages.py @@ -50,9 +50,16 @@ class Messages: + "\n" ) summary += f"Σ: {to_str(sum(assignment))}\n" + elif is_float == "s": + for item in range(0, len(assignment), n_cols): + summary += ( + " ".join(list(map(to_str, assignment[item : item + n_cols]))) + + "\n" + ) if deadline != "-": summary += f"\n🕚 Дедлайн: {deadline}\n" - summary += f"\n📝 {notes}" + if notes: + summary += f"\n📝 {notes}" return summary @staticmethod