specific colors added to cancelled and no show appointments

smash/web/models/__init__.py

@@ -5,6 +5,7 @@ import datetime
 
 from django.contrib.auth.models import User
 
+from configuration_item import ConfigurationItem
 from flying_team import FlyingTeam
 from location import Location
 from room import Room
@@ -18,7 +19,6 @@ from item import Item
 from language import Language
 from subject import Subject
 from contact_attempt import ContactAttempt
-from configuration_item import ConfigurationItem
 
 
 def get_current_year():

smash/web/models/appointment.py

@@ -3,8 +3,10 @@ import datetime
 
 from django.db import models
 
-from constants import APPOINTMENT_TYPE_DEFAULT_COLOR, APPOINTMENT_TYPE_DEFAULT_FONT_COLOR
+from constants import APPOINTMENT_TYPE_DEFAULT_COLOR, APPOINTMENT_TYPE_DEFAULT_FONT_COLOR, \
+    CANCELLED_APPOINTMENT_COLOR_CONFIGURATION_TYPE, NO_SHOW_APPOINTMENT_COLOR_CONFIGURATION_TYPE
 from . import FlyingTeam, Location, Room, Visit, Worker
+from . import ConfigurationItem
 
 
 class Appointment(models.Model):
@@ -86,11 +88,16 @@ class Appointment(models.Model):
 
     def color(self):
         result = APPOINTMENT_TYPE_DEFAULT_COLOR
-        priority = 1000000
-        for type in self.appointment_types.all():
-            if type.calendar_color_priority < priority:
-                priority = type.calendar_color_priority
-                result = type.calendar_color
+        if self.status == Appointment.APPOINTMENT_STATUS_NO_SHOW:
+            result = ConfigurationItem.objects.get(type=NO_SHOW_APPOINTMENT_COLOR_CONFIGURATION_TYPE).value
+        elif self.status == Appointment.APPOINTMENT_STATUS_CANCELLED:
+            result = ConfigurationItem.objects.get(type=CANCELLED_APPOINTMENT_COLOR_CONFIGURATION_TYPE).value
+        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
         return result
 
     def font_color(self):