Rethink rigboard color logic again

Also revert some broken stuff

RIGS/models.py

@@ -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):

RIGS/static/scss/screen.scss

@@ -114,11 +114,6 @@ svg {
     white-space: no-wrap;
 }
 
-input[required]::after,select[required]::after {
-    content: '*';
-    color: red;
-}
-
 html.embedded {
   display: flex;
   flex-direction: column;

RIGS/templates/event_table.html

@@ -1,7 +1,6 @@
-{% load next from filters %}
 {% load namewithnotes from filters %}
 {% comment %}<div class="d-none d-md-block">{% endcomment %}
-<div class="table-responsive">
+<div class="table-responsive" style="overflow: hidden;">
     <table class="table mb-0">
         <thead>
             <tr>
@@ -16,34 +15,22 @@
         <tr class="{{event.status_color}}" id="event_row">
             <!---Number-->
             <th scope="row" id="event_number">{{ event.display_id }}</th>
-            <!--Dates-->
+            <!--Dates & Times-->
             <td id="event_dates">
                 <div><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></div>
+                {% if event.has_start_time %}
+                    <p>Start Time: {{ event.start_time|date:"H:i" }}</p>
+                {% endif %}
                 {% if event.end_date and event.end_date != event.start_date %}
                     <div><strong>{{ event.end_date|date:"D d/m/Y"  }}</strong></div>
+                    {% if event.has_end_time%}
+                       <p>End Time: {{ event.end_time|date:"H:i" }}</p>
+                    {% endif %}
                 {% endif %}
-                <!---Times-->
                 {% if not event.cancelled %}
-                    <dl class="dl-horizontal">
+                    {% if event.meet_at %}
-                        {% if event.meet_at %}
+                        <p>Crew meet: {{ event.meet_at|date:"H:i" }} {{ event.meet_at|date:"(Y-m-d)" }}</p>
-                            <dt>Crew meet</dt>
+                    {% endif %}
-                            <dd>{{ event.meet_at|date:"H:i" }}<br/>{{ event.meet_at|date:"(Y-m-d)" }}</dd>
-                        {% endif %}
-                        {% if event.has_start_time %}
-                            <dt>Event starts</dt>
-                            <dd>
-                                {{ event.start_time|date:"H:i" }}<br/>
-                                {{ event.start_date|date:"(Y-m-d)" }}<br/>
-                            </dd>
-                        {% endif %}
-                        {% if event.has_end_time%}{% if event.start_date != event.end_date or event.start_time != event.end_time %}
-                            <dt>Event ends</dt>
-                            <dd>
-                                {{ event.end_time|date:"H:i" }}<br/>
-                                {{ event.end_date|date:"(Y-m-d)" }}
-                            </dd>
-                        {% endif %}{% endif %}
-                    </dl>
                 {% endif %}
             </td>
             <!---Details-->
@@ -92,10 +79,6 @@
                 {% endif %}
             </td>
         </tr>
-        {# Insert a divider between still-out dry hires and actually upcoming events #}
-        {% with next_element=events|next:forloop.counter0 %}
-            {% if event.dry_hire == True and next_element.dry_hire == False %}<tr><td colspan="4"><hr></td><tr>{%endif%}
-        {% endwith %}
         {% empty %}
         <tr class="bg-warning">
             <td colspan="4">No events found</td>

RIGS/templates/rigboard.html

@@ -8,7 +8,7 @@
 <a href="{% url 'event_create' %}" class="btn btn-success my-3 float-right">New <i class="fas fa-plus"></i></a>
 {% endif %}
 
-<p>Key: <span class="badge badge-success mr-1">Ready</span><span class="badge badge-warning mr-1">Action Required</span><span class="badge badge-secondary mr-1">Cancelled</span><span class="badge badge-info">Non-Rig</span></p>
+<p>Key: <span class="badge badge-success mr-1">Ready</span><span class="badge badge-warning mr-1">Action Required</span><span class="badge badge-danger mr-1">Needs MIC</span><span class="badge badge-secondary mr-1">Cancelled</span><span class="badge badge-info">Non-Rig</span></p>
 {% include 'event_table.html' %}
 
 {% endblock %}