hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source 
Fix  && add test for json dashboard controller

Fix date formatting issue
This commit is contained in:
Nicolas Le Goff
2013-02-14 20:28:54 +01:00
parent 1b462bc20f
commit 1e97436008
3 changed files with 196 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/module/report.php
View File

@@ -246,17 +246,17 @@ class module_report
*/
public function __construct(Application $app, $d1, $d2, $sbas_id, $collist)
{
$d1 = \DateTime::createFromFormat('d-m-Y H:i:s', sprintf('%s 00:00:00', $d1));
$d2 = \DateTime::createFromFormat('d-m-Y H:i:s', sprintf('%s 23:59:59', $d2));
$this->app = $app;
$this->dmin = $d1->format('Y-m-d H:i:s');
$this->dmax = $d2->format('Y-m-d H:i:s');
$this->dmin = $d1;
$this->dmax = $d2;
$this->sbas_id = $sbas_id;
$this->list_coll_id = $collist;
$this->user_id = $this->app['phraseanet.user']->get_id();
$this->periode = $this->app['date-formatter']->getPrettyString($d1)
. ' - ' . $this->app['date-formatter']->getPrettyString($d2);
$this->periode = sprintf(
'%s - %s ',
$this->app['date-formatter']->getPrettyString(new \DateTime($d1)),
$this->app['date-formatter']->getPrettyString(new \DateTime($d2))
);
$this->dbname = phrasea::sbas_names($sbas_id, $app);
$this->cor = $this->setCor();
$this->jour = $this->setDay();