#9 add total sum to reports

jodeci · Nov 8, 2018 · 2743201 · 2743201
1 parent e15e6a4
commit 2743201
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/app/models/report.rb b/app/models/report.rb
@@ -21,6 +21,41 @@ def service_income(year)
     def ordered
       Report.order(employee_id: :asc, year: :asc, month: :asc)
     end
+
+    def sum_by_festival(year, festival)
+      Report
+        .salary_income(year)
+        .where(festival_type: festival)
+        .sum(:festival_bonus)
+        .to_i
+    end
+
+    def sum_by_employee_salary(year:, employee_id:)
+      Report
+        .salary_income(year)
+        .where(employee_id: employee_id)
+        .sum_amount
+    end
+
+    def sum_by_employee_service(year:, employee_id:)
+      Report
+        .service_income(year)
+        .where(employee_id: employee_id)
+        .sum_amount
+    end
+
+    def sum_by_month(year:, month:, tax_code:)
+      Report
+        .where(tax_code: tax_code, year: year, month: month)
+        .sum_amount
+    end
+
+    def sum_amount
+      Report
+        .pluck("SUM(amount), SUM(correction), SUM(subsidy_income) * -1")
+        .flatten
+        .reduce(0) { |sum, column| sum + column.to_i }
+    end
   end
 
   def adjusted_amount

diff --git a/app/views/reports/salary.haml b/app/views/reports/salary.haml
@@ -14,6 +14,7 @@
       %th 端午
       %th 中秋
       %th 年終
+      %th 總計
 
     - @report.each do |row|
       %tr
@@ -25,3 +26,15 @@
         %td= number_with_delimiter row[:festival_bonus][:dragonboat]
         %td= number_with_delimiter row[:festival_bonus][:midautumn]
         %td= number_with_delimiter row[:festival_bonus][:newyear]
+        %td= number_with_delimiter Report.sum_by_employee_salary(year: params[:year], employee_id: row[:employee][:id])
+
+    %tr
+      %td 總計
+      %td.hide
+      %td.hide
+      - 1.upto(12) do |month|
+        %td= number_with_delimiter Report.sum_by_month(year: params[:year], month: month, tax_code: 50)
+      %td= number_with_delimiter Report.sum_by_festival(params[:year], :dragonboat)
+      %td= number_with_delimiter Report.sum_by_festival(params[:year], :midautumn)
+      %td= number_with_delimiter Report.sum_by_festival(params[:year], :newyear)
+      %td
diff --git a/app/views/reports/service.haml b/app/views/reports/service.haml
@@ -11,10 +11,20 @@
       %th.hide 戶籍地址
       - 1.upto(12) do |month|
         %th= "#{month} 月"
+      %th 總計
     - @report.each do |row|
       %tr
         %td= link_to row[:employee][:name], employee_path(row[:employee][:id])
         %td.hide= row[:employee][:id_number]
         %td.hide= row[:employee][:address]
         - 12.times do |month|
           = render "cell", cell: row[:income][month]
+        %td= number_with_delimiter Report.sum_by_employee_service(year: params[:year].to_i, employee_id: row[:employee][:id])
+    %tr
+      %td 總計
+      %td.hide
+      %td.hide
+      %td= number_with_delimiter Report.sum_by_month(year: (params[:year].to_i - 1), month: 12, tax_code: "9a")
+      - 1.upto(11) do |month|
+        %td= number_with_delimiter Report.sum_by_month(year: params[:year], month: month, tax_code: "9a")
+      %td