новый формат для вывода оценок

This commit is contained in:
Faridik 2022-09-27 21:31:24 +03:00
parent 21381f724b
commit d0bf0f5a2d
2 changed files with 9 additions and 2 deletions

View File

@ -263,7 +263,7 @@ class Manager:
assignment_value = list(map(toFloat, assignment_values[student.number - 1])) assignment_value = list(map(toFloat, assignment_values[student.number - 1]))
notes_range, n_row = row[ASSIGNMENT_NOTES_RANGES].split(",") notes_range, n_row = row[ASSIGNMENT_NOTES_RANGES].split(",")
note = self.get_values(notes_range)[student.number - 1][int(n_row)] 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( student.add_assignment(
Assignment( Assignment(
name=row[ASSIGNMENT_NAMES], name=row[ASSIGNMENT_NAMES],

View File

@ -50,8 +50,15 @@ class Messages:
+ "\n" + "\n"
) )
summary += f"Σ: {to_str(sum(assignment))}\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 != "-": if deadline != "-":
summary += f"\n🕚 Дедлайн: {deadline}\n" summary += f"\n🕚 Дедлайн: {deadline}\n"
if notes:
summary += f"\n📝 {notes}" summary += f"\n📝 {notes}"
return summary return summary