Added has_many assoziations for creator and cashier to jobs, fixed all views according to that changes. Implemented allocation of roles infos when status changes in job model.

app/views/admin/jobs/_job_tr.html.erb

@@ -44,11 +44,20 @@
     <%= l job.created_at.localtime.to_date %>
   </td>
   <td class="p-2 py-3 text-center">
-    <%= l job.paid_at.localtime.to_date if job.paid_at %>
-  </td>
-  <td class="p-2 py-3">
-    <span class="badge badge-status text-status-<%= job.status.to_sym %> bg-status-<%= job.status %>-light">
-      <%= job.status %>
-    </span>
-  </td>
+    <% if job.created_by_operator %>
+      <%= link_to admin_user_path(job.creator) do %>
+        <span class="badge badge-status">Operator</span>
+      <% end %>
+    <% else %>
+      <%= link_to admin_user_path(job.creator) do %>
+        <span class="badge badge-status badge-hover">Kunden</span>
+      <% end %>
+    <% end %>
+  </span>
+</td>
+<td class="p-2 py-3">
+  <span class="badge badge-status text-status-<%= job.status.to_sym %> bg-status-<%= job.status %>-light">
+    <%= job.status %>
+  </span>
+</td>
 </tr>

app/views/admin/jobs/index.html.erb

@@ -15,6 +15,8 @@
       <%= f.search_field :costumer_firstname_or_costumer_lastname_or_pdf_blob_filename_cont, placeholder: "Suchen", oninput: 'this.form.requestSubmit();' %>
       <%= f.label :status_eq, "Status:" %>
       <%= f.select :status_eq, Job.statuses.keys, {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
+      <%= f.label :created_by_operator_eq, "Erstellt vom:" %>
+      <%= f.select :created_by_operator_eq, [["Operator", true],["Kunden", false]], {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
       <%= f.submit "Filter anwenden", class: "py-2 px-3 bg-hsrm-red hover:bg-hsrm-red-light shadow-lg text-white inline-block font-medium cursor-pointer" %>
     </div>
   <% end %>
@@ -40,7 +42,7 @@
             <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :costum_qm_plan, "no DIN") %></th>
             <th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :cost, "Kosten") %></th>
             <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Erstellt am") %></th>
-            <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Bezahlt am") %></th>
+            <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_by_operator, "Erstellt von") %></th>
             <th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :status, "Status") %></th>
           </tr>
         </thead>

app/views/admin/users/_user.html.erb

@@ -6,6 +6,10 @@
   </p>
   <p><%= user.email %></p>
   <p>E-Mail Verifiziert:      
-    <%= icon bool_icon(user.verified), class: "icon #{user.verified ? "text-green-600" : "text-red-600"}" %>
-    <p><%= user.created_at %></p>
-  </div>
+    <%= icon bool_icon(user.verified), class: "icon #{user.verified ? "text-green-600" : "text-red-600"}" %></p>
+  <p><%= user.created_at %></p>
+  <p>Druckaufträge als Kunde: <%= @user.jobs_as_costumer.size %></p>
+  <p>davon abgebrochen: <%= @user.jobs_as_cosutmer.canceled.size %></p>
+  <p>Druckaufträge als Operator: <%= @user.jobs_as_operator.size %></p>
+  <p>Druckaufträge kassiert: <%= @user.cashed_jobs.size %></p>
+</div>

app/views/admin/users/_user_tr.html.erb

@@ -18,7 +18,7 @@
     <%= highlight user.email, [params.dig(:q, :firstname_or_lastname_or_email_cont).to_s, params.dig(:q, :email_start).to_s] %>
   </td>
   <td class="p-2 py-3 text-right">
-    <%= user.jobs_as_costumer.where.not(status: :canceled).size %>
+    <%= user.created_jobs.not_canceled.size %>
   </td>
   <td class="p-2 py-3 text-center">
     <%= l user.created_at.localtime.to_date %>

app/views/admin/users/show.html.erb

@@ -1,14 +1,8 @@
 <div>
-  <h1 class="text-4xl font-bold">Benutzer Details</h1>
+  <h1 class="text-4xl font-bold text-hsrm-gray py-4">Benutzer Details</h1>
   <%= render partial: 'user', locals: { user: @user } %>
 </div>
-<p>Some Stats:
-  <ul>
-    <li>Druckaufträge insgesammt: <%= @user.jobs_as_costumer.size %></li>
-    <li>davon abgebrochen: <%= @user.jobs_as_costumer.canceled.size %></li>
-    <li>letzten 5 Druckaufträge</li>
-  </ul>
-</p>
+<h1 class="py-4 text-4xl font-bold text-hsrm-gray">Die letzten 10 Druckaufträge</h1>
 <div class="min-w-full overflow-auto shadow-lg">
   <table class="w-full py-8 table-auto">
     <thead class="font-semibold tracking-wide bg-gray-200 border-b-2 border-gray-300 text text-hsrm-gray">
@@ -27,7 +21,7 @@
       </tr>
     </thead>
     <tbody id='jobs' class="divide-y divivde-gray-300">
-      <%= render partial: "jobs/job_tr", collection: @user.jobs_as_costumer.limit(5), as: :job, locals: { no_actions: true } %>
+      <%= render partial: "jobs/job_tr", collection: @user.created_jobs.order(created_at: :desc).limit(10), as: :job, locals: { no_actions: true } %>
     </tbody>
   </table>
 </div>