diff --git a/smash/web/models/appointment.py b/smash/web/models/appointment.py index d20214f26a02c4f49df9525db8e84af8d8d78473..35f82ed4c74c6fed826c1aaa55c20e5135dc6f40 100644 --- a/smash/web/models/appointment.py +++ b/smash/web/models/appointment.py @@ -81,7 +81,10 @@ class Appointment(models.Model): start = self.datetime_when.strftime('%Y-%m-%d %H:%M') if self.visit is not None: subject = self.visit.subject.subject - return f'#{self.visit.visit_number:02} | {start} ({self.length} min) | {subject.first_name} {subject.last_name} | {self.status}' + return f'#{self.visit.visit_number:02} ' \ + f'| {start} ({self.length} min) ' \ + f'| {subject.first_name} {subject.last_name} ' \ + f'| {self.status}' else: return f'{start} ({self.length} min) | {self.status}' @@ -113,19 +116,19 @@ class Appointment(models.Model): result = self.location.color else: priority = 1000000 - for type in self.appointment_types.all(): - if type.calendar_color_priority < priority: - priority = type.calendar_color_priority - result = type.calendar_color + for appointment_type in self.appointment_types.all(): + if appointment_type.calendar_color_priority < priority: + priority = appointment_type.calendar_color_priority + result = appointment_type.calendar_color return result def font_color(self): result = APPOINTMENT_TYPE_DEFAULT_FONT_COLOR priority = 1000000 - for type in self.appointment_types.all(): - if type.calendar_color_priority < priority: - priority = type.calendar_color_priority - result = type.calendar_font_color + for appointment_type in self.appointment_types.all(): + if appointment_type.calendar_color_priority < priority: + priority = appointment_type.calendar_color_priority + result = appointment_type.calendar_font_color return result def title(self):