Fixed typo

This commit is contained in:
2024-10-02 13:51:15 +02:00
parent 23749c80b8
commit 337ff9b9d9
24 changed files with 79 additions and 79 deletions

View File

@@ -7,10 +7,10 @@
<% end %>
</td>
<td class="p-2 py-3">
<%= link_to job.costumer_firstname, admin_user_path(job.costumer), target: "_top" %>
<%= link_to_if job.customer_firstname, admin_user_path(job.customer), target: "_top" %>
</td>
<td class="p-2 py-3">
<%= link_to job.costumer_lastname, admin_user_path(job.costumer), target: "_top" %>
<%= link_to_if job.customer_lastname, admin_user_path(job.customer), target: "_top" %>
</td>
<td class="p-2 py-3">
<% if job.pdf.attached? %>

View File

@@ -12,7 +12,7 @@
<%= link_to icon("calendar", class: "icon size-5 mr-3") + 'Kalender', admin_jobs_path(calendar: true), class: "px-4 py-2 hover:bg-gray-100 hover:text-hsrm-red border-b-4 hover:border-hsrm-red-light" %>
<div class="flex items-center justify-between py-4">
<%= search_form_for @q, data: { turbo_frame: :admin_jobs, turbo_action: 'advance' }, url: admin_jobs_path() do |f| %>
<%= f.search_field :costumer_firstname_or_costumer_lastname_or_pdf_blob_filename_cont, placeholder: "Suchen", oninput: 'this.form.requestSubmit();' %>
<%= f.search_field :customer_firstname_or_customer_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:" %>
@@ -32,8 +32,8 @@
<thead class="font-semibold tracking-wide bg-gray-200 border-b-2 border-gray-300 text text-hsrm-gray">
<tr>
<th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :id, "ID", ) %></th>
<th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :costumer_firstname, "Vorname") %></th>
<th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :costumer_lastname, "Nachname") %></th>
<th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :customer_firstname, "Vorname") %></th>
<th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :customer_lastname, "Nachname") %></th>
<th class="p-2 py-3 text-left"><%= sort_link(@q, :pdf_blob_filename, "PDF") %></th>
<th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a0, "A0") %></th>
<th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a1, "A1") %></th>

View File

@@ -8,8 +8,8 @@
<p>E-Mail Verifiziert:
<%= 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.costumer_jobs.size %></p>
<p>davon abgebrochen: <%= @user.costumer_jobs.canceled.size %></p>
<p>Druckaufträge als Kunde: <%= @user.customer_jobs.size %></p>
<p>davon abgebrochen: <%= @user.customer_jobs.canceled.size %></p>
<p>Druckaufträge als Operator: <%= @user.operator_jobs.size %></p>
<p>Druckaufträge kassiert: <%= @user.cashed_jobs.size %></p>
</div>

View File

@@ -74,7 +74,7 @@
<th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :firstname, "Vorname") %></th>
<th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :lastname, "Nachname") %></th>
<th class="p-2 py-3 text-left"><%= sort_link(@q, :email, "E-Mail-Adresse") %></th>
<th class="w-1 p-2 py-3 text-right text-nowrap"><%= sort_link(@q, :costumer_jobs_count, "# Jobs") %></th>
<th class="w-1 p-2 py-3 text-right text-nowrap"><%= sort_link(@q, :customer_jobs_count, "# Jobs") %></th>
<th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Registriert am") %></th>
<th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :role, "Rolle") %></th>
</tr>

View File

@@ -21,7 +21,7 @@
</tr>
</thead>
<tbody id='jobs' class="divide-y divivde-gray-300">
<%= render partial: "jobs/job_tr", collection: @user.costumer_jobs.order(created_at: :desc).limit(10), as: :job, locals: { no_actions: true } %>
<%= render partial: "jobs/job_tr", collection: @user.customer_jobs.order(created_at: :desc).limit(10), as: :job, locals: { no_actions: true } %>
</tbody>
</table>
</div>

View File

