|
|
|
@ -102,6 +102,20 @@ class Entry < ApplicationRecord |
|
|
|
.to_h |
|
|
|
end |
|
|
|
|
|
|
|
def self.total_gesamtkosten_by_year(user) |
|
|
|
semester_by_year = total_semesterkosten_by_year(user) |
|
|
|
km_by_year = total_kilometer_cost_by_year(user) |
|
|
|
|
|
|
|
years = (semester_by_year.keys + km_by_year.keys).uniq.sort.reverse |
|
|
|
|
|
|
|
years.each_with_object({}) do |year, out| |
|
|
|
semester = (semester_by_year[year] || 0).to_d |
|
|
|
km = (km_by_year[year] || 0).to_d |
|
|
|
out[year] = (semester + km).round(2) |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def jahr |
|
|
|
date.year |
|
|
|
end |
|
|
|
|