diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-08-12 14:07:19 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-08-12 14:07:19 +0300 |
commit | 9967859f42a38d7f8a863a8a68b6f78292003258 (patch) | |
tree | 47fcd14b5904189c43b69492323150db96109694 /client/components/cards/cardTime.js | |
parent | 193af893ee4da894e9494792306f5825e99de74a (diff) | |
parent | eac0b3e7bb73e54a61de368fe87c0817a0225838 (diff) | |
download | wekan-9967859f42a38d7f8a863a8a68b6f78292003258.tar.gz wekan-9967859f42a38d7f8a863a8a68b6f78292003258.tar.bz2 wekan-9967859f42a38d7f8a863a8a68b6f78292003258.zip |
Merge branch 'andresmanelli-devel' into devel
Diffstat (limited to 'client/components/cards/cardTime.js')
-rw-r--r-- | client/components/cards/cardTime.js | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/client/components/cards/cardTime.js b/client/components/cards/cardTime.js index eadcc88e..80b7fc84 100644 --- a/client/components/cards/cardTime.js +++ b/client/components/cards/cardTime.js @@ -7,17 +7,17 @@ BlazeComponent.extendComponent({ this.card = this.data(); }, toggleOvertime() { - this.card.isOvertime = !this.card.isOvertime; + this.card.setIsOvertime(!this.card.getIsOvertime()); $('#overtime .materialCheckBox').toggleClass('is-checked'); $('#overtime').toggleClass('is-checked'); }, storeTime(spentTime, isOvertime) { this.card.setSpentTime(spentTime); - this.card.setOvertime(isOvertime); + this.card.setIsOvertime(isOvertime); }, deleteTime() { - this.card.unsetSpentTime(); + this.card.setSpentTime(null); }, events() { return [{ @@ -26,7 +26,7 @@ BlazeComponent.extendComponent({ evt.preventDefault(); const spentTime = parseFloat(evt.target.time.value); - const isOvertime = this.card.isOvertime; + const isOvertime = this.card.getIsOvertime(); if (spentTime >= 0) { this.storeTime(spentTime, isOvertime); @@ -55,17 +55,14 @@ BlazeComponent.extendComponent({ self.time = ReactiveVar(); }, showTitle() { - if (this.data().isOvertime) { - return `${TAPi18n.__('overtime')} ${this.data().spentTime} ${TAPi18n.__('hours')}`; + if (this.data().getIsOvertime()) { + return `${TAPi18n.__('overtime')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`; } else { - return `${TAPi18n.__('card-spent')} ${this.data().spentTime} ${TAPi18n.__('hours')}`; + return `${TAPi18n.__('card-spent')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`; } }, showTime() { - return this.data().spentTime; - }, - isOvertime() { - return this.data().isOvertime; + return this.data().getSpentTime(); }, events() { return [{ |