Style cancelled/completed eventdates differently in list and event pages

ABTech · Nov 27, 2023 · 45b6d1b · 45b6d1b
1 parent 06fa038
commit 45b6d1b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 5 deletions.
diff --git a/app/assets/stylesheets/events.css.scss b/app/assets/stylesheets/events.css.scss
@@ -81,6 +81,12 @@ table.eventslist td:first-child {
 }
 
 /* row colors */
+table.eventslist tr.date_completed { background: #E1EAEF; }
+table.eventslist tr.date_completed > td:first-child { background: #00A4FF; font-size: 5px; }
+table.eventslist tr.date_cancelled { background: #F9F9F9; color: #AAAAAA; }
+table.eventslist tr.date_cancelled > td:first-child { background: #ECECEC; font-size: 5px; }
+table.eventslist tr.date_cancelled a { color: #9999FF; }
+
 table.eventslist tr.event_confirmed { background: #E2F2E2; }
 table.eventslist tr.event_confirmed > td:first-child { background: #00FF00; font-size: 5px; }
 table.eventslist tr.billing_pending { background: #E1EAEF; }
@@ -183,6 +189,23 @@ table.eventslist .ticless {
   }
 }
 
+/* Event schedule */
+
+#event-schedule table.date_completed * { background: #E1EAEF; }
+#event-schedule table.date_completed tr:first-child * { background: #00A4FF; }
+
+#event-schedule table.date_cancelled * { background: #F9F9F9; color: #AAAAAA; }
+#event-schedule table.date_cancelled * { background: #ECECEC; }
+#event-schedule table.date_cancelled tr:first-child a { color: #9999FF; }
+
+//table.eventslist tr.date_completed { background: #E1EAEF; }
+//table.eventslist tr.date_completed > td:first-child { background: #00A4FF; font-size: 5px; }
+//
+//table.eventslist tr.date_cancelled { background: #F9F9F9; color: #AAAAAA; }
+//table.eventslist tr.date_cancelled { background: #F9F9F9; color: #AAAAAA; }
+//table.eventslist tr.date_cancelled > td:first-child { background: #ECECEC; font-size: 5px; }
+//table.eventslist tr.date_cancelled a { color: #9999FF; }
+
 #event-schedule table {
   width: 100%;
   margin-bottom: 1em;
@@ -214,7 +237,6 @@ table.eventslist .ticless {
 }
 
 #event-schedule td.es-time {
-  color: #222;
   white-space: nowrap;
 }
 

diff --git a/app/models/eventdate.rb b/app/models/eventdate.rb
@@ -207,6 +207,31 @@ def self.weekify(eventdates)
     end
   end
 
+  def cancelled?
+    status == Eventdate_Status_Cancelled
+  end
+
+  def completed?
+    status == Eventdate_Status_Completed
+  end
+
+  def incomplete?
+    status == Eventdate_Status_Incomplete
+  end
+
+  def status_hint
+    status unless incomplete?
+  end
+
+  def css_class
+    status.delete(' ').underscore unless incomplete?
+  end
+
+  def row_css_class
+    return status.delete(' ').underscore unless incomplete?
+    event.status.delete(' ').underscore
+  end
+
   private
     def prune_roles
       self.event_roles = self.event_roles.reject { |er| er.role.blank? }

diff --git a/app/views/events/_run.html.erb b/app/views/events/_run.html.erb
@@ -1,5 +1,5 @@
 <% run.each_with_index do |eventdate, run_i| %>
-  <tr class="<%= eventdate.event.status.delete(' ').underscore %>">
+  <tr class="<%= eventdate.row_css_class %>">
     <td>&nbsp;</td>
     <td>
       <% if eventdate.startdate.year == Date.today.year %>
@@ -8,7 +8,7 @@
         <%= eventdate.startdate.strftime("%A, %B %d, %Y") %>
       <% end %><br />
       <% if can? :read, Event %>
-        <small class="published">(<%= eventdate.event.status.downcase %><%= eventdate.event.rental ? ", rental" : "" %><%= !eventdate.event.publish ? ",<br/><b>not published</b>".html_safe : "" %>)</small>
+        <small class="published">(<%= eventdate.status_hint.downcase + ", " if eventdate.status_hint %><%= eventdate.event.status.downcase %><%= eventdate.event.rental ? ", rental" : "" %><%= !eventdate.event.publish ? ",<br/><b>not published</b>".html_safe : "" %>)</small>
       <% end %>
     </td>
     <td>

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -6,9 +6,9 @@
 
     <div id="event-schedule">
       <% @event.eventdates.each do |eventdate| %>
-        <table>
+        <table class="<%= eventdate.css_class %>">
           <tr>
-            <th colspan=4><%= eventdate.description %></th>
+            <th colspan=4><%= eventdate.description %><%= " (" + eventdate.status_hint + ")" if eventdate.status_hint %></th>
           </tr>
           <% eventdate.times.each do |time| %>
             <tr>