This commit is contained in:
Nicolas Bally 2020-02-03 23:03:04 +01:00
parent 70d091c8fd
commit 3ef1cd20ac

View File

@ -20,7 +20,7 @@ class KapsRappel < ActiveRecord::Base
if kaps_rappel_items = KapsRappelItem.where(:kaps_rappel_id => self.id, :kaps_day_id => kaps_day.id) and count = kaps_rappel_items.count and count < (self.nbr_rep.to_i + 1) if kaps_rappel_items = KapsRappelItem.where(:kaps_rappel_id => self.id, :kaps_day_id => kaps_day.id) and count = kaps_rappel_items.count and count < (self.nbr_rep.to_i + 1)
if kapsme = kaps_day.kapsmes.where(:kap_id => self.kap_id).first and ((!kapsme.done and !kapsme.paused) or (!kapsme.done and self.paused_inc)) if kapsme = kaps_day.kapsmes.where(:kap_id => self.kap_id).first and ((!kapsme.done and !kapsme.paused) or (!kapsme.done and self.paused_inc))
if kaps_rappel_items.count == 0 or (time > kaps_rappel_items.order("created_at DESC").first.created_at + (self.minutes_rep.to_i >= 1 ? self.minutes_rep.to_i : 15).minutes) if kaps_rappel_items.count == 0 or (time > kaps_rappel_items.order("created_at DESC").first.created_at + (self.minutes_rep.to_i >= 15 ? self.minutes_rep.to_i : 15).minutes)
KapsRappelItem.create(:kaps_rappel_id => self.id, :kaps_day_id => kaps_day.id, :kapsme_id => kaps_day.kapsmes.where(:kap_id => self.kap_id).first.id, :number => (count + 1)) KapsRappelItem.create(:kaps_rappel_id => self.id, :kaps_day_id => kaps_day.id, :kapsme_id => kaps_day.kapsmes.where(:kap_id => self.kap_id).first.id, :number => (count + 1))
end end