Permalink
Browse files

Removing unnecessory file from repository

  • Loading branch information...
2 parents 2a53999 + 477bd0a commit f8bdccad04ee25d8b371e58b1850db5f2a8ec0fa @adityaswaroop committed Apr 4, 2012
Showing with 138 additions and 167 deletions.
  1. +2 −2 app/controllers/attendance_configurations_controller.rb
  2. +2 −2 app/controllers/branches_controller.rb
  3. +2 −2 app/controllers/classification_headings_controller.rb
  4. +2 −2 app/controllers/classifications_controller.rb
  5. +2 −2 app/controllers/companies_controller.rb
  6. +1 −1 app/controllers/employee_details_controller.rb
  7. +2 −2 app/controllers/employees_controller.rb
  8. +2 −2 app/controllers/esi_group_rates_controller.rb
  9. +2 −2 app/controllers/esi_groups_controller.rb
  10. +2 −2 app/controllers/financial_institutions_controller.rb
  11. +3 −3 app/controllers/holidays_controller.rb
  12. +2 −2 app/controllers/hr_categories_controller.rb
  13. +2 −2 app/controllers/hr_category_details_controller.rb
  14. +3 −4 app/controllers/hr_masters_controller.rb
  15. +4 −4 app/controllers/paymonths_controller.rb
  16. +2 −2 app/controllers/pf_group_rates_controller.rb
  17. +2 −2 app/controllers/pf_groups_controller.rb
  18. +1 −1 app/controllers/pt_group_rates_controller.rb
  19. +2 −2 app/controllers/pt_groups_controller.rb
  20. +2 −2 app/controllers/pt_rates_controller.rb
  21. +2 −9 app/controllers/salary_allotments_controller.rb
  22. +2 −2 app/controllers/salary_groups_controller.rb
  23. +2 −2 app/controllers/salary_heads_controller.rb
  24. +2 −2 app/controllers/states_controller.rb
  25. +0 −3 app/helpers/application_helper.rb
  26. +0 −2 app/helpers/attendance_configurations_helper.rb
  27. +0 −2 app/helpers/branches_helper.rb
  28. +0 −2 app/helpers/classification_headings_helper.rb
  29. +0 −2 app/helpers/classifications_helper.rb
  30. +0 −2 app/helpers/companies_helper.rb
  31. +0 −2 app/helpers/default_values_helper.rb
  32. +0 −2 app/helpers/employee_details_helper.rb
  33. +0 −2 app/helpers/employees_helper.rb
  34. +0 −2 app/helpers/esi_group_rates_helper.rb
  35. +0 −2 app/helpers/esi_groups_helper.rb
  36. +0 −2 app/helpers/financial_institutions_helper.rb
  37. +0 −2 app/helpers/holidays_helper.rb
  38. +0 −2 app/helpers/leave_details_helper.rb
  39. +0 −2 app/helpers/paymonths_helper.rb
  40. +0 −2 app/helpers/pf_esi_rates_helper.rb
  41. +0 −2 app/helpers/pf_group_rates_helper.rb
  42. +0 −2 app/helpers/pf_groups_helper.rb
  43. +0 −2 app/helpers/pt_group_rates_helper.rb
  44. +0 −2 app/helpers/pt_groups_helper.rb
  45. +0 −2 app/helpers/pt_rates_helper.rb
  46. +0 −2 app/helpers/salaries_helper.rb
  47. +0 −2 app/helpers/salary_group_details_helper.rb
  48. +0 −2 app/helpers/salary_groups_helper.rb
  49. +0 −2 app/helpers/salary_heads_helper.rb
  50. +0 −2 app/helpers/salary_totals_helper.rb
  51. +0 −2 app/helpers/states_helper.rb
  52. +0 −8 app/models/employee.rb
  53. +6 −4 app/models/employee_detail.rb
  54. +3 −0 app/models/hr_master.rb
  55. +1 −1 app/models/salary.rb
  56. +12 −1 app/models/salary_allotment.rb
  57. +2 −2 app/views/hr_masters/edit.html.haml
  58. +1 −1 app/views/hr_masters/new.html.haml
  59. +3 −3 app/views/salaries/edit.html.haml
  60. +3 −3 app/views/salaries/new.html.haml
  61. +1 −1 app/views/salary_allotments/edit.html.haml
  62. +21 −21 config/routes.rb
  63. +16 −3 spec/controllers/employee_details_controller_spec.rb
  64. +8 −4 spec/controllers/salaries_controller_spec.rb
  65. +1 −0 spec/controllers/salary_allotments_controller_spec.rb
  66. BIN spec/factories/Template_Theoretical_Salary_No_allot.xls
  67. +4 −1 spec/models/employee_detail_spec.rb
  68. +2 −1 spec/models/salary_allotment_spec.rb
  69. +4 −0 spec/models/salary_spec.rb
