Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Enhancement: set card times more sensible using the 'Today' button in datepicker

Browse source
This commit is contained in:
Thomas Liske 2019-10-24 12:57:07 +02:00
parent 13a2bd6380
commit 0fb15888bc
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/cards/cardDate.js
View file

@ -105,7 +105,7 @@ Template.dateBadge.helpers({
// editCardReceivedDatePopup // editCardReceivedDatePopup
(class extends DatePicker { (class extends DatePicker {
onCreated() { onCreated() {
super.onCreated(); super.onCreated(moment().format("YYYY-MM-DD HH:mm"));
this.data().getReceived() && this.data().getReceived() &&
this.date.set(moment(this.data().getReceived())); this.date.set(moment(this.data().getReceived()));
} }
@ -122,7 +122,7 @@ Template.dateBadge.helpers({
// editCardStartDatePopup // editCardStartDatePopup
(class extends DatePicker { (class extends DatePicker {
onCreated() { onCreated() {
super.onCreated(); super.onCreated(moment().format("YYYY-MM-DD HH:mm"));
this.data().getStart() && this.date.set(moment(this.data().getStart())); this.data().getStart() && this.date.set(moment(this.data().getStart()));
} }
@ -148,7 +148,7 @@ Template.dateBadge.helpers({
// editCardDueDatePopup // editCardDueDatePopup
(class extends DatePicker { (class extends DatePicker {
onCreated() { onCreated() {
super.onCreated(); super.onCreated('1970-01-01 17:00:00');
this.data().getDue() && this.date.set(moment(this.data().getDue())); this.data().getDue() && this.date.set(moment(this.data().getDue()));
} }
@ -171,7 +171,7 @@ Template.dateBadge.helpers({
// editCardEndDatePopup // editCardEndDatePopup
(class extends DatePicker { (class extends DatePicker {
onCreated() { onCreated() {
super.onCreated(); super.onCreated(moment().format("YYYY-MM-DD HH:mm"));
this.data().getEnd() && this.date.set(moment(this.data().getEnd())); this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
} }

5
client/lib/datepicker.js
View file

@ -3,10 +3,11 @@ DatePicker = BlazeComponent.extendComponent({
return 'datepicker'; return 'datepicker';
}, },
onCreated() { onCreated(defaultTime='1970-01-01 08:00:00') {
this.error = new ReactiveVar(''); this.error = new ReactiveVar('');
this.card = this.data(); this.card = this.data();
this.date = new ReactiveVar(moment.invalid()); this.date = new ReactiveVar(moment.invalid());
this.defaultTime = defaultTime;
}, },
onRendered() { onRendered() {
@ -26,7 +27,7 @@ DatePicker = BlazeComponent.extendComponent({
if (!timeInput.value) { if (!timeInput.value) {
const currentHour = evt.date.getHours(); const currentHour = evt.date.getHours();
const defaultMoment = moment( const defaultMoment = moment(
currentHour > 0 ? evt.date : '1970-01-01 08:00:00', currentHour > 0 ? evt.date : this.defaultTime,
); // default to 8:00 am local time ); // default to 8:00 am local time
timeInput.value = defaultMoment.format('LT'); timeInput.value = defaultMoment.format('LT');
} }