diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb index f000260..78eaeb3 100644 --- a/app/controllers/jobs_controller.rb +++ b/app/controllers/jobs_controller.rb @@ -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 diff --git a/app/controllers/operator/jobs_controller.rb b/app/controllers/operator/jobs_controller.rb index 530e640..0d85009 100644 --- a/app/controllers/operator/jobs_controller.rb +++ b/app/controllers/operator/jobs_controller.rb @@ -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 diff --git a/app/models/job.rb b/app/models/job.rb index af7b030..d5e83fe 100644 --- a/app/models/job.rb +++ b/app/models/job.rb @@ -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 diff --git a/app/models/user.rb b/app/models/user.rb index bbba7f5..0160d5b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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) diff --git a/app/policies/job_policy.rb b/app/policies/job_policy.rb index ed476e1..21c9652 100644 --- a/app/policies/job_policy.rb +++ b/app/policies/job_policy.rb @@ -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 diff --git a/app/views/admin/jobs/_job_tr.html.erb b/app/views/admin/jobs/_job_tr.html.erb index f12d6e4..23663ab 100644 --- a/app/views/admin/jobs/_job_tr.html.erb +++ b/app/views/admin/jobs/_job_tr.html.erb @@ -7,10 +7,10 @@ <% end %> - <%= 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" %> - <%= 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" %> <% if job.pdf.attached? %> diff --git a/app/views/admin/jobs/index.html.erb b/app/views/admin/jobs/index.html.erb index c7ef031..cf7aaf0 100644 --- a/app/views/admin/jobs/index.html.erb +++ b/app/views/admin/jobs/index.html.erb @@ -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" %>
<%= 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 @@ <%= sort_link(@q, :id, "ID", ) %> - <%= sort_link(@q, :costumer_firstname, "Vorname") %> - <%= sort_link(@q, :costumer_lastname, "Nachname") %> + <%= sort_link(@q, :customer_firstname, "Vorname") %> + <%= sort_link(@q, :customer_lastname, "Nachname") %> <%= sort_link(@q, :pdf_blob_filename, "PDF") %> <%= sort_link(@q, :number_of_plans_a0, "A0") %> <%= sort_link(@q, :number_of_plans_a1, "A1") %> diff --git a/app/views/admin/users/_user.html.erb b/app/views/admin/users/_user.html.erb index 71e446d..82616b6 100644 --- a/app/views/admin/users/_user.html.erb +++ b/app/views/admin/users/_user.html.erb @@ -8,8 +8,8 @@

E-Mail Verifiziert: <%= icon bool_icon(user.verified), class: "icon #{user.verified ? "text-green-600" : "text-red-600"}" %>

<%= user.created_at %>

-

Druckaufträge als Kunde: <%= @user.costumer_jobs.size %>

-

davon abgebrochen: <%= @user.costumer_jobs.canceled.size %>

+

Druckaufträge als Kunde: <%= @user.customer_jobs.size %>

+

davon abgebrochen: <%= @user.customer_jobs.canceled.size %>

Druckaufträge als Operator: <%= @user.operator_jobs.size %>

Druckaufträge kassiert: <%= @user.cashed_jobs.size %>

diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 286e8cf..f9a13de 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -74,7 +74,7 @@ <%= sort_link(@q, :firstname, "Vorname") %> <%= sort_link(@q, :lastname, "Nachname") %> <%= sort_link(@q, :email, "E-Mail-Adresse") %> - <%= sort_link(@q, :costumer_jobs_count, "# Jobs") %> + <%= sort_link(@q, :customer_jobs_count, "# Jobs") %> <%= sort_link(@q, :created_at, "Registriert am") %> <%= sort_link(@q, :role, "Rolle") %> diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index 39b9de0..a9454ab 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -21,7 +21,7 @@ - <%= 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 } %> diff --git a/app/views/jobs/_form.html.erb b/app/views/jobs/_form.html.erb index 9d4b35d..9d9bc5e 100644 --- a/app/views/jobs/_form.html.erb +++ b/app/views/jobs/_form.html.erb @@ -11,12 +11,12 @@ <% end %>
- <%= 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" %>
- <%= 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" %>
<%= form.label :pdf, "Plan auswählen (PDF-Format)" %> diff --git a/app/views/jobs/_job_tr.html.erb b/app/views/jobs/_job_tr.html.erb index 463191d..75a5f73 100644 --- a/app/views/jobs/_job_tr.html.erb +++ b/app/views/jobs/_job_tr.html.erb @@ -11,7 +11,7 @@ <% end %> - <%= job.costumer_fullname %> + <%= job.customer_fullname %> <% if job.pdf.attached? %> diff --git a/app/views/operator/jobs/_form.html.erb b/app/views/operator/jobs/_form.html.erb index 541f9dd..ee3ecae 100644 --- a/app/views/operator/jobs/_form.html.erb +++ b/app/views/operator/jobs/_form.html.erb @@ -11,12 +11,12 @@
<% end %>
- <%= 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" %>
- <%= 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" %>
<%= form.check_box :intern, class: "pr-2 h-5 w-5" %> diff --git a/app/views/operator/jobs/_job.html.erb b/app/views/operator/jobs/_job.html.erb index 9e2a933..6b77ae5 100644 --- a/app/views/operator/jobs/_job.html.erb +++ b/app/views/operator/jobs/_job.html.erb @@ -4,9 +4,9 @@

