suite

app/mailers/general_mailer.rb

@@ -29,7 +29,7 @@ class GeneralMailer < ActionMailer::Base
   
   def new_send_qi_mail(options = {})
     
-    mail to: options[:to], :subject => "[KapsMe] "+options[:subject] do |format|
+    mail to: options[:to], :subject => options[:subject] do |format|
        format.html { render :inline => options[:body] }
       
     end 

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)
+      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)) )
-        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 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é"