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

Support of date and time custom formats... continuing towards the beta !

Browse Source 
SVN:trunk[4019]
This commit is contained in:
Denis Flaven
2016-05-03 09:56:02 +00:00
parent 7d4e9ce069
commit 5386662146
32 changed files with 518 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
core/datetimeformat.class.inc.php
View File

@@ -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!)