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

Fixed typo

Browse Source
This commit is contained in:
David Böhm
2024-10-02 13:51:15 +02:00
parent 23749c80b8
commit 337ff9b9d9
24 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/jobs_controller.rb
View File

@@ -11,13 +11,13 @@ class JobsController < ApplicationController
# GET /jobs/new
def new
@job = Job.new(costumer_firstname: current_user.firstname, costumer_lastname: current_user.lastname)
@job = Job.new(customer_firstname: current_user.firstname, customer_lastname: current_user.lastname)
end
# POST /jobs or /jobs.json
def create
@job = Job.new(job_params)
@job.costumer = current_user
@job.customer = current_user
respond_to do |format|
if @job.save
@@ -95,6 +95,6 @@ class JobsController < ApplicationController
# Only allow a list of trusted parameters through.
def job_params
params.require(:job).permit(:costumer_id, :costumer_firstname, :costumer_lastname, :privacy_policy, :pdf)
params.require(:job).permit(:customer_id, :customer_firstname, :customer_lastname, :privacy_policy, :pdf)
end
end

2
app/controllers/operator/jobs_controller.rb
View File

@@ -114,7 +114,7 @@ class Operator::JobsController < ApplicationController
# Only allow a list of trusted parameters through.
def job_params
params.require(:job).permit(:pdf, :operator_id, :costumer_id, :operator_firstname, :operator_lastname, :costumer_firstname, :costumer_lastname, :status, :privacy_policy, :intern, :cost_center, :number_of_plans_a0, :number_of_plans_a1, :number_of_plans_a2, :number_of_plans_a3, :costum_qm_plan)
params.require(:job).permit(:pdf, :operator_id, :customer_id, :operator_firstname, :operator_lastname, :customer_firstname, :customer_lastname, :status, :privacy_policy, :intern, :cost_center, :number_of_plans_a0, :number_of_plans_a1, :number_of_plans_a2, :number_of_plans_a3, :costum_qm_plan)
end
# FIXME: Move broadcast to model though i don't think view logic belongs in the model

28
app/models/job.rb
View File

@@ -1,14 +1,14 @@
class Job < ApplicationRecord
attr_accessor :current_user
belongs_to :costumer, class_name: "User", optional: true, counter_cache: :costumer_jobs_count, inverse_of: :costumer_jobs
belongs_to :customer, class_name: "User", optional: true, counter_cache: :customer_jobs_count, inverse_of: :customer_jobs
belongs_to :operator, class_name: "User", optional: true, counter_cache: :operator_jobs_count, inverse_of: :operator_jobs
belongs_to :creator, class_name: "User", optional: true, counter_cache: :created_jobs_count, inverse_of: :created_jobs
belongs_to :cashier, class_name: "User", optional: true, counter_cache: :cashed_jobs_count, inverse_of: :cashed_jobs
has_one_attached :pdf, dependent: :purge
validates_presence_of :costumer_firstname, :costumer_lastname, :pdf
validates_presence_of :customer_firstname, :customer_lastname, :pdf
validates_presence_of :cost_center, if: :intern
validates :privacy_policy, acceptance: true, unless: :created_by_operator?
validates :number_of_plans_a0, :number_of_plans_a1, :number_of_plans_a2, :number_of_plans_a3, :costum_qm_plan, numericality: { greater_than_or_equal_to: 0 }
@@ -21,7 +21,7 @@ class Job < ApplicationRecord
before_save :set_cost_qm
before_save :calc_cost, if: :printed_pages_changes?
before_validation :set_costumer_infos, unless: :created_by_operator?, on: :create
before_validation :set_customer_infos, unless: :created_by_operator?, on: :create
# TODO: works only when job is created. Should move analyzer to activestorage :
# https://discuss.rubyonrails.org/t/active-storage-in-production-lessons-learned-and-in-depth-look-at-how-it-works/83289
@@ -42,7 +42,7 @@ class Job < ApplicationRecord
AVAILABLE_PAGE_FORMATS = [ :a0, :a1, :a2, :a3 ]
# scope :created_as_operator, -> { where created_as_operator: true }
# scope :created_as_costumer, -> { where created_as_operator: false }
# scope :created_as_customer, -> { where created_as_operator: false }
scope :not_canceled, -> { !canceled }
# NOTE: only named status are returned because of WHERE/IN clause for the enum values
@@ -60,7 +60,7 @@ class Job < ApplicationRecord
scope :status_changed_on_day, lambda { |date|
where("status_changed_at >= ? AND status_changed_at <= ?", date.beginning_of_day, date.end_of_day)
}
scope :created_by_costumer, -> { not(:created_by_operator) }
scope :created_by_customer, -> { not(:created_by_operator) }
# Returns all jobs with status: open print pickup and jobs from today with status: paid canceled
# paid: only updated_at today
@@ -72,7 +72,7 @@ class Job < ApplicationRecord
.where("status_changed_at >= ?", Time.now.beginning_of_day))
# .in_status_order
.order(created_at: :asc)
# .order(:costumer_firstname, :costumer_lastname)
# .order(:customer_firstname, :customer_lastname)
.with_attached_pdf # scope from activestorage for .includes(pdf_attachment: :blob)
# .references(:pdf_attachment, :blob) # creates big join table
end
@@ -81,8 +81,8 @@ class Job < ApplicationRecord
Job.where(status: %i[paid canceled])
end
def costumer_fullname
[ costumer_firstname, " ", costumer_lastname ].join
def customer_fullname
[ customer_firstname, " ", customer_lastname ].join
end
def acceptable_pdf
@@ -127,13 +127,13 @@ class Job < ApplicationRecord
csv << columns_readable
jobs.each do |job|
# csv << job.attributes.values_at(*columns)
csv << [ job.id, job.costumer_firstname, job.costumer_lastname, job.cashier_firstname, job.cashier_lastname, job.paid_at.localtime.strftime("%Y-%m-%d"), job.cost.to_s + " €" ]
csv << [ job.id, job.customer_firstname, job.customer_lastname, job.cashier_firstname, job.cashier_lastname, job.paid_at.localtime.strftime("%Y-%m-%d"), job.cost.to_s + " €" ]
end
end
end
def self.ransackable_attributes(auth_object = nil)
[ "created_at", "id", "costumer_firstname", "costumer_lastname", "pdf.", "created_by_operator", "number_of_plans_a0", "number_of_plans_a1", "number_of_plans_a2", "number_of_plans_a3", "costum_qm_plan", "cost", "status" ]
[ "created_at", "id", "customer_firstname", "customer_lastname", "pdf.", "created_by_operator", "number_of_plans_a0", "number_of_plans_a1", "number_of_plans_a2", "number_of_plans_a3", "costum_qm_plan", "cost", "status" ]
end
def self.ransackable_associations(auth_object = nil)
@@ -187,10 +187,10 @@ class Job < ApplicationRecord
save
end
def set_costumer_infos
self.costumer = current_user unless self.costumer
self.costumer_firstname = costumer.firstname
self.costumer_lastname = costumer.lastname
def set_customer_infos
self.customer = current_user unless self.customer
self.customer_firstname = customer.firstname
self.customer_lastname = customer.lastname
end
def set_operator_infos

