From 0771340c1bb6ad61ce1965f181baa75b37871ff3 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 3 Feb 2020 20:45:32 +0100 Subject: [PATCH] suite --- app/models/kaps_rappel.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/kaps_rappel.rb b/app/models/kaps_rappel.rb index 4f87ba6..cc430f6 100644 --- a/app/models/kaps_rappel.rb +++ b/app/models/kaps_rappel.rb @@ -19,9 +19,11 @@ class KapsRappel < ActiveRecord::Base def generate_rappel(kaps_day, time) 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.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) - 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)) + 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) + 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 puts "Un Rappel est lancé"