Skip to content

Commit e090c73

Browse files
committed
fixes client timezone
1 parent d118ffa commit e090c73

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>Time Tracker</name>
66
<summary>Time Tracker App</summary>
77
<description><![CDATA[Time Tracker App]]></description>
8-
<version>0.0.20</version>
8+
<version>0.0.21</version>
99
<licence>agpl</licence>
1010
<author mail="[email protected]" >MTier Ltd.</author>
1111
<namespace>TimeTracker</namespace>

js/timer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168

169169
$(this).on('apply.daterangepicker', function(ev, picker) {
170170
var id = $(this).data('myid');
171-
var jqxhr = $.post( "ajax/update-work-interval/"+id,{start:picker.startDate.format('DD/MM/YY HH:mm'), end:picker.endDate.format('DD/MM/YY HH:mm'), }, function() {
171+
var jqxhr = $.post( "ajax/update-work-interval/"+id,{start:picker.startDate.format('DD/MM/YY HH:mm'), end:picker.endDate.format('DD/MM/YY HH:mm'), tzoffset: new Date().getTimezoneOffset()}, function() {
172172
})
173173
.done(function() {
174174
getWorkItems();

lib/Controller/AjaxController.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ public function deleteWorkInterval($id) {
205205
*/
206206

207207
public function updateWorkInterval($id) {
208+
208209
$wi = $this->workIntervalMapper->find($id);
209210

210211
if (isset($this->request->name)) {
@@ -258,9 +259,17 @@ public function updateWorkInterval($id) {
258259
}
259260
}
260261
if (isset($this->request->start)) {
262+
$tzoffset = 0;
263+
if (isset($this->request->tzoffset)) {
264+
$tzoffset = $this->request->tzoffset;
265+
}
266+
267+
date_default_timezone_set('UTC');
261268
$dt = \DateTime::createFromFormat ( "d/m/y H:i",$this->request->start);
262-
$wi->setStart($dt->getTimestamp());
269+
$dt->setTimeZone(new \DateTimeZone('UTC'));
270+
$wi->setStart($dt->getTimestamp()+$tzoffset*60);
263271
$de = \DateTime::createFromFormat ( "d/m/y H:i",$this->request->end);
272+
$de->setTimeZone(new \DateTimeZone('UTC'));
264273
$wi->setDuration($de->getTimestamp() - $dt->getTimestamp());
265274
}
266275

0 commit comments

Comments
 (0)