@@ -28,7 +28,7 @@ def create
format.html { redirect_to attendance_configurations_url, notice: 'Attendance configuration was successfully created.' }
format.json { render json: @attendance_configuration, status: :created, location: @attendance_configuration }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @attendance_configuration.errors, status: :unprocessable_entity }
end
end
@@ -40,7 +40,7 @@ def update
format.html { redirect_to attendance_configurations_url, notice: 'Attendance configuration was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @attendance_configuration.errors, status: :unprocessable_entity }
end
end
@@ -35,7 +35,7 @@ def create
format.html { redirect_to @branch, notice: 'Branch was successfully created.' }
format.json { render json: @branch, status: :created, location: @branch }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @branch.errors, status: :unprocessable_entity }
end
end
@@ -47,7 +47,7 @@ def update
format.html { redirect_to @branch, notice: 'Branch was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @branch.errors, status: :unprocessable_entity }
end
end
@@ -28,7 +28,7 @@ def create
format.html { redirect_to classification_headings_url, notice: 'Classification heading was successfully created.' }
format.json { render json: @classification_heading, status: :created, location: @classification_heading }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @classification_heading.errors, status: :unprocessable_entity }
end
end
@@ -42,7 +42,7 @@ def update
format.html { redirect_to classification_headings_url, notice: 'Classification heading was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @classification_heading.errors, status: :unprocessable_entity }
end
end
@@ -34,7 +34,7 @@ def create
format.html { redirect_to classifications_path(:params1 => @paramclassification_id), notice: 'Classification was successfully created.' }
format.json { render json: @classification, status: :created, location: @classification }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @classification.errors, status: :unprocessable_entity }
end
end
@@ -47,7 +47,7 @@ def update
format.html { redirect_to classifications_url(:params1 => @paramclassification_id), notice: 'Classification was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @classification.errors, status: :unprocessable_entity }
end
end
@@ -24,7 +24,7 @@ def create
if @company.save
format.html { redirect_to companies_path, notice: 'Company was successfully created.' }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
end
end
end
@@ -36,7 +36,7 @@ def update
if @company.update_attributes(params[:company])
format.html { redirect_to companies_path, notice: 'Company was successfully updated.' }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
end
end
end
@@ -126,7 +126,7 @@ def update
format.html { redirect_to employee_details_path(:param1 => params[:employee_detail]['employee_id']), notice: 'Employee detail was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @employee_detail.errors, status: :unprocessable_entity }
end
end
@@ -37,7 +37,7 @@ def create
format.html { redirect_to @employee, notice: 'Employee was successfully created.' }
format.json { render json: @employee, status: :created, location: @employee }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @employee.errors, status: :unprocessable_entity }
end
end
@@ -49,7 +49,7 @@ def update
format.html { redirect_to @employee, notice: 'Employee was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @employee.errors, status: :unprocessable_entity }
end
end
@@ -34,7 +34,7 @@ def create
format.html { redirect_to esi_group_rates_url(:params1 => @param_esi_group_id), notice: 'Esi group rate was successfully created.' }
format.json { render json: @esi_group_rate, status: :created, location: @esi_group_rate }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @esi_group_rate.errors, status: :unprocessable_entity }
end
end
@@ -49,7 +49,7 @@ def update
format.html { redirect_to esi_group_rates_url(:params1 => @param_esi_group_id), notice: 'Esi group rate was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @esi_group_rate.errors, status: :unprocessable_entity }
end
end
@@ -28,7 +28,7 @@ def create
format.html { redirect_to esi_groups_url, notice: 'Esi group was successfully created.' }
format.json { render json: @esi_group, status: :created, location: @esi_group }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @esi_group.errors, status: :unprocessable_entity }
end
end
@@ -40,7 +40,7 @@ def update
format.html { redirect_to esi_groups_url, notice: 'Esi group was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @esi_group.errors, status: :unprocessable_entity }
end
end
@@ -35,7 +35,7 @@ def create
format.html { redirect_to @financial_institution, notice: 'Financial institution was successfully created.' }
format.json { render json: @financial_institution, status: :created, location: @financial_institution }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @financial_institution.errors, status: :unprocessable_entity }
end
end
@@ -47,7 +47,7 @@ def update
format.html { redirect_to @financial_institution, notice: 'Financial institution was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @financial_institution.errors, status: :unprocessable_entity }
end
end
@@ -39,15 +39,15 @@ def create
@holiday = Holiday.new
@holiday.errors.add(:holiday, " already assigned for selected date and selected Attendance Head")
respond_to do |format|
- format.html { render action: "new"}
+ format.html { render 'new'}
end
else
respond_to do |format|
if @holiday.save
format.html { redirect_to @holiday, notice: 'Holiday was successfully created.' }
format.json { render json: @holiday, status: :created, location: @holiday }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @holiday.errors, status: :unprocessable_entity }
end
end
@@ -60,7 +60,7 @@ def update
format.html { redirect_to @holiday, notice: 'Holiday was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @holiday.errors, status: :unprocessable_entity }
end
end
@@ -28,7 +28,7 @@ def create
format.html { redirect_to hr_categories_path, notice: 'Hr category was successfully created.' }
format.json { render json: @hr_category, status: :created, location: @hr_category }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @hr_category.errors, status: :unprocessable_entity }
end
end
@@ -40,7 +40,7 @@ def update
format.html { redirect_to hr_categories_path, notice: 'Hr category was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @hr_category.errors, status: :unprocessable_entity }
end
end
@@ -36,7 +36,7 @@ def create
format.html { redirect_to hr_category_details_path(:param1=> @hr_category_detail.hr_category_id), notice: 'Hr category detail was successfully created.' }
format.json { render json: @hr_category_detail, status: :created, location: @hr_category_detail }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @hr_category_detail.errors, status: :unprocessable_entity }
end
end
@@ -48,7 +48,7 @@ def update
format.html { redirect_to hr_category_details_path(:param1 => params[:hr_category_detail]['hr_category_id']), notice: 'Hr category detail was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @hr_category_detail.errors, status: :unprocessable_entity }
end
end
@@ -10,16 +10,15 @@ def new
@hr_category = HrCategory.find_by_id(@hr_category_id)
@hr_category_details = @hr_category.hr_category_details.order("created_at ASC")
@hr_masters = HrMaster.find_all_by_employee_id_and_hr_category_id(@employee_id, @hr_category_id)
-
+ @employee = Employee.find(@employee_id)
respond_to do |format|
format.html # new.html.haml
format.json { render json: @hr_master }
end
end
def edit
- @employee_id = @hr_master.employee_id
- @hr_category_id = @hr_master.hr_category_id
+
end
def create
@@ -41,7 +40,7 @@ def update
format.html { redirect_to new_hr_master_path(:employee_id => params[:hr_master][:employee_id], :hr_category_id => params[:hr_master][:hr_category_id]), notice: 'Hr master was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @hr_master.errors, status: :unprocessable_entity }
end
end
@@ -23,22 +23,22 @@ def create
format.html {redirect_to paymonths_url, notice: 'Paymonth was successfully created.' }
format.json { render json: @paymonth, status: :created, location: @paymonth }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @paymonth.errors, status: :unprocessable_entity }
end
end
else
@paymonth = Paymonth.new
@paymonth.errors.add(:paymonth, "Out of sequence Month/Year can not be created. Next Month to be created is #{res[1]}")
respond_to do |format|
- format.html { render action: "new"}
+ format.html { render 'new'}
end
end
else
@paymonth = Paymonth.new
@paymonth.errors.add(:paymonth, "is invalid.")
respond_to do |format|
- format.html { render action: "new" }
+ format.html { render 'new' }
end
end
end
@@ -49,7 +49,7 @@ def update
format.html { redirect_to paymonths_url, notice: 'Paymonth was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @paymonth.errors, status: :unprocessable_entity }
end
end
@@ -45,7 +45,7 @@ def create
format.html { redirect_to pf_group_rates_url(:params1 => @param_pf_group_id), notice: 'Pf group rate was successfully created.' }
format.json { render json: @pf_group_rate, status: :created, location: @pf_group_rate }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @pf_group_rate.errors, status: :unprocessable_entity }
end
end
@@ -58,7 +58,7 @@ def update
format.html { redirect_to pf_group_rates_url(:params1 => @param_pf_group_id), notice: 'Pf group rate was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @pf_group_rate.errors, status: :unprocessable_entity }
end
end
@@ -28,7 +28,7 @@ def create
format.html { redirect_to pf_groups_url, notice: 'Pf group was successfully created.' }
format.json { render json: @pf_group, status: :created, location: @pf_group }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @pf_group.errors, status: :unprocessable_entity }
end
end
@@ -40,7 +40,7 @@ def update
format.html { redirect_to pf_groups_url, notice: 'Pf group was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @pf_group.errors, status: :unprocessable_entity }
end
end
@@ -19,7 +19,7 @@ def create
format.html { redirect_to pt_group_path(:id => @pt_group_rate.pt_group_id), notice: 'Pt group rate was successfully created.' }
format.json { render json: @pt_group_rate, status: :created, location: @pt_group_rate }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @pt_group_rate.errors, status: :unprocessable_entity }
end
end
@@ -36,7 +36,7 @@ def create
format.html { redirect_to pt_groups_path, notice: 'Pt group was successfully created.' }
format.json { render json: @pt_group, status: :created, location: @pt_group }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @pt_group.errors, status: :unprocessable_entity }
end
end
@@ -48,7 +48,7 @@ def update
format.html { redirect_to @pt_group, notice: 'Pt group was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @pt_group.errors, status: :unprocessable_entity }
end
end
@@ -35,7 +35,7 @@ def create
format.html { redirect_to pt_rates_path(:paymonth_id => @pt_rate.paymonth_id, :pt_group_id => @pt_rate.pt_group_id), notice: 'Pt rate was successfully created.' } #@pt_rate redirect_to pt_group_path(:id => @pt_group_rate.pt_group_id)
format.json { render json: @pt_rate, status: :created, location: @pt_rate }
else
- format.html { render action: "new" }
+ format.html { render 'new' }
format.json { render json: @pt_rate.errors, status: :unprocessable_entity }
end
end
@@ -47,7 +47,7 @@ def update
format.html { redirect_to pt_rates_path(:paymonth_id => @pt_rate.paymonth_id, :pt_group_id => @pt_rate.pt_group_id), notice: 'Pt rate was successfully updated.' }
format.json { head :ok }
else
- format.html { render action: "edit" }
+ format.html { render 'edit' }
format.json { render json: @pt_rate.errors, status: :unprocessable_entity }
end
end
Oops, something went wrong.

0 comments on commit f8bdcca

Please sign in to comment.