format($sValue);
+ }
+ public function GetValueLabel($sValue, $oHostObj = null)
+ {
+ return (string)static::GetFormat()->format($sValue);
}
protected function GetSQLCol($bFullSpec = false) {return "DATETIME";}
@@ -3916,7 +3680,7 @@ EOF
public function GetValidationPattern()
{
- return static::GetRegExpr();
+ return static::GetFormat()->ToRegExpr();
}
public function GetBasicFilterOperators()
@@ -3990,7 +3754,7 @@ EOF
return $proposedValue;
}
- return date(self::GetInternalFormat(), $proposedValue);
+ return date(static::GetInternalFormat(), $proposedValue);
}
public function ScalarToSQL($value)
@@ -4009,7 +3773,7 @@ EOF
public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
{
- return Str::pure2html(static::Format($value, static::GetFormat()));
+ return Str::pure2html(static::GetFormat()->format($value));
}
public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
@@ -4023,13 +3787,13 @@ EOF
{
return '';
}
- else if (self::GetFormat() !== self::GetInternalFormat())
+ else if ((string)static::GetFormat() !== static::GetInternalFormat())
{
// Format conversion
$oDate = new DateTime($sValue);
if ($oDate !== false)
{
- $sValue = $oDate->format(self::GetFormat());
+ $sValue = static::GetFormat()->format($oDate);
}
}
$sFrom = array("\r\n", $sTextQualifier);
@@ -4047,7 +3811,7 @@ EOF
* @param Hash $aParams Values of the query parameters
* @return Expression The search condition to be added (AND) to the current search
*/
- public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams)
+ public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams, $bParseSearchString = false)
{
// Possible smart patterns
$aPatterns = array(
@@ -4075,13 +3839,27 @@ EOF
$sParamName1 = $oField->GetParent().'_'.$oField->GetName().'_1';
$oRightExpr = new VariableExpression($sParamName1);
+ if ($bParseSearchString)
+ {
+ $aParams[$sParamName1] = $this->ParseSearchString($aMatches[1]);
+ }
+ else
+ {
$aParams[$sParamName1] = $aMatches[1];
+ }
$oCondition1 = new BinaryExpression($oField, '>=', $oRightExpr);
$sParamName2 = $oField->GetParent().'_'.$oField->GetName().'_2';
$oRightExpr = new VariableExpression($sParamName2);
$sOperator = $this->GetBasicFilterLooseOperator();
+ if ($bParseSearchString)
+ {
+ $aParams[$sParamName2] = $this->ParseSearchString($aMatches[2]);
+ }
+ else
+ {
$aParams[$sParamName2] = $aMatches[2];
+ }
$oCondition2 = new BinaryExpression($oField, '<=', $oRightExpr);
$oNewCondition = new BinaryExpression($oCondition1, 'AND', $oCondition2);
@@ -4094,18 +3872,35 @@ EOF
$sSQLOperator = $aPatterns[$sPatternFound]['operator'];
$sParamName = $oField->GetParent().'_'.$oField->GetName();
$oRightExpr = new VariableExpression($sParamName);
+ if ($bParseSearchString)
+ {
+ $aParams[$sParamName] = $this->ParseSearchString($aMatches[1]);
+ }
+ else
+ {
$aParams[$sParamName] = $aMatches[1];
+ }
$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
break;
default:
- $oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams);
+ $oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams, $bParseSearchString);
}
return $oNewCondition;
}
+
+
+ public function GetHelpOnSmartSearch()
+ {
+ $sDict = parent::GetHelpOnSmartSearch();
+
+ $oFormat = static::GetFormat();
+ $sExample = $oFormat->Format(new DateTime('2015-07-19 18:40:00'));
+ return vsprintf($sDict, array($oFormat->ToPlaceholder(), $sExample));
+ }
}
/**
@@ -4188,20 +3983,20 @@ class AttributeDuration extends AttributeInteger
*/
class AttributeDate extends AttributeDateTime
{
- static $sDateFormat = null;
+ static $oDateFormat = null;
static public function GetFormat()
{
- if (self::$sDateFormat == null)
+ if (self::$oDateFormat == null)
{
AttributeDateTime::LoadFormatFromConfig();
}
- return self::$sDateFormat;
+ return self::$oDateFormat;
}
- static public function SetFormat($sDateFormat)
+ static public function SetFormat(DateTimeFormat $oDateFormat)
{
- self::$sDateFormat = $sDateFormat;
+ self::$oDateFormat = $oDateFormat;
}
/**
@@ -4251,7 +4046,7 @@ class AttributeDeadline extends AttributeDateTime
if ($value !== null)
{
$iValue = AttributeDateTime::GetAsUnixSeconds($value);
- $sDate = $value;
+ $sDate = AttributeDateTime::Format($value);
$difference = $iValue - time();
if ($difference >= 0)
diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php
index c920e17ef..98d47b9ba 100644
--- a/core/bulkchange.class.inc.php
+++ b/core/bulkchange.class.inc.php
@@ -554,7 +554,15 @@ class BulkChange
else
{
// By default... nothing happens
- $aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+ $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+ if ($oAttDef instanceof AttributeDateTime)
+ {
+ $aResults[$iCol]= new CellStatus_Void($oAttDef->GetFormat()->Format($aRowData[$iCol]));
+ }
+ else
+ {
+ $aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+ }
}
}
}
@@ -795,6 +803,11 @@ class BulkChange
if (!is_null($this->m_sDateFormat) && (strlen($this->m_sDateFormat) > 0))
{
+ $sDateTimeFormat = $this->m_sDateFormat; // the specified format is actually the date AND time format
+ $oDateTimeFormat = new DateTimeFormat($sDateTimeFormat);
+ $sDateFormat = $oDateTimeFormat->ToDateFormat();
+ AttributeDateTime::SetFormat($oDateTimeFormat);
+ AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));
// Translate dates from the source data
//
foreach ($this->m_aAttList as $sAttCode => $iCol)
@@ -802,21 +815,34 @@ class BulkChange
if ($sAttCode == 'id') continue;
$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
- if ($oAttDef instanceof AttributeDateTime)
+ if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
{
foreach($this->m_aData as $iRow => $aRowData)
{
- $oDate = DateTime::createFromFormat($this->m_sDateFormat, $this->m_aData[$iRow][$iCol]);
- if ($oDate !== false)
+ $sFormat = $sDateTimeFormat;
+ $sValue = $this->m_aData[$iRow][$iCol];
+ if (!empty($sValue))
{
- $sNewDate = $oDate->format($oAttDef->GetInternalFormat());
- $this->m_aData[$iRow][$iCol] = $sNewDate;
+ if ($oAttDef instanceof AttributeDate)
+ {
+ $sFormat = $sDateFormat;
+ }
+ $oDate = DateTime::createFromFormat($sFormat, $this->m_aData[$iRow][$iCol]);
+ if ($oDate !== false)
+ {
+ $sNewDate = $oDate->format($oAttDef->GetInternalFormat());
+ $this->m_aData[$iRow][$iCol] = $sNewDate;
+ }
+ else
+ {
+ // Leave the cell unchanged
+ $aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+ $aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, $this->m_aData[$iRow][$iCol], Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+ }
}
else
{
- // Leave the cell unchanged
- $aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
- $aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, $this->m_aData[$iRow][$iCol], Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+ $this->m_aData[$iRow][$iCol] = '';
}
}
}
diff --git a/core/csvbulkexport.class.inc.php b/core/csvbulkexport.class.inc.php
index 333636121..c2ee9440e 100644
--- a/core/csvbulkexport.class.inc.php
+++ b/core/csvbulkexport.class.inc.php
@@ -34,7 +34,7 @@ class CSVBulkExport extends TabularBulkExport
$oP->p(" *\ttext-qualifier: (optional) character to be used around text strings (default is '\"').");
$oP->p(" *\tno_localize: set to 1 to retrieve non-localized values (for instance for ENUM values). Default is 0 (= localized values)");
$oP->p(" *\tformatted_text: set to 1 to export case logs and formatted text fields with their HTML markup. Default is 0 (= plain text)");
- $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the format used in the user interface). Example: 'm/d/Y H:i:s'");
+ $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the SQL format used in the user interface). e.g. 'Y-m-d H:i:s'");
}
public function ReadParameters()
@@ -59,14 +59,22 @@ class CSVBulkExport extends TabularBulkExport
$this->aStatusInfo['charset'] = strtoupper(utils::ReadParam('charset', 'UTF-8', true, 'raw_data'));
$this->aStatusInfo['formatted_text'] = (bool)utils::ReadParam('formatted_text', 0, true);
- $sDateFormatRadio = utils::ReadParam('date_format_radio', 'custom');
- if ($sDateFormatRadio == 'default')
+ $sDateFormatRadio = utils::ReadParam('date_format_radio', '');
+ switch($sDateFormatRadio)
{
- $this->aStatusInfo['date_format'] = AttributeDateTime::GetFormat();
- }
- else
- {
- $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', AttributeDateTime::GetFormat(), true, 'raw_data');
+ case 'default':
+ // Export from the UI => format = same as is the UI
+ $this->aStatusInfo['date_format'] = (string)AttributeDateTime::GetFormat();
+ break;
+
+ case 'custom':
+ // Custom format specified from the UI
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ break;
+
+ default:
+ // Export from the command line (or scripted) => default format is SQL, as in previous versions of iTop, unless specified otherwise
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetSQLFormat(), true, 'raw_data');
}
}
@@ -176,12 +184,12 @@ class CSVBulkExport extends TabularBulkExport
$oP->add(' '.Dict::S('Core:BulkExport:OptionFormattedText').' ');
$oP->add('');
- $sDateTimeFormat = utils::ReadParam('date_format', AttributeDateTime::GetFormat(), true, 'raw_data');
- $sDefaultChecked = ($sDateTimeFormat == AttributeDateTime::GetFormat()) ? ' checked' : '';
- $sCustomChecked = ($sDateTimeFormat !== AttributeDateTime::GetFormat()) ? ' checked' : '';
+ $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ $sDefaultChecked = ($sDateTimeFormat == (string)AttributeDateTime::GetFormat()) ? ' checked' : '';
+ $sCustomChecked = ($sDateTimeFormat !== (string)AttributeDateTime::GetFormat()) ? ' checked' : '';
$oP->add(''.Dict::S('Core:BulkExport:DateTimeFormat').' ');
- $sDefaultFormat = htmlentities(AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
- $sExample = htmlentities(date(AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
+ $sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+ $sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
$oP->add(' '.Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample).' '.Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput).' ');
@@ -267,6 +275,17 @@ EOF
$sData = '';
$iPreviousTimeLimit = ini_get('max_execution_time');
$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+ $sExportDateTimeFormat = $this->aStatusInfo['date_format'];
+ $oPrevDateTimeFormat = AttributeDateTime::GetFormat();
+ $oPrevDateFormat = AttributeDate::GetFormat();
+ if ($sExportDateTimeFormat !== (string)$oPrevDateTimeFormat)
+ {
+ // Change date & time formats
+ $oDateTimeFormat = new DateTimeFormat($sExportDateTimeFormat);
+ $oDateFormat = new DateTimeFormat($oDateTimeFormat->ToDateFormat());
+ AttributeDateTime::SetFormat($oDateTimeFormat);
+ AttributeDate::SetFormat($oDateFormat);
+ }
while($aRow = $oSet->FetchAssoc())
{
set_time_limit($iLoopTimeLimit);
@@ -287,10 +306,7 @@ EOF
break;
default:
- $sPrevFormat = AttributeDateTime::GetFormat();
- AttributeDateTime::SetFormat($this->aStatusInfo['date_format']);
$sField = $oObj->GetAsCSV($sAttCode, $this->aStatusInfo['separator'], $this->aStatusInfo['text_qualifier'], $this->bLocalizeOutput, !$this->aStatusInfo['formatted_text']);
- AttributeDateTime::SetFormat($sPrevFormat);
}
}
if ($this->aStatusInfo['charset'] != 'UTF-8')
@@ -307,6 +323,9 @@ EOF
$sData .= implode($this->aStatusInfo['separator'], $aData)."\n";
$iCount++;
}
+ // Restore original date & time formats
+ AttributeDateTime::SetFormat($oPrevDateTimeFormat);
+ AttributeDate::SetFormat($oPrevDateFormat);
set_time_limit($iPreviousTimeLimit);
$this->aStatusInfo['position'] += $this->iChunkSize;
if ($this->aStatusInfo['total'] == 0)
diff --git a/core/datetimeformat.class.inc.php b/core/datetimeformat.class.inc.php
index 8c398e682..5dfa4d22f 100644
--- a/core/datetimeformat.class.inc.php
+++ b/core/datetimeformat.class.inc.php
@@ -40,7 +40,15 @@ class DateTimeFormat
*/
public function __construct($sPHPFormat)
{
- $this->sPHPFormat = $sPHPFormat;
+ $this->sPHPFormat = (string)$sPHPFormat;
+ }
+
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->sPHPFormat;
}
/**
@@ -231,14 +239,13 @@ class DateTimeFormat
*/
public function ToPlaceholder($sFormat = null)
{
- $sFormat = ($sFormat == null) ? static::GetFormat() : $sFormat;
$aMappings = static::GetFormatMapping();
$sResult = '';
$bEscaping = false;
- for($i=0; $i < strlen($sFormat); $i++)
+ for($i=0; $i < strlen($this->sPHPFormat); $i++)
{
- if (($sFormat[$i] == '\\'))
+ if (($this->sPHPFormat[$i] == '\\'))
{
$bEscaping = true;
continue;
@@ -246,41 +253,41 @@ class DateTimeFormat
if ($bEscaping)
{
- $sResult .= $sFormat[$i]; // No need to escape characters in the placeholder
+ $sResult .= $this->sPHPFormat[$i]; // No need to escape characters in the placeholder
$bEscaping = false;
}
- else if(array_key_exists($sFormat[$i], $aMappings))
+ else if(array_key_exists($this->sPHPFormat[$i], $aMappings))
{
// Not a litteral value, must be replaced by Dict equivalent
- $sResult .= Dict::S('Core:DateTime:Placeholder_'.$sFormat[$i]);
+ $sResult .= Dict::S('Core:DateTime:Placeholder_'.$this->sPHPFormat[$i]);
}
else
{
// Normal char with no special meaning
- $sResult .= $sFormat[$i];
+ $sResult .= $this->sPHPFormat[$i];
}
}
return $sResult;
}
-
+
/**
- * Produces the Date format string by extracting only the date part of the date and time format string
+ * Produces a subformat (Date or Time) by extracting the part of the whole DateTime format containing only the given placeholders
* @return string
*/
- public function ToDateFormat()
+ protected function ToSubFormat($aPlaceholders)
{
$aDatePlaceholders = array('Y', 'y', 'd', 'j', 'm', 'n');
$iStart = 999;
$iEnd = 0;
- foreach($aDatePlaceholders as $sChar)
+ foreach($aPlaceholders as $sChar)
{
$iPos = strpos($this->sPHPFormat, $sChar);
if ($iPos !== false)
{
- if (($iPos > 0) && ($aDatePlaceholders[$iPos-1] == '\\'))
+ if (($iPos > 0) && ($this->sPHPFormat[$iPos-1] == '\\'))
{
// The placeholder is actually escaped, it's a litteral character, ignore it
continue;
@@ -293,6 +300,24 @@ class DateTimeFormat
return $sFormat;
}
+ /**
+ * Produces the Date format string by extracting only the date part of the date and time format string
+ * @return string
+ */
+ public function ToDateFormat()
+ {
+ return $this->ToSubFormat(array('Y', 'y', 'd', 'j', 'm', 'n'));
+ }
+
+ /**
+ * Produces the Time format string by extracting only the time part of the date and time format string
+ * @return string
+ */
+ public function ToTimeFormat()
+ {
+ return $this->ToSubFormat(array('H', 'h', 'G', 'g', 'i', 's'));
+ }
+
/**
* Get the regular expression to (approximately) validate a date/time for the current format
* The validation does not take into account the number of days in a month (i.e. June 31st will pass, as well as Feb 30th!)
diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php
index c42203234..edce53061 100644
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -268,7 +268,7 @@ class DBObjectSearch extends DBSearch
$this->AddConditionExpression($oNewCondition);
}
- public function AddCondition($sFilterCode, $value, $sOpCode = null)
+ public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSeachString = false)
{
MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
$oFilterDef = MetaModel::GetClassFilterDef($this->GetClass(), $sFilterCode);
@@ -283,12 +283,18 @@ class DBObjectSearch extends DBSearch
else
{
$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
- $oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
+ $oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams, $bParseSeachString);
$this->AddConditionExpression($oNewCondition);
return;
}
}
MyHelpers::CheckKeyInArray('operator', $sOpCode, $oFilterDef->GetOperators());
+ // Parse search strings if needed and if the filter code corresponds to a valid attcode
+ if($bParseSeachString && MetaModel::IsValidAttCode($this->GetClass(), $sFilterCode))
+ {
+ $oAttDef = MetaModel::GetAttributeDef($sClass, $sFilterCode);
+ $value = $oAttDef->ParseSearchString($value);
+ }
// Preserve backward compatibility - quick n'dirty way to change that API semantic
//
diff --git a/core/excelbulkexport.class.inc.php b/core/excelbulkexport.class.inc.php
index 63c84f9b0..7640db699 100644
--- a/core/excelbulkexport.class.inc.php
+++ b/core/excelbulkexport.class.inc.php
@@ -47,7 +47,7 @@ class ExcelBulkExport extends TabularBulkExport
$oP->p(" * xlsx format options:");
$oP->p(" *\tfields: the comma separated list of field codes to export (e.g: name,org_id,service_name...).");
$oP->p(" *\tformatted_text: set to 1 to export case logs and formatted text fields with their HTML markup. Default is 0 (= plain text)");
- $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the format used in the user interface). Example: 'm/d/Y H:i:s'");
+ $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the SQL format). e.g. 'Y-m-d H:i:s'");
}
public function ReadParameters()
@@ -55,14 +55,22 @@ class ExcelBulkExport extends TabularBulkExport
parent::ReadParameters();
$this->aStatusInfo['formatted_text'] = (bool)utils::ReadParam('formatted_text', 0, true);
- $sDateFormatRadio = utils::ReadParam('date_format_radio', 'custom');
- if ($sDateFormatRadio == 'default')
+ $sDateFormatRadio = utils::ReadParam('date_format_radio', '');
+ switch($sDateFormatRadio)
{
- $this->aStatusInfo['date_format'] = AttributeDateTime::GetFormat();
- }
- else
- {
- $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', AttributeDateTime::GetFormat(), true, 'raw_data');
+ case 'default':
+ // Export from the UI => format = same as is the UI
+ $this->aStatusInfo['date_format'] = (string)AttributeDateTime::GetFormat();
+ break;
+
+ case 'custom':
+ // Custom format specified from the UI
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ break;
+
+ default:
+ // Export from the command line (or scripted) => default format is SQL, as in previous versions of iTop, unless specified otherwise
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetSQLFormat(), true, 'raw_data');
}
}
@@ -89,12 +97,12 @@ class ExcelBulkExport extends TabularBulkExport
$oP->add(' ');
- $sDateTimeFormat = utils::ReadParam('date_format', AttributeDateTime::GetFormat(), true, 'raw_data');
- $sDefaultChecked = ($sDateTimeFormat == AttributeDateTime::GetFormat()) ? ' checked' : '';
- $sCustomChecked = ($sDateTimeFormat !== AttributeDateTime::GetFormat()) ? ' checked' : '';
+ $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ $sDefaultChecked = ($sDateTimeFormat == (string)AttributeDateTime::GetFormat()) ? ' checked' : '';
+ $sCustomChecked = ($sDateTimeFormat !== (string)AttributeDateTime::GetFormat()) ? ' checked' : '';
$oP->add(''.Dict::S('Core:BulkExport:DateTimeFormat').' ');
- $sDefaultFormat = htmlentities(AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
- $sExample = htmlentities(date(AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
+ $sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+ $sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
$oP->add(' '.Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample).' '.Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput).' ');
@@ -304,7 +312,8 @@ EOF
$fStartExcel = microtime(true);
$writer = new XLSXWriter();
- $writer->setDateTimeFormat(AttributeDateTime::GetExcelFormat($this->aStatusInfo['date_format']));
+ $oDateTimeFormat = new DateTimeFormat($this->aStatusInfo['date_format']);
+ $writer->setDateTimeFormat($oDateTimeFormat->ToExcel());
$writer->setAuthor(UserRights::GetUserFriendlyName());
$aHeaderTypes = array();
$aHeaderNames = array();
diff --git a/core/ormcaselog.class.inc.php b/core/ormcaselog.class.inc.php
index c0cea3eab..d1a910a85 100644
--- a/core/ormcaselog.class.inc.php
+++ b/core/ormcaselog.class.inc.php
@@ -234,14 +234,14 @@ class ormCaseLog {
if (is_int($aIndex[$index]['date']))
{
// Unix timestamp
- $sDate = date(AttributeDateTime::GetFormat(), $aIndex[$index]['date']);
+ $sDate = date((string)AttributeDateTime::GetFormat(), $aIndex[$index]['date']);
}
elseif (is_object($aIndex[$index]['date']))
{
if (version_compare(phpversion(), '5.3.0', '>='))
{
// DateTime
- $sDate = $aIndex[$index]['date']->format(AttributeDateTime::GetFormat());
+ $sDate = $aIndex[$index]['date']->format((string)AttributeDateTime::GetFormat());
}
else
{
@@ -322,14 +322,14 @@ class ormCaseLog {
if (is_int($aIndex[$index]['date']))
{
// Unix timestamp
- $sDate = date(AttributeDateTime::GetFormat(),$aIndex[$index]['date']);
+ $sDate = date((string)AttributeDateTime::GetFormat(),$aIndex[$index]['date']);
}
elseif (is_object($aIndex[$index]['date']))
{
if (version_compare(phpversion(), '5.3.0', '>='))
{
// DateTime
- $sDate = $aIndex[$index]['date']->format(AttributeDateTime::GetFormat());
+ $sDate = $aIndex[$index]['date']->format((string)AttributeDateTime::GetFormat());
}
else
{
@@ -425,14 +425,14 @@ class ormCaseLog {
if (is_int($aIndex[$index]['date']))
{
// Unix timestamp
- $sDate = date(AttributeDateTime::GetFormat(),$aIndex[$index]['date']);
+ $sDate = date((string)AttributeDateTime::GetFormat(),$aIndex[$index]['date']);
}
elseif (is_object($aIndex[$index]['date']))
{
if (version_compare(phpversion(), '5.3.0', '>='))
{
// DateTime
- $sDate = $aIndex[$index]['date']->format(AttributeDateTime::GetFormat());
+ $sDate = $aIndex[$index]['date']->format((string)AttributeDateTime::GetFormat());
}
else
{
diff --git a/core/pdfbulkexport.class.inc.php b/core/pdfbulkexport.class.inc.php
index 851b59522..31a43a317 100644
--- a/core/pdfbulkexport.class.inc.php
+++ b/core/pdfbulkexport.class.inc.php
@@ -31,7 +31,7 @@ class PDFBulkExport extends HTMLBulkExport
$oP->p(" *\tfields: (mandatory) the comma separated list of field codes to export (e.g: name,org_id,service_name...).");
$oP->p(" *\tpage_size: (optional) size of the page. One of A4, A3, Letter (default is 'A4').");
$oP->p(" *\tpage_orientation: (optional) the orientation of the page. Either Portrait or Landscape (default is 'Portrait').");
- $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the format used in the user interface). Example: 'm/d/Y H:i:s'");
+ $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the SQL format). e.g. 'Y-m-d H:i:s'");
}
public function EnumFormParts()
@@ -59,12 +59,12 @@ class PDFBulkExport extends HTMLBulkExport
$oP->add(' ');
- $sDateTimeFormat = utils::ReadParam('date_format', AttributeDateTime::GetFormat(), true, 'raw_data');
- $sDefaultChecked = ($sDateTimeFormat == AttributeDateTime::GetFormat()) ? ' checked' : '';
- $sCustomChecked = ($sDateTimeFormat !== AttributeDateTime::GetFormat()) ? ' checked' : '';
+ $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ $sDefaultChecked = ($sDateTimeFormat == (string)AttributeDateTime::GetFormat()) ? ' checked' : '';
+ $sCustomChecked = ($sDateTimeFormat !== (string)AttributeDateTime::GetFormat()) ? ' checked' : '';
$oP->add(''.Dict::S('Core:BulkExport:DateTimeFormat').' ');
- $sDefaultFormat = htmlentities(AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
- $sExample = htmlentities(date(AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
+ $sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+ $sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
$oP->add(' '.Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample).' '.Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput).' ');
@@ -114,14 +114,22 @@ EOF
$this->aStatusInfo['page_size'] = utils::ReadParam('page_size', 'A4', true, 'raw_data');
$this->aStatusInfo['page_orientation'] = utils::ReadParam('page_orientation', 'L', true);
- $sDateFormatRadio = utils::ReadParam('date_format_radio', 'custom');
- if ($sDateFormatRadio == 'default')
+ $sDateFormatRadio = utils::ReadParam('date_format_radio', '');
+ switch($sDateFormatRadio)
{
- $this->aStatusInfo['date_format'] = AttributeDateTime::GetFormat();
- }
- else
- {
- $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', AttributeDateTime::GetFormat(), true, 'raw_data');
+ case 'default':
+ // Export from the UI => format = same as is the UI
+ $this->aStatusInfo['date_format'] = (string)AttributeDateTime::GetFormat();
+ break;
+
+ case 'custom':
+ // Custom format specified from the UI
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ break;
+
+ default:
+ // Export from the command line (or scripted) => default format is SQL, as in previous versions of iTop, unless specified otherwise
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetSQLFormat(), true, 'raw_data');
}
}
@@ -141,10 +149,10 @@ EOF
public function GetNextChunk(&$aStatus)
{
- $sPrevFormat = AttributeDateTime::GetFormat();
- AttributeDateTime::SetFormat($this->aStatusInfo['date_format']);
+ $oPrevFormat = AttributeDateTime::GetFormat();
+ AttributeDateTime::SetFormat(new DateTimeFormat($this->aStatusInfo['date_format']));
$sData = parent::GetNextChunk($aStatus);
- AttributeDateTime::SetFormat($sPrevFormat);
+ AttributeDateTime::SetFormat($oPrevFormat);
$hFile = @fopen($this->aStatusInfo['tmp_file'], 'ab');
if ($hFile === false)
{
diff --git a/core/spreadsheetbulkexport.class.inc.php b/core/spreadsheetbulkexport.class.inc.php
index ddd0e1338..910ea4d48 100644
--- a/core/spreadsheetbulkexport.class.inc.php
+++ b/core/spreadsheetbulkexport.class.inc.php
@@ -30,6 +30,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
$oP->p(" * spreadsheet format options:");
$oP->p(" *\tfields: (mandatory) the comma separated list of field codes to export (e.g: name,org_id,service_name...).");
$oP->p(" *\tno_localize: (optional) pass 1 to retrieve the raw (untranslated) values for enumerated fields. Default: 0.");
+ $oP->p(" *\tdate_format: the format to use when exporting date and time fields (default = the SQL format). e.g. 'Y-m-d H:i:s'");
}
public function EnumFormParts()
@@ -51,15 +52,59 @@ class SpreadsheetBulkExport extends TabularBulkExport
$oP->add('');
$oP->add('');
$oP->add(' '.Dict::S('Core:BulkExport:OptionNoLocalize').' ');
+ $oP->add(''.Dict::S('Core:BulkExport:DateTimeFormat').' ');
+ $sDefaultFormat = htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8');
+ $sExample = htmlentities(date((string)AttributeDateTime::GetFormat()), ENT_QUOTES, 'UTF-8');
+ $oP->add(' '.Dict::Format('Core:BulkExport:DateTimeFormatDefault_Example', $sDefaultFormat, $sExample).' '.Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput).' ');
+ $oP->add(' ');
+
$oP->add(' ');
$oP->add('
');
$oP->add('');
+ $sJSTooltip = json_encode(''.Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip').'
');
+ $oP->add_ready_script(
+<< format = same as is the UI
+ $this->aStatusInfo['date_format'] = (string)AttributeDateTime::GetFormat();
+ break;
+
+ case 'custom':
+ // Custom format specified from the UI
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');
+ break;
+
+ default:
+ // Export from the command line (or scripted) => default format is SQL, as in previous versions of iTop, unless specified otherwise
+ $this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetSQLFormat(), true, 'raw_data');
+ }
+ }
protected function GetSampleData($oObj, $sAttCode)
{
@@ -89,6 +134,10 @@ class SpreadsheetBulkExport extends TabularBulkExport
{
$sRet = $oObj->GetAsHTML($sAttCode);
}
+ elseif ($oAttDef instanceof AttributeCustomFields)
+ {
+ $sRet = $oObj->GetAsHTML($sAttCode);
+ }
else
{
if ($this->bLocalizeOutput)
@@ -97,7 +146,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
}
else
{
- $sRet = htmlentities($value, ENT_QUOTES, 'UTF-8');
+ $sRet = htmlentities((string)$value, ENT_QUOTES, 'UTF-8');
}
}
}
@@ -164,7 +213,13 @@ class SpreadsheetBulkExport extends TabularBulkExport
$oSet = new DBObjectSet($this->oSearch);
$oSet->SetLimit($this->iChunkSize, $this->aStatusInfo['position']);
$this->OptimizeColumnLoad($oSet);
-
+
+ $sExportDateTimeFormat = $this->aStatusInfo['date_format'];
+ // Date & time formats
+ $oDateTimeFormat = new DateTimeFormat($sExportDateTimeFormat);
+ $oDateFormat = new DateTimeFormat($oDateTimeFormat->ToDateFormat());
+ $oTimeFormat = new DateTimeFormat($oDateTimeFormat->ToTimeFormat());
+
$iCount = 0;
$sData = '';
$iPreviousTimeLimit = ini_get('max_execution_time');
@@ -199,10 +254,16 @@ class SpreadsheetBulkExport extends TabularBulkExport
$oFinalAttDef = $oAttDef->GetFinalAttDef();
if (get_class($oFinalAttDef) == 'AttributeDateTime')
{
- $iDate = AttributeDateTime::GetAsUnixSeconds($oObj->Get($sAttCode));
- $sData .= ''.date('Y-m-d', $iDate).' '; // Add the first column directly
- $sField = date('H:i:s', $iDate); // Will add the second column below
- $sData .= "$sField ";
+ // Split the date and time in two columns
+ $sDate = $oDateFormat->Format($oObj->Get($sAttCode));
+ $sTime = $oTimeFormat->Format($oObj->Get($sAttCode));
+ $sData .= "$sDate ";
+ $sData .= "$sTime ";
+ }
+ else if (get_class($oFinalAttDef) == 'AttributeDate')
+ {
+ $sDate = $oDateFormat->Format($oObj->Get($sAttCode));
+ $sData .= "$sDate ";
}
else if($oAttDef instanceof AttributeCaseLog)
{
diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php
index 01ba79097..f02dafe73 100755
--- a/dictionaries/cs.dictionary.itop.core.php
+++ b/dictionaries/cs.dictionary.itop.core.php
@@ -98,8 +98,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Core:AttributeDateTime?SmartSearch' => '
Formát data:yyyy-mm-dd hh:mm:ss %1$s
Operátory:
Formát data:yyyy-mm-dd %1$s
Operátory:
Date format:yyyy-mm-dd hh:mm:ss %1$s
Operators:
Date format:yyyy-mm-dd %1$s
Operators:
Datumsformat:yyyy-mm-dd hh:mm:ss %1$s
Operatoren:
Datumsformat:yyyy-mm-dd %1$s
Operatoren:
Date format:yyyy-mm-dd hh:mm:ss %1$s
Operators:
Date format:yyyy-mm-dd %1$s
Operators:
Formato de Fecha:yyyy-mm-dd hh:mm:ss %1$s
Operadores:
Formato de Fecha:yyyy-mm-dd %1$s
Operadores:
Format de date :aaaa-mm-jj hh:mm:ss %1$s
Opérateurs :
Format de date :aaaa-mm-jj %1$s
Opérateurs :
Date format:yyyy-mm-dd hh:mm:ss %1$s
Operators:
Date format:yyyy-mm-dd %1$s
Operators:
Formato data:aaaa-mm-gg hh:mm:ss %1$s
Operatori:
Formato data:aaaa-mm-gg %1$s
Operatori:
Date format:yyyy-mm-dd hh:mm:ss %1$s
Operators:
日付フォーマット:yyyy-mm-dd %1$s
演算子:
Date format:yyyy-mm-dd hh:mm:ss %1$s
Operators:
Date format:yyyy-mm-dd %1$s
Operators:
Data formato:yyyy-mm-dd hh:mm:ss %1$s
Operadores:
Data formato:yyyy-mm-dd %1$s
Operadores:
Date format:гггг-мм-дд чч:мм:сс %1$s
Operators:
Date format:гггг-мм-дд %1$s
Operators:
Date format:yyyy-mm-dd hh:mm:ss %1$ss
Operators:
Date format:yyyy-mm-dd %1$s
Operators:
Date format:yyyy-mm-dd hh:mm:ss %1$s
Operators:
Date format:yyyy-mm-dd %1$s
Operators:
');
$oPage->add('
');
$oPage->add(''.Dict::S('UI:CSVImport:DateAndTimeFormats').' ');
- $oPage->add('
');
- $oPage->add('
');
+ $oPage->add('
'.Dict::Format('UI:CSVImport:DefaultDateTimeFormat_Format_Example', htmlentities((string)AttributeDateTime::GetFormat(), ENT_QUOTES, 'UTF-8'), date((string)AttributeDateTime::GetFormat())).'
');
+ $oPage->add('
'.Dict::Format('UI:CSVImport:CustomDateTimeFormat', '
');
$oPage->add('
');
$oPage->add('sPHPDateTimeFormat;
+ }
+
+ /**
+ *
+ * @param string $sFormat
+ * @return \Combodo\iTop\Form\Field\DateTimeField
+ */
+ public function SetPHPDateTimeFormat($sDateTimeFormat)
+ {
+ $this->sPHPDateTimeFormat = $sDateTimeFormat;
+ return $this;
+ }
+
+ /**
+ *
+ * @return string
+ */
+ public function GetJSDateTimeFormat()
+ {
+ return $this->sDateTimeFormat;
+ }
+
+ /**
+ *
+ * @param string $sFormat
+ * @return \Combodo\iTop\Form\Field\DateTimeField
+ */
+ public function SetJSDateTimeFormat($sDateTimeFormat)
+ {
+ $this->sDateTimeFormat = $sDateTimeFormat;
+ return $this;
+ }
+
+ public function GetDisplayValue()
+ {
+ return \AttributeDatetime::Format($this->currentValue, $this->GetPHPDateTimeFormat());
+ }
}
diff --git a/sources/renderer/bootstrap/bsformrenderer.class.inc.php b/sources/renderer/bootstrap/bsformrenderer.class.inc.php
index 87d75c32a..91796e21e 100644
--- a/sources/renderer/bootstrap/bsformrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/bsformrenderer.class.inc.php
@@ -52,6 +52,7 @@ class BsFormRenderer extends FormRenderer
$this->AddSupportedField('SubFormField', 'BsSubFormFieldRenderer');
$this->AddSupportedField('SelectObjectField', 'BsSelectObjectFieldRenderer');
$this->AddSupportedField('LinkedSetField', 'BsLinkedSetFieldRenderer');
+ $this->AddSupportedField('DateTimeField', 'BsSimpleFieldRenderer');
$this->AddSupportedField('FileUploadField', 'BsFileUploadFieldRenderer');
}
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
index 837c4f495..a72de9343 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
@@ -51,6 +51,25 @@ class BsSimpleFieldRenderer extends FieldRenderer
{
switch ($sFieldClass)
{
+ case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
+ $oOutput->AddHtml('');
+ $sJSFormat = json_encode($this->oField->GetJSDateTimeFormat());
+ $oOutput->AddJs(
+<<oField->GetGlobalId()}').datetimepicker({format: $sJSFormat});
+EOF
+ );
+ break;
case 'Combodo\\iTop\\Form\\Field\\StringField':
$oOutput->AddHtml('');
if ($this->oField->GetLabel() !== '')
@@ -230,6 +249,21 @@ EOF
$oOutput->AddHtml('
');
break;
+ case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
+ $oOutput->AddHtml('');
+ break;
+
case 'Combodo\\iTop\\Form\\Field\\RadioField':
case 'Combodo\\iTop\\Form\\Field\\SelectField':
case 'Combodo\\iTop\\Form\\Field\\MultipleSelectField':
@@ -317,6 +351,7 @@ EOF
case 'Combodo\\iTop\\Form\\Field\\HiddenField':
case 'Combodo\\iTop\\Form\\Field\\RadioField':
case 'Combodo\\iTop\\Form\\Field\\CheckboxField':
+ case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
$oOutput->AddJs(
<<add_comment("Separator: ".$sSep);
$oP->add_comment("Qualifier: ".$sQualifier);
$oP->add_comment("Charset Encoding:".$sCharSet);
- if (strlen($sDateFormat) > 0)
+ if (($sDateFormat !== null) && (strlen($sDateFormat) > 0))
{
- $oP->add_comment("Date format: '$sDateFormat'");
+ $oP->add_comment("Date and time format: '$sDateFormat'");
+ $oDateTimeFormat = new DateTimeFormat($sDateFormat);
+ $sDateOnlyFormat = $oDateTimeFormat->ToDateFormat();
+ $oP->add_comment("Date format: '$sDateOnlyFormat'");
}
else
{