[Noalyss-commit] [noalyss] 17/65: When creating a new event from dashboard then the event date is the remind date

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 6cf6a489a61e874bcb827e44e9a15d8e9d9329c1
Author: Dany De Bontridder <address@hidden>
Date:   Mon Aug 31 18:45:26 2015 +0200

    When creating a new event from dashboard then the event date is the remind 
date
---
 html/js/gestion.js          |    2 +-
 include/ajax_gestion.php    |    1 +
 include/class_follow_up.php |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/html/js/gestion.js b/html/js/gestion.js
index 408700b..d7c0e5d 100644
--- a/html/js/gestion.js
+++ b/html/js/gestion.js
@@ -294,7 +294,7 @@ function action_show(p_dossier)
     }
 }
 /**
- * @brief add a new event 
+ * @brief Display a box for adding a new event 
  * @param {type} p_dossier
  * @returns {undefined}
  */
diff --git a/include/ajax_gestion.php b/include/ajax_gestion.php
index 830acd9..d59c681 100644
--- a/include/ajax_gestion.php
+++ b/include/ajax_gestion.php
@@ -106,6 +106,7 @@ if ($op=='action_save')
     $gestion->dt_id=$type_event;
     $gestion->ag_comment=h($summary);
     $gestion->ag_timestamp=$date_event;
+    $gestion->ag_remind_date=$date_event;
     $content=_('Sauvé');
     $status='OK';
     try {
diff --git a/include/class_follow_up.php b/include/class_follow_up.php
index 229784e..f1aa84c 100644
--- a/include/class_follow_up.php
+++ b/include/class_follow_up.php
@@ -1803,11 +1803,14 @@ class Follow_Up
          */
         
         // save into the database
-        $this->ag_remind_date=null;
         $sql="insert into action_gestion".
-                    "(ag_id,ag_timestamp,ag_type,ag_title,f_id_dest,ag_ref, 
ag_dest, ".
+                    "(ag_id,ag_timestamp,ag_type,ag_title,f_id_dest,ag_ref, "
+                . "ag_dest, ".
                     "  ag_priority,ag_owner,ag_state,ag_remind_date) ".
-                    " values 
($1,to_date($2,'DD.MM.YYYY'),$3,$4,$5,$6,$7,$8,$9,$10,$11)";
+                    " values "
+                . "($1,to_date($2,'DD.MM.YYYY'),$3,$4,$5,$6,"
+                . "$7,"
+                . "$8,$9,$10,to_date($11,'DD.MM.YYYY'))";
         
         $this->db->exec_sql($sql, array(
             $this->ag_id, /* 1 */