[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 17/65: When creating a new event from dashboa
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 17/65: When creating a new event from dashboard then the event date is the remind date |
Date: |
Wed, 09 Sep 2015 08:27:10 +0000 |
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 */
- [Noalyss-commit] [noalyss] 08/65: esthetic, (continued)
- [Noalyss-commit] [noalyss] 08/65: esthetic, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 09/65: duplicate in navigator, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 12/65: avoid problem with cache for static file, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 05/65: Esthetic + the parent template is mandatory, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 07/65: Ethetic button confirm and alert, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 13/65: Manuel and reduce size logo, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 14/65: bug in redirect, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 10/65: Esthetic + upgrade db, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 16/65: order by receipt number in dashboard, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 11/65: Esthetic, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 17/65: When creating a new event from dashboard then the event date is the remind date,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 18/65: Update the template for the config file, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 19/65: remove margin in tabs_, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 20/65: Bug#1170 : button with wrong redirect, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 21/65: Bug#1166 : in No VAT mode , the amount is divided by 1000, due to an excedent of nbm, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 23/65: beter size for subject, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 15/65: bug in redirect, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 24/65: Update documentation, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 22/65: Script SQL à ajouter, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 27/65: Better debugging : add a button to show the request $_POST and $_GET, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 25/65: insert contact, Dany De Bontridder, 2015/09/09