From 200217edb6fb3cc30526362b87848b07b9cdc856 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 9 May 2019 15:29:43 +0100
Subject: [PATCH] FIX #10164 TIME 0:05 pb interval custom_date
---
apps/maarch_entreprise/reports/get_report_by_period_val.php | 4 ++--
modules/entities/get_entity_late_mail.php | 4 ++--
modules/entities/get_entity_process_delay.php | 4 ++--
modules/entities/get_entity_response_rate_stat.php | 4 ++--
modules/entities/get_entity_vol.php | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/maarch_entreprise/reports/get_report_by_period_val.php b/apps/maarch_entreprise/reports/get_report_by_period_val.php
index 0ec2eb33d5b..e064d7ba042 100755
--- a/apps/maarch_entreprise/reports/get_report_by_period_val.php
+++ b/apps/maarch_entreprise/reports/get_report_by_period_val.php
@@ -222,13 +222,13 @@ else if($period_type == 'custom_period')
if(isset($_REQUEST['date_start']) && $_REQUEST['date_start'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." > '".$db->format_date_db($_REQUEST['date_start'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." >= '".$db->format_date_db($_REQUEST['date_start'])."'";
$date_title .= strtolower(_SINCE).' '.$_REQUEST['date_start'].' ';
}
if(isset($_REQUEST['date_fin']) && $_REQUEST['date_fin'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." < '".$db->format_date_db($_REQUEST['date_fin'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." <= '".$db->format_date_db($_REQUEST['date_fin'])."'";
$date_title.= strtolower(_FOR).' '.$_REQUEST['date_fin'].' ';
}
if(empty($where_date))
diff --git a/modules/entities/get_entity_late_mail.php b/modules/entities/get_entity_late_mail.php
index 613a85e0cfd..0019785f63b 100755
--- a/modules/entities/get_entity_late_mail.php
+++ b/modules/entities/get_entity_late_mail.php
@@ -188,13 +188,13 @@ else if($period_type == 'custom_period')
if(isset($_REQUEST['date_start']) && $_REQUEST['date_start'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." > '".$db->format_date_db($_REQUEST['date_start'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." >= '".$db->format_date_db($_REQUEST['date_start'])."'";
$date_title .= strtolower(_SINCE).' '.$_REQUEST['date_start'].' ';
}
if(isset($_REQUEST['date_fin']) && $_REQUEST['date_fin'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." < '".$db->format_date_db($_REQUEST['date_fin'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." <= '".$db->format_date_db($_REQUEST['date_fin'])."'";
$date_title.= strtolower(_FOR).' '.$_REQUEST['date_fin'].' ';
}
if(empty($where_date))
diff --git a/modules/entities/get_entity_process_delay.php b/modules/entities/get_entity_process_delay.php
index 46b86af83eb..ad0e921bbe4 100755
--- a/modules/entities/get_entity_process_delay.php
+++ b/modules/entities/get_entity_process_delay.php
@@ -188,13 +188,13 @@ else if($period_type == 'custom_period')
if(isset($_REQUEST['date_start']) && $_REQUEST['date_start'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." > '".$db->format_date_db($_REQUEST['date_start'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." >= '".$db->format_date_db($_REQUEST['date_start'])."'";
$date_title .= strtolower(_SINCE).' '.$_REQUEST['date_start'].' ';
}
if(isset($_REQUEST['date_fin']) && $_REQUEST['date_fin'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." < '".$db->format_date_db($_REQUEST['date_fin'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." <= '".$db->format_date_db($_REQUEST['date_fin'])."'";
$date_title.= strtolower(_FOR).' '.$_REQUEST['date_fin'].' ';
}
if(empty($where_date))
diff --git a/modules/entities/get_entity_response_rate_stat.php b/modules/entities/get_entity_response_rate_stat.php
index 488783da133..26a70149b2a 100755
--- a/modules/entities/get_entity_response_rate_stat.php
+++ b/modules/entities/get_entity_response_rate_stat.php
@@ -189,13 +189,13 @@ else if($period_type == 'custom_period')
if(isset($_REQUEST['date_start']) && $_REQUEST['date_start'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." > '".$db->format_date_db($_REQUEST['date_start'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." >= '".$db->format_date_db($_REQUEST['date_start'])."'";
$date_title .= strtolower(_SINCE).' '.$_REQUEST['date_start'].' ';
}
if(isset($_REQUEST['date_fin']) && $_REQUEST['date_fin'] <> '')
{
- $where_date .= " AND ".$req->extract_date('creation_date')." < '".$db->format_date_db($_REQUEST['date_fin'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." <= '".$db->format_date_db($_REQUEST['date_fin'])."'";
$date_title.= strtolower(_FOR).' '.$_REQUEST['date_fin'].' ';
}
if(empty($where_date))
diff --git a/modules/entities/get_entity_vol.php b/modules/entities/get_entity_vol.php
index a9fdb661e15..677ac4e70ef 100755
--- a/modules/entities/get_entity_vol.php
+++ b/modules/entities/get_entity_vol.php
@@ -183,12 +183,12 @@ if ($period_type == 'period_year') {
}
if (isset($_REQUEST['date_start']) && $_REQUEST['date_start'] <> '') {
- $where_date .= " AND ".$req->extract_date('creation_date')." > '".$db->format_date_db($_REQUEST['date_start'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." >= '".$db->format_date_db($_REQUEST['date_start'])."'";
$date_title .= strtolower(_SINCE).' '.$_REQUEST['date_start'].' ';
}
if (isset($_REQUEST['date_fin']) && $_REQUEST['date_fin'] <> '') {
- $where_date .= " AND ".$req->extract_date('creation_date')." < '".$db->format_date_db($_REQUEST['date_fin'])."'";
+ $where_date .= " AND ".$req->extract_date('creation_date')." <= '".$db->format_date_db($_REQUEST['date_fin'])."'";
$date_title.= strtolower(_FOR).' '.$_REQUEST['date_fin'].' ';
}
if (empty($where_date)) {
--
GitLab