Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -166,26 +166,35 @@ class _Callback extends \IPS\Helpers\Chart\Dynamic
|
||||
|
||||
$datetime->setTime( 0, 0, 0 );
|
||||
$exploded = explode( '-', $time );
|
||||
switch ( $this->timescale )
|
||||
{
|
||||
case 'none':
|
||||
$datetime = \IPS\DateTime::ts( $time );
|
||||
break;
|
||||
|
||||
case 'daily':
|
||||
$datetime->setDate( (float) $exploded[0], $exploded[1], $exploded[2] );
|
||||
//$datetime = $datetime->localeDate();
|
||||
break;
|
||||
|
||||
case 'weekly':
|
||||
$datetime->setISODate( (float) $exploded[0], $exploded[1] );
|
||||
//$datetime = $datetime->localeDate();
|
||||
break;
|
||||
|
||||
case 'monthly':
|
||||
$datetime->setDate( (float) $exploded[0], $exploded[1], 1 );
|
||||
//$datetime = $datetime->format( 'F Y' );
|
||||
break;
|
||||
if( $this->enableHourly === TRUE AND $this->timescale == 'hourly' )
|
||||
{
|
||||
$datetime->setDate( (float) $exploded[0], $exploded[1], $exploded[2] );
|
||||
$datetime->setTime( $exploded[3], $exploded[4], $exploded[5] );
|
||||
}
|
||||
else
|
||||
{
|
||||
switch ( $this->timescale )
|
||||
{
|
||||
case 'none':
|
||||
$datetime = \IPS\DateTime::ts( $time );
|
||||
break;
|
||||
|
||||
case 'daily':
|
||||
$datetime->setDate( (float) $exploded[0], $exploded[1], $exploded[2] );
|
||||
//$datetime = $datetime->localeDate();
|
||||
break;
|
||||
|
||||
case 'weekly':
|
||||
$datetime->setISODate( (float) $exploded[0], $exploded[1] );
|
||||
//$datetime = $datetime->localeDate();
|
||||
break;
|
||||
|
||||
case 'monthly':
|
||||
$datetime->setDate( (float) $exploded[0], $exploded[1], 1 );
|
||||
//$datetime = $datetime->format( 'F Y' );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( empty( $d ) )
|
||||
|
||||
Reference in new issue
Block a user