From a49045f59ac9bf7d10cf7ee1e5c47729f55b371c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=B6hm?= <spaceman78@gmx.de>
Date: Sun, 25 Aug 2024 22:34:18 +0200
Subject: [PATCH] Small design updates

---
 .../stylesheets/application.tailwind.css      |  2 +-
 app/helpers/operator/jobs_helper.rb           |  9 +++++++++
 .../operator/jobs/_job_status_card.html.erb   |  4 ++--
 app/views/operator/jobs/_job_tr.html.erb      | 20 +++++++++----------
 app/views/operator/jobs/index.html.erb        |  5 +++++
 config/tailwind.config.js                     |  5 +++++
 6 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
index 001a22c..03de889 100644
--- a/app/assets/stylesheets/application.tailwind.css
+++ b/app/assets/stylesheets/application.tailwind.css
@@ -31,6 +31,6 @@
     @apply hover:text-opacity-100;
   }
   .card-status {
-    @apply uppercase bg-opacity-50 shadow-lg min-h-20 hover:bg-opacity-70;
+    @apply uppercase shadow-lg bg-opacity-60 min-h-20 hover:bg-opacity-80;
   }
 }
diff --git a/app/helpers/operator/jobs_helper.rb b/app/helpers/operator/jobs_helper.rb
index 4c274c1..584b198 100644
--- a/app/helpers/operator/jobs_helper.rb
+++ b/app/helpers/operator/jobs_helper.rb
@@ -1,2 +1,11 @@
 module Operator::JobsHelper
+  def status_icon(status)
+      case status
+      when :printing then "printer"
+      when :pickup then "arrow-up-tray"
+      when :paid then "banknotes"
+      when :canceled then "x-circle"
+      else "inbox-stack"
+      end
+  end
 end
diff --git a/app/views/operator/jobs/_job_status_card.html.erb b/app/views/operator/jobs/_job_status_card.html.erb
index ee33efc..87e5a93 100644
--- a/app/views/operator/jobs/_job_status_card.html.erb
+++ b/app/views/operator/jobs/_job_status_card.html.erb
@@ -1,7 +1,7 @@
   <%= link_to "##{[:paid, :canceled].include?(status.to_sym) && "paidcanceled" || status}jobs-h", class: "flex-1", id: "#{status}jobs_status_card" do %>
-  <div class="flex-1 card-status bg-status-<%= status %>-light text-status-<%= status %>">
+  <div class="flex-1 card-status bg-status-<%= status %>-light bg-opacity-60 text-status-<%= status %> border-b-8 border-status-<%= status %>-light">
     <h3 class="p-3 text-2xl font-bold">
-      <%= icon("inbox-stack", class: "text-status-#{status} icon icon-nohover")  %>
+      <%= icon(status_icon(status), class: "text-status-#{status} icon icon-nohover")  %>
       <%= status %>
       <span class="block text-3xl text-right"><%= jobs.count %></span>
     </h3>
diff --git a/app/views/operator/jobs/_job_tr.html.erb b/app/views/operator/jobs/_job_tr.html.erb
index 2515e67..e2dcaa9 100644
--- a/app/views/operator/jobs/_job_tr.html.erb
+++ b/app/views/operator/jobs/_job_tr.html.erb
@@ -60,31 +60,31 @@
   <td class="p-2 py-3 text-right">
     <!-- TODO: move logic to model -->
     <% if job.printing? || job.canceled? || job.paid? %>
-      <%= button_to icon("inbox-stack", class: "icon", title: "Zurück in die Warteschlange"), operator_job_path(job), method: :patch, params: {:job => {status: :open}}, form_class: "inline" %>
+      <%= button_to icon(status_icon(:open), class: "icon", title: "Zurück in die Warteschlange"), operator_job_path(job), method: :patch, params: {:job => {status: :open}}, form_class: "inline" %>
     <% else %>
-      <%= icon("inbox-stack", class: "icon icon-disabled", title: "") %>
+      <%= icon(status_icon(:open), class: "icon icon-disabled", title: "") %>
     <% end %>
     <% if job.open? || job.canceled? || job.paid? %>
-      <%= button_to icon("printer", class: "icon", title: "Drucken"), operator_job_path(job), method: :patch, params: {:job => {status: :printing}}, form_class: "inline" %>
+      <%= button_to icon(status_icon(:printing), class: "icon", title: "Drucken"), operator_job_path(job), method: :patch, params: {:job => {status: :printing}}, form_class: "inline" %>
     <% else %>
-      <%= icon("printer", class: "icon icon-disabled", title: "") %>
+      <%= icon(status_icon(:printing), class: "icon icon-disabled", title: "") %>
     <% end %>
     <% if job.printing? || job.paid? %>
       <% job.printing? && turbo_confirm = 'Sind die Pläne gedruckt und die Seitenanzahl und QM korrekt?' %>
