daboh/plottservice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed order of jobs, removed table row id

Browse Source
This commit is contained in:
David Böhm
2024-08-02 18:46:45 +02:00
parent 5e45dd8058
commit 690ac30b7a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/job.rb
View File

@@ -40,7 +40,8 @@ class Job < ApplicationRecord
.or(Job.where(status: %i[paid canceled]) .or(Job.where(status: %i[paid canceled])
.where('status_changed_at >= ?', Time.now.beginning_of_day)) .where('status_changed_at >= ?', Time.now.beginning_of_day))
# .in_status_order # .in_status_order
.order(created_at: :asc) # .order(created_at: :asc)
.order(:costumer_firstname, :costumer_lastname)
end end
def fullname def fullname

6
app/views/jobs/_job_tr.html.erb
View File

@@ -1,7 +1,7 @@
<tr id="<%= dom_id job %>" class="<%= cycle('bg-gray-50','bg-gray-100') %> "> <tr id="<%= dom_id job %>" class="<%= cycle('bg-gray-50','bg-gray-100') %> ">
<td class="p-3 text-sm text-hsrm-gray whitespace-nowrap"> <!-- <td class="p-3 text-sm text-hsrm-gray whitespace-nowrap"> -->
<span class="p-1.5 text-xs font-medium uppercase tracking-wider bg-opacity-50 text-status-<%= job.status %> bg-status-<%= job.status %>-light rounded-lg"><%= job.id %></span> <!-- <span class="p-1.5 text-xs font-medium uppercase tracking-wider bg-opacity-50 text-status-<%= job.status %> bg-status-<%= job.status %>-light rounded-lg"><%= job.id %></span> -->
</td> <!-- </td> -->
<td class="p-3 text-sm text-hsrm-gray whitespace-nowrap"> <%= job.fullname %> </td> <td class="p-3 text-sm text-hsrm-gray whitespace-nowrap"> <%= job.fullname %> </td>
<td class="p-3 text-sm text-hsrm-gray whitespace-nowrap"> <td class="p-3 text-sm text-hsrm-gray whitespace-nowrap">
<% if job.pdf.attached? %> <% if job.pdf.attached? %>

2
app/views/jobs/index.html.erb
View File

@@ -11,7 +11,7 @@
<table class="w-full py-8 table-auto"> <table class="w-full py-8 table-auto">
<thead class="bg-gray-200 text-hsrm-gray border-b-2 border-hsrm-gray"> <thead class="bg-gray-200 text-hsrm-gray border-b-2 border-hsrm-gray">
<tr> <tr>
<th class="p-3 text-sm font-semibold tracking-wide text-left w-1"> ID </th> <!-- <th class="p-3 text-sm font-semibold tracking-wide text-left w-1"> ID </th> -->
<th class="p-3 text-sm font-semibold tracking-wide text-left"> Auftraggeber </th> <th class="p-3 text-sm font-semibold tracking-wide text-left"> Auftraggeber </th>
<th class="p-3 text-sm font-semibold tracking-wide text-left"> PDF </th> <th class="p-3 text-sm font-semibold tracking-wide text-left"> PDF </th>
<th class="p-3 text-sm font-semibold tracking-wide text-left w-1"> A0 </th> <th class="p-3 text-sm font-semibold tracking-wide text-left w-1"> A0 </th>