Implement due dates for cards by juliusknorr · Pull Request #189 · nextcloud/deck

juliusknorr · 2017-06-16T16:18:55Z

Fix for #106

cc @artemanufrij @pixelipo

Signed-off-by: Julius Härtl <jus@bitgrid.net>

artemanufrij · 2017-06-16T16:28:29Z

Signed-off-by: Julius Härtl <jus@bitgrid.net>

codecov · 2017-06-16T20:21:47Z

Codecov Report

Merging #189 into master will increase coverage by 0.44%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #189      +/-   ##
==========================================
+ Coverage   76.12%   76.56%   +0.44%     
==========================================
  Files          33       33              
  Lines         955      973      +18     
==========================================
+ Hits          727      745      +18     
  Misses        228      228

artemanufrij

Colors should be changed as discussed in IRC...

pixelipo · 2017-06-16T20:46:54Z

js/filters/dateFilters.js

+app.filter('parseDate', function() {
+	return function (date) {
+		if(moment(date).isValid()) {
+			return moment(date).format('YYYY-MM-DD');


Shouldn't format be based on Nextcloud locale? I know it's a hot topic right now, since Nextcloud fetches locale based on language settings, but still - something to keep in mind

Yes, but that is out of scope for now, since we want to release 0.2 soon. We should also be timezone aware. But let's address that afterwords.

pixelipo · 2017-06-16T20:51:20Z

templates/main.php

+Util::addScript('deck', 'vendor/jquery-timepicker/jquery.ui.timepicker');

-if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
+if(true && !\OC::$server->getConfig()->getSystemValue('debug', false)) {


why is this change needed?

🙈 Some debugging statement I forgot about.

pixelipo · 2017-06-16T20:58:26Z

templates/part.card.php

+		<div id="duedate">
+			<input class="datepicker-input medium focus" type="text" placeholder="Set a due date" value="{{ cardservice.getCurrent().duedate | parseDate }}" datepicker="due" />
+			<input class="timepicker-input medium focus" type="text" placeholder="00:00:00" ng-if="cardservice.getCurrent().duedate" value="{{ cardservice.getCurrent().duedate | parseTime }}" timepicker="due" />
+			<button class="icon icon-delete button-inline" title="Remove duedate" ng-if="cardservice.getCurrent().duedate" ng-click="resetDuedate()"></button>


title should be translatable string. Also, missing space between "due" and "date"

pixelipo · 2017-06-16T21:15:29Z

img/calendar.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewbox="0 0 32 32"><path d="M8 2c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V4c0-1.108-.892-2-2-2zm16 0c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V4c0-1.108-.892-2-2-2zM11 6v2c0 1.662-1.338 3-3 3S5 9.662 5 8V6.125A3.993 3.993 0 0 0 2 10v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4V10a3.993 3.993 0 0 0-3-3.875V8c0 1.662-1.338 3-3 3s-3-1.338-3-3V6zM6.094 16h19.812a.09.09 0 0 1 .094.094v9.812a.09.09 0 0 1-.094.094H6.094A.09.09 0 0 1 6 25.906v-9.812A.09.09 0 0 1 6.094 16z"/></svg>


This file is available in core/img/places

pixelipo · 2017-06-16T21:16:34Z

img/calendar-white.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>


I've created a PR to add white calendar icon to core in nextcloud/server#5447 - so this should become redundant

👍 But we should keep it for now until all supported Nextcloud versions ship with that icon.

I agree, but please use the optimized version - either copy from my PR or run scour command:
scour -i calendar-white.svg -o calendar-white-new.svg --create-groups --enable-id-stripping --enable-comment-stripping --shorten-ids --remove-metadata --strip-xml-prolog --no-line-breaks

pixelipo · 2017-06-16T21:30:08Z

css/style.css

+}
+.due.now {
+	background-color: #fbd850;
+	color: #000;


not needed - black is default

pixelipo · 2017-06-16T21:32:53Z

css/style.css

+	color: #fff;
 }

+.due .icon-calendar {


you should move this over to .due .icon as it is a default setting. Other .something .icon-calendar declarations will override background-image and margin-right is needed for all.

pixelipo · 2017-06-16T21:34:51Z

css/style.css

 }

-#card-dates span {
+#card-meta #duedate {


it's usually not a good idea to used ID as a CSS selector. I would recommend adding a class and applying style to it.

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliusknorr · 2017-06-17T08:39:08Z

@pixelipo @artemanufrij Thanks for the comments, should be all fixed now.

Signed-off-by: Julius Härtl <jus@bitgrid.net>

artemanufrij · 2017-06-17T09:15:49Z

margin is still a little bit inexact:

I think the icons should be adjusted

Signed-off-by: Julius Härtl <jus@bitgrid.net>

artemanufrij

now it looks good for me...

Signed-off-by: Artem Anufrij <artem.anufrij@live.de> some css changes Signed-off-by: Artem Anufrij <artem.anufrij@live.de> removed unused css line Signed-off-by: Artem Anufrij <artem.anufrij@live.de> some margin changes Signed-off-by: Artem Anufrij <artem.anufrij@live.de>

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliusknorr · 2017-06-19T08:36:04Z

Thanks @artemanufrij Let's merge this. 🚀

hanzei · 2017-06-19T09:08:08Z

Nice work! 🎉

Implement due dates for cards

14809f8

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliusknorr added 3. to review enhancement labels Jun 16, 2017

juliusknorr added this to the 0.2.0 milestone Jun 16, 2017

juliusknorr requested review from artemanufrij and pixelipo June 16, 2017 16:18

juliusknorr force-pushed the duedates branch from 196fe1b to 3ec254e Compare June 16, 2017 19:58

nextcloud deleted a comment Jun 16, 2017

juliusknorr force-pushed the duedates branch from 3ec254e to b25306d Compare June 16, 2017 20:08

juliusknorr added 2 commits June 16, 2017 22:19

Fix margin issues and eslint warnings

b21d48b

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix unit tests for duedate

6d0a30d

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliusknorr force-pushed the duedates branch from 90df528 to 6d0a30d Compare June 16, 2017 20:39

artemanufrij requested changes Jun 16, 2017

View reviewed changes

pixelipo reviewed Jun 16, 2017

View reviewed changes

juliusknorr added 2 commits June 17, 2017 10:31

Fix small issues

429a987

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix due date colors

b1e9e63

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Optimize calendar-white icon

de9b4fb

Signed-off-by: Julius Härtl <jus@bitgrid.net>

pixelipo mentioned this pull request Jun 17, 2017

Add white version of the calendar.svg icon nextcloud/server#5447

Merged

juliusknorr added 2 commits June 17, 2017 11:26

Add padding only for colored due date badges

8185507

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add tests for overdue state

79a5de8

Signed-off-by: Julius Härtl <jus@bitgrid.net>

artemanufrij approved these changes Jun 17, 2017

View reviewed changes

css fixes

672be73

Signed-off-by: Artem Anufrij <artem.anufrij@live.de> some css changes Signed-off-by: Artem Anufrij <artem.anufrij@live.de> removed unused css line Signed-off-by: Artem Anufrij <artem.anufrij@live.de> some margin changes Signed-off-by: Artem Anufrij <artem.anufrij@live.de>

juliusknorr force-pushed the duedates branch from a94f3d6 to 672be73 Compare June 19, 2017 08:29

Add timepicker css

3120b43

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge branch 'master' into duedates

4b9fe14

juliusknorr merged commit 1d9a0d3 into master Jun 19, 2017

juliusknorr deleted the duedates branch June 19, 2017 08:36

		@@ -0,0 +1 @@
		<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewbox="0 0 32 32"><path d="M8 2c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V4c0-1.108-.892-2-2-2zm16 0c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V4c0-1.108-.892-2-2-2zM11 6v2c0 1.662-1.338 3-3 3S5 9.662 5 8V6.125A3.993 3.993 0 0 0 2 10v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4V10a3.993 3.993 0 0 0-3-3.875V8c0 1.662-1.338 3-3 3s-3-1.338-3-3V6zM6.094 16h19.812a.09.09 0 0 1 .094.094v9.812a.09.09 0 0 1-.094.094H6.094A.09.09 0 0 1 6 25.906v-9.812A.09.09 0 0 1 6.094 16z"/></svg>

		@@ -0,0 +1,54 @@
		<?xml version="1.0" encoding="UTF-8" standalone="no"?>

Comments

Conversation

juliusknorr commented Jun 16, 2017

Uh oh!

artemanufrij commented Jun 16, 2017

Uh oh!

codecov bot commented Jun 16, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

artemanufrij left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Jun 17, 2017

Uh oh!

artemanufrij commented Jun 17, 2017

Uh oh!

artemanufrij left a comment

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Jun 19, 2017

Uh oh!

hanzei commented Jun 19, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Jun 16, 2017 •

edited

Loading