happyz
/
time-tracking
mirror of https://github.com/butwhywhy/time-tracking.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix calculation of the relative deadline date (today, yesterday, 

tomorrow), using client time zone
This commit is contained in:
yysa 2014-11-10 19:05:13 +01:00
parent 9dc73a3943
commit d96dfdbc89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/model/task.php
View File

@ -273,10 +273,10 @@ class TaskSummary extends TaskModel {
if ($this->isEmpty('deadline')) {
$this->_diff = 9999;
} else {
$dead = strtotime($this->get('deadline'));
$dead = date_timestamp_get(new DateTime($this->get('deadline'), $GLOBALS['config']['datetime']['timezone_user']));
// -TODO- optimize ! maybe using DateTime diff ?
$usernow = date_timestamp_get(new DateTime('now', $GLOBALS['config']['datetime']['timezone_user']));
$this->_diff = round(($dead - $usernow) / 3600 / 24);
$usernow = date_timestamp_get(new DateTime('now'));
$this->_diff = ceil(($dead - $usernow) / 3600 / 24);
}
}
@ -423,4 +423,4 @@ class TaskSummary extends TaskModel {
return parent::loadList(false);
}
}
}