ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use ISO8601 date format for duedate

Browse Source 
Fixes issues with Date.parse on webkit based browsers
closes #240

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-08-08 12:56:44 +02:00
committed by Julius Härtl
parent 38ec1abfa5
commit 1cbfd1b6bf
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/controller/CardController.js
View File

@@ -94,7 +94,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
newDate.date(duedate.date()); newDate.date(duedate.date());
newDate.month(duedate.month()); newDate.month(duedate.month());
newDate.year(duedate.year()); newDate.year(duedate.year());
element.duedate = newDate.format('YYYY-MM-DD HH:mm:ss'); element.duedate = newDate.toISOString();
CardService.update(element); CardService.update(element);
StackService.updateCard(element); StackService.updateCard(element);
}; };
@@ -106,7 +106,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
} }
newDate.hour(time.hour()); newDate.hour(time.hour());
newDate.minute(time.minute()); newDate.minute(time.minute());
element.duedate = newDate.format('YYYY-MM-DD HH:mm:ss'); element.duedate = newDate.toISOString();
CardService.update(element); CardService.update(element);
StackService.updateCard(element); StackService.updateCard(element);
}; };

8
lib/Db/Card.php
View File

@@ -58,6 +58,13 @@ class Card extends RelationalEntity implements JsonSerializable {
$this->addResolvable('owner'); $this->addResolvable('owner');
} }
public function getDuedate() {
if($this->duedate === null)
return null;
$dt = new DateTime($this->duedate);
return $dt->format('c');
}
public function jsonSerialize() { public function jsonSerialize() {
$json = parent::jsonSerialize(); $json = parent::jsonSerialize();
$json['overdue'] = self::DUEDATE_FUTURE; $json['overdue'] = self::DUEDATE_FUTURE;
@@ -84,6 +91,7 @@ class Card extends RelationalEntity implements JsonSerializable {
$json['overdue'] = self::DUEDATE_OVERDUE; $json['overdue'] = self::DUEDATE_OVERDUE;
} }
} }
$json['duedate'] = $this->getDuedate();
return $json; return $json;
} }

2
tests/unit/Service/CardServiceTest.php
View File

@@ -104,7 +104,7 @@ class CardServiceTest extends TestCase {
$this->assertEquals('text', $actual->getType()); $this->assertEquals('text', $actual->getType());
$this->assertEquals(999, $actual->getOrder()); $this->assertEquals(999, $actual->getOrder());
$this->assertEquals('foo', $actual->getDescription()); $this->assertEquals('foo', $actual->getDescription());
$this->assertEquals('2017-01-01 00:00:00', $actual->getDuedate()); $this->assertEquals('2017-01-01T00:00:00+00:00', $actual->getDuedate());
} }
public function testUpdateArchived() { public function testUpdateArchived() {