@@ -11,12 +11,12 @@
</div>
<% end %>
<div class="my-5">
<%= form.label :costumer_firstname, 'Vorname' %>
<%= form.text_field :costumer_firstname, disabled: true ,class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
<%= form.label :customer_firstname, 'Vorname' %>
<%= form.text_field :customer_firstname, disabled: true ,class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
</div>
<div class="my-5">
<%= form.label :costumer_lastname, 'Nachname' %>
<%= form.text_field :costumer_lastname, disabled: true ,class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
<%= form.label :customer_lastname, 'Nachname' %>
<%= form.text_field :customer_lastname, disabled: true ,class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
</div>
<div>
<%= form.label :pdf, "Plan auswählen (PDF-Format)" %>

View File

@@ -11,7 +11,7 @@
<% end %>
</td>
<td class="p-2 py-3">
<%= job.costumer_fullname %>
<%= job.customer_fullname %>
</td>
<td class="p-2 py-3">
<% if job.pdf.attached? %>

View File

@@ -11,12 +11,12 @@
</div>
<% end %>
<div class="my-5">
<%= form.label :costumer_firstname, 'Vorname' %>
<%= form.text_field :costumer_firstname, class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
<%= form.label :customer_firstname, 'Vorname' %>
<%= form.text_field :customer_firstname, class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
</div>
<div class="my-5">
<%= form.label :costumer_lastname, 'Nachname' %>
<%= form.text_field :costumer_lastname, class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
<%= form.label :customer_lastname, 'Nachname' %>
<%= form.text_field :customer_lastname, class: "block shadow-lg rounded-md border border-hsrm-gray outline-none px-3 py-2 mt-2 w-full" %>
</div>
<div class="my-5 inline">
<%= form.check_box :intern, class: "pr-2 h-5 w-5" %>

View File

@@ -4,9 +4,9 @@
</div>
<div>
<p class="my-3">
<strong class="mb-1 font-medium">Costumer ID:</strong>
<% if job.costumer %>
<%= link_to_if allowed_to?(:show?, job.costumer, namespace: :Admin), "#{job.costumer_id} - #{job.costumer.name} (#{job.costumer.email})", admin_user_path(job.costumer) %>
<strong class="mb-1 font-medium">customer ID:</strong>
<% if job.customer %>
<%= link_to_if allowed_to?(:show?, job.customer, namespace: :Admin), "#{job.customer_id} - #{job.customer.name} (#{job.customer.email})", admin_user_path(job.customer) %>
<% else %>
-
<% end %>
@@ -37,7 +37,7 @@
</p>
<p class="my-3">
<strong class="mb-1 font-medium">Kunde:</strong>
<%= link_to_if job.costumer && allowed_to?(:show? , job.costumer, namespace: :Admin), "#{job.costumer_firstname} #{job.costumer_lastname}", ( job.costumer ? admin_user_path(job.costumer) : "" ) %>
<%= link_to_if job.customer && allowed_to?(:show? , job.customer, namespace: :Admin), "#{job.customer_firstname} #{job.customer_lastname}", ( job.customer ? admin_user_path(job.customer) : "" ) %>
</p>
<p class="my-3">
<strong class="mb-1 font-medium">Operator:</strong>

View File

@@ -13,7 +13,7 @@
<% end %>
</td>
<td class="p-2 py-3">
<%= job.costumer_fullname %>
<%= job.customer_fullname %>
</td>
<td class="p-2 py-3">
<% if job.pdf.attached? %>

View File

@@ -22,11 +22,11 @@
<h2 class="p-1 text-lg font-bold border-b-2 border-hsrm-red">Aufgegebene Druckaufträge</h2>
<p>
Aufgegebene Druckaufträge
<%= current_user.costumer_jobs.size %>
<%= current_user.customer_jobs.size %>
</p>
<p>
Abgebrochene Druckaufgräge
<%= current_user.costumer_jobs.canceled.size %>
<%= current_user.customer_jobs.canceled.size %>
</p>
<% if is_admin_or_operator? %>
<h2 class="p-1 text-lg font-bold border-b-2 border-hsrm-red">Bearbeitete Druckaufträge</h2>