From 6fabe40aab92fc8b4ebe418559d3eaab5709a874 Mon Sep 17 00:00:00 2001 From: kfl62 Date: Mon, 23 Mar 2009 15:06:44 +0200 Subject: [PATCH] crud for TrstHrEmployee --- app/models/trst_hr.rb | 1 + app/models/trst_hr_employee.rb | 10 ++++ app/views/trst_sys/hr/employee/_edit.html.erb | 35 ++++++++++--- app/views/trst_sys/hr/employee/_list.html.erb | 12 ++--- app/views/trst_sys/hr/employee/_save.html.erb | 20 ++++---- app/views/trst_sys/hr/employee/_show.html.erb | 6 +-- config/locales/trst_hr_employee.yml | 50 +++++++++---------- 7 files changed, 83 insertions(+), 51 deletions(-) diff --git a/app/models/trst_hr.rb b/app/models/trst_hr.rb index 4dd9f7d..a34d2e6 100644 --- a/app/models/trst_hr.rb +++ b/app/models/trst_hr.rb @@ -24,6 +24,7 @@ #Descriere .... class TrstHr < ActiveRecord::Base has_one :trst_hr_pdt + has_one :trst_hr_employee def self.per_page 20 diff --git a/app/models/trst_hr_employee.rb b/app/models/trst_hr_employee.rb index c291bf1..81d8d25 100644 --- a/app/models/trst_hr_employee.rb +++ b/app/models/trst_hr_employee.rb @@ -55,6 +55,8 @@ #Descriere .... class TrstHrEmployee < ActiveRecord::Base belongs_to :trst_hr + belongs_to :trst_firm + belongs_to :trst_payroll_job def self.per_page 20 @@ -63,5 +65,13 @@ def self.per_page def hr_name "( " + self.trst_hr_id.to_s + " ) " + self.trst_hr.full_name end + + def firm_name + "( " + self.trst_firm_id.to_s + " ) " + self.trst_firm.full_name + end + + def job_name + "( " + self.trst_payroll_job.jobID + " ) " + self.trst_payroll_job.descript + end end diff --git a/app/views/trst_sys/hr/employee/_edit.html.erb b/app/views/trst_sys/hr/employee/_edit.html.erb index 8b1ca6f..7ba159a 100644 --- a/app/views/trst_sys/hr/employee/_edit.html.erb +++ b/app/views/trst_sys/hr/employee/_edit.html.erb @@ -1,10 +1,10 @@ -
+
<% if params[:obj_id] == "new" - obj = TrstReplaceMe new + obj = TrstHrEmployee.new else - obj = find_obj(TrstReplaceMe,params[:obj_id]) + obj = find_obj(TrstHrEmployee,params[:obj_id]) end -%> - <% remote_form_for :replace_me_with_form_for, obj, + <% remote_form_for :employee, obj, :url => {:action => 'task', :id => params[:id], :type => 'save', :obj_id => params[:obj_id]} do |f| %> @@ -15,8 +15,31 @@ - <%= f.td_label_tag :ReplaceMe %> - <%= f.td_text_field :ReplaceMe %> + <%= f.td_label_tag :trst_hr_id %> + <%= f.td_auto_complete_search :trst_hr_id, :size => 24, + :search_object => 'TrstHr', + :search_method => 'lst_name', + :hidden_field_value => 'id', + :informal => 'full_name' + %> + + + <%= f.td_label_tag :trst_firm_id %> + <%= f.td_auto_complete_search :trst_firm_id, :size => 24, + :search_object => 'TrstFirm', + :search_method => 'name', + :hidden_field_value => 'id', + :informal => 'full_name' + %> + + + <%= f.td_label_tag :trst_payroll_job_id %> + <%= f.td_auto_complete_search :trst_payroll_job_id, :size => 24, + :search_object => 'TrstPayrollJob', + :search_method => 'descript', + :hidden_field_value => 'id', + :informal => 'jobID' + %> <%= f.hidden_fields :updated_by => current_trst_user.id %> <%= f.last_row_for :edit %> diff --git a/app/views/trst_sys/hr/employee/_list.html.erb b/app/views/trst_sys/hr/employee/_list.html.erb index e0fd322..35de1ce 100644 --- a/app/views/trst_sys/hr/employee/_list.html.erb +++ b/app/views/trst_sys/hr/employee/_list.html.erb @@ -1,4 +1,4 @@ -<% obj = trst_find_all(TrstReplaceMe) ; i = obj.offset %> +<% obj = trst_find_all(TrstHrEmployee) ; i = obj.offset %> <% if obj.length == 0 %> @@ -7,20 +7,18 @@
- <%= th_label_tag obj, :ReplaceMe %> - ... + <%= th_label_tag obj, :id %> <% for o in obj %> " > - <%= td_value_tag o, :ReplaceMe %> - ... + <%= td_value_tag o, :id %> <%= link_to_task o, :last_column %> <% end %> - <%= last_row_for obj, :row20, {:colspan => .., :offset => i } %> - <%= last_row_for obj, :list, {:colspan => .. } %> + <%= last_row_for obj, :row20, {:colspan => 12, :offset => i } %> + <%= last_row_for obj, :list, {:colspan => 11 } %>
  