- Costumer ID: - <% 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) %> + customer ID: + <% 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 @@

Kunde: - <%= 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) : "" ) %>

Operator: diff --git a/app/views/operator/jobs/_job_tr.html.erb b/app/views/operator/jobs/_job_tr.html.erb index d7002c1..4726339 100644 --- a/app/views/operator/jobs/_job_tr.html.erb +++ b/app/views/operator/jobs/_job_tr.html.erb @@ -13,7 +13,7 @@ <% end %> - <%= job.costumer_fullname %> + <%= job.customer_fullname %> <% if job.pdf.attached? %> diff --git a/app/views/profiles/show.html.erb b/app/views/profiles/show.html.erb index 9cff8d4..9fbcaf2 100644 --- a/app/views/profiles/show.html.erb +++ b/app/views/profiles/show.html.erb @@ -22,11 +22,11 @@

Aufgegebene Druckaufträge

Aufgegebene Druckaufträge - <%= current_user.costumer_jobs.size %> + <%= current_user.customer_jobs.size %>

Abgebrochene Druckaufgräge - <%= current_user.costumer_jobs.canceled.size %> + <%= current_user.customer_jobs.canceled.size %>

<% if is_admin_or_operator? %>

Bearbeitete Druckaufträge

diff --git a/config/locales/de.yml b/config/locales/de.yml index 8c9c9b7..18f1d0e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -33,8 +33,8 @@ de: job: pdf: "Plan (PDF Format)" privacy_policy: "Datenschutzerklärung" - costumer_firstname: "Vorname" - costumer_lastname: "Nachname" + customer_firstname: "Vorname" + customer_lastname: "Nachname" errors: models: job: diff --git a/db/migrate/20240727101347_create_jobs.rb b/db/migrate/20240727101347_create_jobs.rb index e21cf4d..e2dfd61 100644 --- a/db/migrate/20240727101347_create_jobs.rb +++ b/db/migrate/20240727101347_create_jobs.rb @@ -1,12 +1,12 @@ class CreateJobs < ActiveRecord::Migration[7.1] def change create_table :jobs do |t| - t.references :costumer, null: true + t.references :customer, null: true t.references :creator, null: true t.references :cashier, null: true t.references :operator, null: true - t.string :costumer_firstname - t.string :costumer_lastname + t.string :customer_firstname + t.string :customer_lastname t.string :operator_firstname t.string :operator_lastname t.string :cashier_firstname diff --git a/db/migrate/20240826144015_create_users.rb b/db/migrate/20240826144015_create_users.rb index 20d68c5..2790483 100644 --- a/db/migrate/20240826144015_create_users.rb +++ b/db/migrate/20240826144015_create_users.rb @@ -10,14 +10,14 @@ class CreateUsers < ActiveRecord::Migration[7.2] t.boolean :verified, null: false, default: false - t.integer :costumer_jobs_count, default: 0 + t.integer :customer_jobs_count, default: 0 t.integer :operator_jobs_count, default: 0 t.integer :created_jobs_count, default: 0 t.integer :cashed_jobs_count, default: 0 t.timestamps end - add_foreign_key :jobs, :users, column: :costumer_id + add_foreign_key :jobs, :users, column: :customer_id add_foreign_key :jobs, :users, column: :operator_id add_foreign_key :jobs, :users, column: :creator_id add_foreign_key :jobs, :users, column: :cashier_id diff --git a/db/schema.rb b/db/schema.rb index 4ffeb96..45a4ca1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -40,12 +40,12 @@ ActiveRecord::Schema[7.2].define(version: 2024_08_26_144016) do end create_table "jobs", force: :cascade do |t| - t.integer "costumer_id" + t.integer "customer_id" t.integer "creator_id" t.integer "cashier_id" t.integer "operator_id" - t.string "costumer_firstname" - t.string "costumer_lastname" + t.string "customer_firstname" + t.string "customer_lastname" t.string "operator_firstname" t.string "operator_lastname" t.string "cashier_firstname" @@ -68,8 +68,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_08_26_144016) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["cashier_id"], name: "index_jobs_on_cashier_id" - t.index ["costumer_id"], name: "index_jobs_on_costumer_id" t.index ["creator_id"], name: "index_jobs_on_creator_id" + t.index ["customer_id"], name: "index_jobs_on_customer_id" t.index ["operator_id"], name: "index_jobs_on_operator_id" t.index ["status"], name: "index_jobs_on_status" end @@ -90,7 +90,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_08_26_144016) do t.string "lastname" t.string "role", default: "user" t.boolean "verified", default: false, null: false - t.integer "costumer_jobs_count", default: 0 + t.integer "customer_jobs_count", default: 0 t.integer "operator_jobs_count", default: 0 t.integer "created_jobs_count", default: 0 t.integer "cashed_jobs_count", default: 0 @@ -103,8 +103,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_08_26_144016) do add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "jobs", "users", column: "cashier_id" - add_foreign_key "jobs", "users", column: "costumer_id" add_foreign_key "jobs", "users", column: "creator_id" + add_foreign_key "jobs", "users", column: "customer_id" add_foreign_key "jobs", "users", column: "operator_id" add_foreign_key "sessions", "users" end diff --git a/db/seeds.rb b/db/seeds.rb index d827872..a52ddda 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -78,7 +78,7 @@ end job = Job.new(status:, privacy_policy: true, created_at: created_at) job.pdf = File.open(Rails.root.join('db/pdfs/', pdf)) student = students[rand(0..9)] - job.costumer = student + job.customer = student job.creator = student operator = operators[rand(0...1)] job.operator = operator if status != :open @@ -112,7 +112,7 @@ end job = Job.new(status:, privacy_policy: true, created_at: created_at) job.pdf = File.open(Rails.root.join('db/pdfs/', pdf)) student = students[rand(0...9)] - job.costumer = student + job.customer = student job.creator = student operator = operators[rand(0...1)] job.operator = operator if status == :paid @@ -137,7 +137,7 @@ end job = Job.new(status:, privacy_policy: true) job.pdf = File.open(Rails.root.join('db/pdfs/', pdf)) student = students[rand(0...4)] - job.costumer = student + job.customer = student job.creator = student operator = operators[rand(0...1)] job.operator = operator if status != :open @@ -154,9 +154,9 @@ end job = Job.new(privacy_policy: true) job.pdf = File.open(Rails.root.join('db/pdfs/', pdf)) student = students[rand(0...9)] - job.costumer = [ student, student, false ].sample - job.costumer_firstname = student.firstname - job.costumer_lastname = student.lastname + job.customer = [ student, student, false ].sample + job.customer_firstname = student.firstname + job.customer_lastname = student.lastname job.creator = operators[rand(0...1)] job.created_by_operator = true job.inspect diff --git a/test/controllers/jobs_controller_test.rb b/test/controllers/jobs_controller_test.rb index 0645b7d..9b215a1 100644 --- a/test/controllers/jobs_controller_test.rb +++ b/test/controllers/jobs_controller_test.rb @@ -17,7 +17,7 @@ class JobsControllerTest < ActionDispatch::IntegrationTest test "should create job" do assert_difference("Job.count") do - post jobs_url, params: { job: { cost_center: @job.cost_center, costum_qm_plan: @job.costum_qm_plan, costumer_firstname: @job.costumer_firstname, costumer_id_id: @job.costumer_id_id, costumer_lastname: @job.costumer_lastname, intern: @job.intern, number_of_plans_a0: @job.number_of_plans_a0, number_of_plans_a1: @job.number_of_plans_a1, number_of_plans_a2: @job.number_of_plans_a2, number_of_plans_a3: @job.number_of_plans_a3, operator_firstname: @job.operator_firstname, operator_id_id: @job.operator_id_id, operator_lastname: @job.operator_lastname, paid: @job.paid, printed_at: @job.printed_at } } + post jobs_url, params: { job: { cost_center: @job.cost_center, costum_qm_plan: @job.costum_qm_plan, customer_firstname: @job.customer_firstname, customer_id_id: @job.customer_id_id, customer_lastname: @job.customer_lastname, intern: @job.intern, number_of_plans_a0: @job.number_of_plans_a0, number_of_plans_a1: @job.number_of_plans_a1, number_of_plans_a2: @job.number_of_plans_a2, number_of_plans_a3: @job.number_of_plans_a3, operator_firstname: @job.operator_firstname, operator_id_id: @job.operator_id_id, operator_lastname: @job.operator_lastname, paid: @job.paid, printed_at: @job.printed_at } } end assert_redirected_to job_url(Job.last) @@ -34,7 +34,7 @@ class JobsControllerTest < ActionDispatch::IntegrationTest end test "should update job" do - patch job_url(@job), params: { job: { cost_center: @job.cost_center, costum_qm_plan: @job.costum_qm_plan, costumer_firstname: @job.costumer_firstname, costumer_id_id: @job.costumer_id_id, costumer_lastname: @job.costumer_lastname, intern: @job.intern, number_of_plans_a0: @job.number_of_plans_a0, number_of_plans_a1: @job.number_of_plans_a1, number_of_plans_a2: @job.number_of_plans_a2, number_of_plans_a3: @job.number_of_plans_a3, operator_firstname: @job.operator_firstname, operator_id_id: @job.operator_id_id, operator_lastname: @job.operator_lastname, paid: @job.paid, printed_at: @job.printed_at } } + patch job_url(@job), params: { job: { cost_center: @job.cost_center, costum_qm_plan: @job.costum_qm_plan, customer_firstname: @job.customer_firstname, customer_id_id: @job.customer_id_id, customer_lastname: @job.customer_lastname, intern: @job.intern, number_of_plans_a0: @job.number_of_plans_a0, number_of_plans_a1: @job.number_of_plans_a1, number_of_plans_a2: @job.number_of_plans_a2, number_of_plans_a3: @job.number_of_plans_a3, operator_firstname: @job.operator_firstname, operator_id_id: @job.operator_id_id, operator_lastname: @job.operator_lastname, paid: @job.paid, printed_at: @job.printed_at } } assert_redirected_to job_url(@job) end diff --git a/test/fixtures/jobs.yml b/test/fixtures/jobs.yml index 396e27a..8fbffe2 100644 --- a/test/fixtures/jobs.yml +++ b/test/fixtures/jobs.yml @@ -2,11 +2,11 @@ one: operator_id: one - costumer_id: one + customer_id: one operator_firstname: MyString operator_lastname: MyString - costumer_firstname: MyString - costumer_lastname: MyString + customer_firstname: MyString + customer_lastname: MyString paid: false printed_at: 2024-07-27 12:13:47 intern: false @@ -19,11 +19,11 @@ one: two: operator_id: two - costumer_id: two + customer_id: two operator_firstname: MyString operator_lastname: MyString - costumer_firstname: MyString - costumer_lastname: MyString + customer_firstname: MyString + customer_lastname: MyString paid: false printed_at: 2024-07-27 12:13:47 intern: false diff --git a/test/system/jobs_test.rb b/test/system/jobs_test.rb index 2f0830c..2cd2c5e 100644 --- a/test/system/jobs_test.rb +++ b/test/system/jobs_test.rb @@ -16,9 +16,9 @@ class JobsTest < ApplicationSystemTestCase fill_in "Cost center", with: @job.cost_center fill_in "Costum qm plan", with: @job.costum_qm_plan - fill_in "Costumer firstname", with: @job.costumer_firstname - fill_in "Costumer id", with: @job.costumer_id_id - fill_in "Costumer lastname", with: @job.costumer_lastname + fill_in "customer firstname", with: @job.customer_firstname + fill_in "customer id", with: @job.customer_id_id + fill_in "customer lastname", with: @job.customer_lastname check "Intern" if @job.intern fill_in "Number of plans a0", with: @job.number_of_plans_a0 fill_in "Number of plans a1", with: @job.number_of_plans_a1 @@ -41,9 +41,9 @@ class JobsTest < ApplicationSystemTestCase fill_in "Cost center", with: @job.cost_center fill_in "Costum qm plan", with: @job.costum_qm_plan - fill_in "Costumer firstname", with: @job.costumer_firstname - fill_in "Costumer id", with: @job.costumer_id_id - fill_in "Costumer lastname", with: @job.costumer_lastname + fill_in "customer firstname", with: @job.customer_firstname + fill_in "customer id", with: @job.customer_id_id + fill_in "customer lastname", with: @job.customer_lastname check "Intern" if @job.intern fill_in "Number of plans a0", with: @job.number_of_plans_a0 fill_in "Number of plans a1", with: @job.number_of_plans_a1