diff --git a/app/models/customer_appointment.rb b/app/models/customer_appointment.rb index ca69492..5a0aa39 100644 --- a/app/models/customer_appointment.rb +++ b/app/models/customer_appointment.rb @@ -23,11 +23,12 @@ class CustomerAppointment < ActiveRecord::Base STATUSES = %w[ Scheduled - CheckedIn - InProgress + Checked_In + In_Progress Ready Completed Cancelled + Call_Out ] # Scans the QBO Estimate's InvoiceLineItems for "Labor" sales items diff --git a/assets/stylesheets/customer_appointments.css b/assets/stylesheets/customer_appointments.css index 3a87334..46417da 100644 --- a/assets/stylesheets/customer_appointments.css +++ b/assets/stylesheets/customer_appointments.css @@ -382,6 +382,16 @@ h2 .appointment-title { text-decoration: line-through; } +/* Call Out - #FFFF00 */ +.appointment-block.call_out, +.appointment-block.call_out:hover, +.appointment-block.call_out.open { background: hsl(60, 100%, 95%) !important; border-color: hsl(60, 100%, 50%) !important; } +.appointment-block.call_out .appointment-bar { background-color: hsl(60, 100%, 45%) !important; } +.appointment-block.call_out .appointment-divider { border-top-color: hsl(60, 100%, 80%) !important; } +.appointment-block.call_out .tip, +.appointment-block.call_out:hover .tip, +.appointment-block.call_out.open .tip { background: hsl(60, 100%, 97%) !important; border-color: hsl(60, 100%, 60%) !important; } + /* Table List Alignment */ table.appointments td, table.appointments th { @@ -466,7 +476,7 @@ table.appointments td.status { .status-inprogress, .status-in_progress { background-color: #fff0e8 !important; - border-color: #ffb391 !important; + border-color: #ff9191 !important; color: #b33000 !important; } @@ -485,6 +495,13 @@ table.appointments td.status { color: #b30000 !important; } +/* Completed - #FFFF00 */ +.status-call_out { + background-color: hwb(60 0% 0%) !important; + border-color: lab(0% 0 0) !important; + color: hwb(60 0% 100%) !important; +} + /* Redefine grid column proportions for the calendar layout */ ul.cal { display: grid;