<%= i += 1 %>.
diff --git a/app/views/trst_sys/hr/employee/_save.html.erb b/app/views/trst_sys/hr/employee/_save.html.erb index 83448a4..524c826 100644 --- a/app/views/trst_sys/hr/employee/_save.html.erb +++ b/app/views/trst_sys/hr/employee/_save.html.erb @@ -1,17 +1,17 @@ <% if params[:obj_id] == "new" - params[:replace_me_with_form_for][:created_by] = current_trst_user.id - save_obj(Trst.ReplaceMe,params[:obj_id],params[:replace_me_with_form_for]) - o = find_obj(Trst.ReplaceMe,'last') + params[:employee][:created_by] = current_trst_user.id + save_obj(TrstHrEmployee,params[:obj_id],params[:employee]) + o = find_obj(TrstHrEmployee,'last') params[:obj_id] = o.id - obs = t('tasks.replace_me_with_trans.save.create') + obs = t('tasks.db_trst_hr_employee.save.create') elsif params[:remove] - o = find_obj(Trst.ReplaceMe,params[:obj_id]) - obs = t('tasks.replace_me_with_trans.save.remove', :TransParam => o.Value) - Trst.ReplaceMe.delete(params[:obj_id]) + o = find_obj(TrstHrEmployee,params[:obj_id]) + obs = t('tasks.db_trst_hr_employee.save.remove', :employee_name => o.trst_hr.full_name) + TrstHrEmployee.delete(params[:obj_id]) else - save_obj(Trst.ReplaceMe,params[:obj_id],params[:replace_me_with_form_for]) - o = find_obj(Trst.ReplaceMe,params[:obj_id]) - obs = t('tasks.replace_me_with_trans.save.update') + save_obj(TrstHrEmployee,params[:obj_id],params[:employee]) + o = find_obj(TrstHrEmployee,params[:obj_id]) + obs = t('tasks.db_trst_hr_employee.save.update') end -%> <% if params[:remove] %>
diff --git a/app/views/trst_sys/hr/employee/_show.html.erb b/app/views/trst_sys/hr/employee/_show.html.erb index d45647e..c6f69a4 100644 --- a/app/views/trst_sys/hr/employee/_show.html.erb +++ b/app/views/trst_sys/hr/employee/_show.html.erb @@ -1,5 +1,5 @@
- <% o = find_obj(TrstReplaceMe,params[:obj_id]) %> + <% o = find_obj(TrstHrEmployee,params[:obj_id]) %> @@ -9,8 +9,8 @@ - <%= td_label_tag o, :ReplaceMe %> - <%= td_value_tag o, :ReplaceMe %> + <%= td_label_tag o, :id %> + <%= td_value_tag o, :id %> diff --git a/config/locales/trst_hr_employee.yml b/config/locales/trst_hr_employee.yml index e58a272..28de5a1 100644 --- a/config/locales/trst_hr_employee.yml +++ b/config/locales/trst_hr_employee.yml @@ -88,28 +88,28 @@ ro: tasks: db_hr_employee: list: - id: "" - trst_hr_id: "" - trst_firm_id: "" - trst_payroll_job_id: "" - CIM_id: "" - CIM_date: "" - ITM_id: "" - ITM_date: "" - PM_sr: "" - PM_nr: "" - PM_date: "" - CIM_object: "" - CIM_durata: "" - CIM_start: "" - CIM_end: "" - wrkh_day: "" - wrkh_week: "" + id: "Id." + trst_hr_id: "Nume angajat" + trst_firm_id: "Firma/Angajator" + trst_payroll_job_id: "Ocupaţia" + CIM_id: "Marca" + CIM_date: "Data angajării" + ITM_id: "Nr. ITM" + ITM_date: "Data înregistrării" + PM_sr: "Permis de muncă seria" + PM_nr: "Permis de muncă nr." + PM_date: "Permis de muncă dată" + CIM_object: "Obiectul contractului" + CIM_durata: "Durata" + CIM_start: "De la" + CIM_end: "Pâna la" + wrkh_day: "Ore/Zi" + wrkh_week: "Ore/Săptămână" wrkh_day_1: "" wrkh_week_1: "" - CO_days: "" - CO_dayss: "" - slry_month: "" + CO_days: "Zile CO" + CO_dayss: "Zile CO supl." + slry_month: "Salar lunar" slry_2a: "" slry_2b: "" slry_2c: "" @@ -126,15 +126,15 @@ ro: create: "Detaliile ptr. angajat au fost create ..." update: "Modificările au fost salvate..." remove: "Detaliile ptr. angajatul {{employee_name}} a fost şterse..." - link_to_show: "Detalii firmă" - link_to_list: "Lista firmelor" + link_to_show: "Detalii angajat" + link_to_list: "Lista angajaţilor" show: - link_to_edit: "Editare firmă" - link_to_list: "Lista firmelor" + link_to_edit: "Editare angajat" + link_to_list: "Lista angajaţilor" activerecord: attributes: trst_hr_employee: - id: "ID" + id: "Id" trst_hr_id: "Nume" trst_firm_id: "Firma" trst_payroll_job_id: "Ocupaţia"