-      <%= button_to icon("arrow-up-tray", class: "icon", title: "Pläne sind fertig gedruckt und bereit abgeholt zu werden."), operator_job_path(job), method: :patch, params: {:job => {status: :pickup}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
+      <%= button_to icon(status_icon(:pickup), class: "icon", title: "Pläne sind fertig gedruckt und bereit abgeholt zu werden."), operator_job_path(job), method: :patch, params: {:job => {status: :pickup}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
     <% else %>
-      <%= icon("arrow-up-tray", class: "icon icon-disabled", title: "") %>
+      <%= icon(status_icon(:pickup), class: "icon icon-disabled", title: "") %>
     <% end %>
     <% if job.pickup? || job.printing? %>
       <% job.printing? && turbo_confirm = 'Sind die Pläne gedruckt und die Seitenanzahl und QM korrekt?' %>
-      <%= button_to icon("banknotes", class: "icon", title: "Bezahlt"), operator_job_path(job), method: :patch, params: {:job => {status: :paid}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
+      <%= button_to icon(status_icon(:paid), class: "icon", title: "Bezahlt"), operator_job_path(job), method: :patch, params: {:job => {status: :paid}}, form: {data: {turbo_confirm: turbo_confirm}}, form_class: "inline" %>
     <% else %>
-      <%= icon("banknotes", class: "icon icon-disabled ", title: "") %>
+      <%= icon(status_icon(:paid), class: "icon icon-disabled ", title: "") %>
     <% end %>
     <% if job.open? || job.printing? || job.pickup? %>
-      <%= button_to icon("x-circle", class: "icon text-hsrm-red", title: "Abbrechen"), operator_job_path(job), method: :patch, params: {:job => {status: :canceled}}, form: {data: {turbo_confirm: 'Den Plottauftrag wirklich abbrechen?'}}, form_class: "inline" %>
+      <%= button_to icon(status_icon(:canceled), class: "icon text-hsrm-red", title: "Abbrechen"), operator_job_path(job), method: :patch, params: {:job => {status: :canceled}}, form: {data: {turbo_confirm: 'Den Plottauftrag wirklich abbrechen?'}}, form_class: "inline" %>
     <% else %>
-      <%= icon("x-circle", class: "icon icon-disabled", title: "Kann nicht mehr abgebrochen werden") %>
+      <%= icon(status_icon(:canceled), class: "icon icon-disabled", title: "Kann nicht mehr abgebrochen werden") %>
     <% end %>
   </td>
 </tr>
diff --git a/app/views/operator/jobs/index.html.erb b/app/views/operator/jobs/index.html.erb
index e3d3080..8cd5935 100644
--- a/app/views/operator/jobs/index.html.erb
+++ b/app/views/operator/jobs/index.html.erb
@@ -12,6 +12,7 @@
 <div class="w-full">
   <div id="printingjobs-h" class="flex items-center justify-between py-4">
     <h1 class="text-3xl font-bold text-hsrm-gray">
+      <%= icon(status_icon(:printing), class: "icon") %>
       Printing
     </h1>
     <%= render partial: 'start_next_job_btn', locals: { jobs: @openjobs } %>
@@ -43,6 +44,7 @@
   </div>
   <div id="pickupjobs-h" class="flex items-center justify-between py-4">
     <h1 class="text-3xl font-bold text-hsrm-gray">
+      <%= icon(status_icon(:pickup), class: "icon") %>
       Pickup 
     </h1>
   </div>
@@ -72,6 +74,7 @@
   </div>
   <div id="openjobs-h" class="flex items-center justify-between py-4">
     <h1 class="text-3xl font-bold text-hsrm-gray">
+      <%= icon(status_icon(:open), class: "icon") %>
       Open 
     </h1>
   </div>
@@ -101,6 +104,8 @@
   </div>
   <div id="paidcanceledjobs-h" class="flex items-center justify-between py-4">
     <h1 class="text-3xl font-bold text-hsrm-gray">
+      <%= icon(status_icon(:paid), class: "icon") %>
+      <%= icon(status_icon(:canceled), class: "icon") %>
       Paid/Canceled 
     </h1>
   </div>
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
index e928e0b..6d37afe 100644
--- a/config/tailwind.config.js
+++ b/config/tailwind.config.js
@@ -35,14 +35,19 @@ module.exports = {
   safelist: [
     "text-status-open",
     "bg-status-open-light",
+    "border-status-open-light",
     "text-status-printing",
     "bg-status-printing-light",
+    "border-status-printing-light",
     "text-status-pickup",
     "bg-status-pickup-light",
+    "border-status-pickup-light",
     "text-status-paid",
     "bg-status-paid-light",
+    "border-status-paid-light",
     "text-status-canceled",
     "bg-status-canceled-light",
+    "border-status-canceled-light",
   ],
   plugins: [
     require("@tailwindcss/forms"),