composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N.701 (continuation of [r4596] which introduced regressions on the handling of date fields)

Browse Source 
SVN:trunk[4626]
This commit is contained in:
Romain Quetiez
2017-03-28 14:56:52 +00:00
parent 3daf4c62db
commit 399662ef99
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
synchro/synchro_import.php
View File

@@ -214,7 +214,7 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
return trim($sValue);
}
function ChangeDateFormat($sProposedDate, $sFormat)
function ChangeDateFormat($sProposedDate, $sFormat, $bDateOnly)
{
if ($sProposedDate == '')
{
@@ -233,7 +233,8 @@ function ChangeDateFormat($sProposedDate, $sFormat)
$oDate = $oFormat->Parse($sProposedDate);
if ($oDate !== null)
{
$sDate = $oDate->format(AttributeDateTime::GetInternalFormat());
$oTargetFormat = $bDateOnly ? AttributeDate::GetInternalFormat() : AttributeDateTime::GetInternalFormat();
$sDate = $oDate->format($oTargetFormat);
return $sDate;
}
else
@@ -444,7 +445,20 @@ try
// Check columns
$aColumns = $oDataSource->GetSQLColumns();
$aDateColumns = $oDataSource->GetDateSQLColumns();
$aDateColumns = array();
foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
{
if ($oAttDef instanceof AttributeDate)
{
$aDateColumns[$sAttCode] = 'DATE';
}
elseif ($oAttDef instanceof AttributeDateTime)
{
$aDateColumns[$sAttCode] = 'DATETIME';
}
}
$aIsDateToTransform = array();
$aDateToTransformReport = array();
foreach($aInputColumns as $iFieldId => $sInputColumn)
@@ -530,12 +544,14 @@ try
}
elseif ($aIsDateToTransform[$iCol] !== false)
{
$bDateOnly = false;
$sFormat = $sDateTimeFormat;
if ($aIsDateToTransform[$iCol] == 'DATE')
{
$bDateOnly = true;
$sFormat = $sDateFormat;
}
$sDate = ChangeDateFormat($value, $sFormat);
$sDate = ChangeDateFormat($value, $sFormat, $bDateOnly);
if ($sDate === false)
{
$aValues[] = CMDBSource::Quote('');
@@ -592,12 +608,14 @@ try
$sCol = $aInputColumns[$iCol];
if ($aIsDateToTransform[$iCol] !== false)
{
$bDateOnly = false;
$sFormat = $sDateTimeFormat;
if ($aIsDateToTransform[$iCol] == 'DATE')
{
$bDateOnly = true;
$sFormat = $sDateFormat;
}
$sDate = ChangeDateFormat($value, $sFormat);
$sDate = ChangeDateFormat($value, $sFormat, $bDateOnly);
if ($sDate === false)
{
if ($sOutput == 'details')
@@ -661,12 +679,12 @@ try
{
$aDateTimeColumns = array();
$aDateColumns = array();
foreach($aIsDateToTransform as $iCol => $sSQLDef)
foreach($aIsDateToTransform as $iCol => $sType)
{
if ($sSQLDef !== false)
if ($sType !== false)
{
$sCol = $aInputColumns[$iCol];
if ($sSQLDef == 'DATE')
if ($sType == 'DATE')
{
$aDateColumns[] = $sCol;
}