4
app/models/user.rb
View File

@@ -1,7 +1,7 @@
class User < ApplicationRecord
has_secure_password
# has_many :jobs
has_many :costumer_jobs, foreign_key: :costumer_id, class_name: "Job"
has_many :customer_jobs, foreign_key: :customer_id, class_name: "Job"
has_many :operator_jobs, foreign_key: :operator_id, class_name: "Job"
has_many :created_jobs, foreign_key: :creator_id, class_name: "Job"
has_many :cashed_jobs, foreign_key: :cashier_id, class_name: "Job"
@@ -45,7 +45,7 @@ class User < ApplicationRecord
end
def self.ransackable_attributes(auth_object = nil)
[ "created_at", "email", "firstname", "id", "costumer_jobs_count", "operator_jobs_count", "lastname", "role", "verified", "name" ]
[ "created_at", "email", "firstname", "id", "customer_jobs_count", "operator_jobs_count", "lastname", "role", "verified", "name" ]
end
def self.ransackable_associations(auth_object = nil)

2
app/policies/job_policy.rb
View File

@@ -2,7 +2,7 @@ class JobPolicy < ApplicationPolicy
skip_pre_check :allow_admins, only: :cancel?
def cancel?
record.open? && (user == record.costumer || user.operator? || user.admin?)
record.open? && (user == record.customer || user.operator? || user.admin?)
end
# See https://actionpolicy.evilmartians.io/#/writing_policies

4
app/views/admin/jobs/_job_tr.html.erb
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? %>

6
app/views/admin/jobs/index.html.erb
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>

4
app/views/admin/users/_user.html.erb
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>

2
app/views/admin/users/index.html.erb
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>

2
app/views/admin/users/show.html.erb
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>

8
app/views/jobs/_form.html.erb
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)" %>

2
app/views/jobs/_job_tr.html.erb
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? %>

8
app/views/operator/jobs/_form.html.erb
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" %>

8
app/views/operator/jobs/_job.html.erb
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>

2
app/views/operator/jobs/_job_tr.html.erb
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? %>

4
app/views/profiles/show.html.erb
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>