diff --git a/app/models/kaps_day.rb b/app/models/kaps_day.rb index 19345fe..2def00b 100644 --- a/app/models/kaps_day.rb +++ b/app/models/kaps_day.rb @@ -74,9 +74,9 @@ class KapsDay < ActiveRecord::Base end end - - def total_points - self.kapsmes.sum(:point_to_count) + before_validation do + self.total_points = self.kapsmes.sum(:point_to_count) + self.points = self.total_points_earneds end def total_points_earneds @@ -85,7 +85,7 @@ class KapsDay < ActiveRecord::Base def completed - (100.0 * self.total_points_earneds.to_f) / total_points.to_f + (100.0 * self.points.to_f) / total_points.to_f end diff --git a/app/models/kapsme.rb b/app/models/kapsme.rb index 2aa3e5c..40af149 100644 --- a/app/models/kapsme.rb +++ b/app/models/kapsme.rb @@ -30,6 +30,10 @@ class Kapsme < ActiveRecord::Base end + after_save do + self.kaps_day.save + end + def generate_token begin diff --git a/app/views/public/kaps_days/_kaps_day.html.haml b/app/views/public/kaps_days/_kaps_day.html.haml index 4accf31..ba18220 100644 --- a/app/views/public/kaps_days/_kaps_day.html.haml +++ b/app/views/public/kaps_days/_kaps_day.html.haml @@ -1,6 +1,12 @@ %tr#kaps_day{:id => kaps_day.id} %td= link_to l(kaps_day.date), [:public, kaps_day] + %td= kaps_day.total_points + %td= kaps_day.points + + %td + #pourcentage_inner + =render(:partial => "pourcentage", :locals => {:kaps_day => kaps_day}) diff --git a/app/views/public/kaps_days/show.html.haml b/app/views/public/kaps_days/show.html.haml index 1e4d119..dd8fbc5 100644 --- a/app/views/public/kaps_days/show.html.haml +++ b/app/views/public/kaps_days/show.html.haml @@ -9,7 +9,17 @@ -KapsRappel.generate_rappels - + +-prev_day = @kaps_day.p_customer.kaps_days.order("date DESC").where("date < ?", @kaps_day.date).first +-if prev_day + =link_to "< Jour précédent", public_kaps_day_path(prev_day) + + +-next_day = @kaps_day.p_customer.kaps_days.order("date ASC").where("date > ?", @kaps_day.date).first +-if next_day + =link_to "Jour suivant >", public_kaps_day_path(next_day) + + .qi_row .qi_pannel.qi_plain.padding{:style => "position:relative;"} #pourcentage_inner{:style => "position:absolute;top:0;left:0;right:0;"}