arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-18 22:12:14 +00:00
Code Issues Projects Releases Wiki Activity

Rethink rigboard color logic again

Browse Source 
Also revert some broken stuff
This commit is contained in:
FreneticScribbler
2020-09-12 10:07:58 +01:00
parent 6d836ee4dd
commit ba6dbc6980
5 changed files with 19 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RIGS/models.py
View File

@@ -451,10 +451,12 @@ class Event(models.Model, RevisionMixin):
@property
def status_color(self):
if self.cancelled:
return "text-muted table-secondary"
return "table-secondary"
elif not self.is_rig:
return "table-info"
elif self.mic and (self.dry_hire or self.riskassessment) and self.authorised:
elif not self.mic:
return "table-danger"
elif self.confirmed and self.authorised and (self.dry_hire or self.riskassessment):
return "table-success"
else:
return "table-warning"
@@ -636,7 +638,7 @@ class RiskAssessment(models.Model, RevisionMixin):
class Meta:
ordering = ['event']
permissions = [
('review_riskassessment', 'Review Risk Assessments')
('review_riskassessment', 'Can review Risk Assessments')
]
def clean(self):
@@ -722,7 +724,7 @@ class EventChecklist(models.Model, RevisionMixin):
class Meta:
ordering = ['event']
permissions = [
('review_eventchecklist', 'Review Event Checklists')
('review_eventchecklist', 'Can review Event Checklists')
]
def clean(self):