소스 검색

Merge pull request #3446 from jrsupplee/issue-3287

Issue #3287
Lauri Ojansivu 4 년 전
부모
커밋
f0b46d5508
4개의 변경된 파일50개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 0
      client/components/cards/cardDate.jade
  2. 33 0
      client/components/cards/cardDate.js
  3. 9 5
      client/components/cards/cardDate.styl
  4. 3 0
      client/components/cards/minicard.jade

+ 5 - 0
client/components/cards/cardDate.jade

@@ -7,3 +7,8 @@ template(name="dateBadge")
     a.card-date(title="{{showTitle}}" class="{{classes}}")
     a.card-date(title="{{showTitle}}" class="{{classes}}")
       time(datetime="{{showISODate}}")
       time(datetime="{{showISODate}}")
         | {{showDate}}
         | {{showDate}}
+
+template(name="dateCustomField")
+  a(title="{{showTitle}}" class="{{classes}}")
+    time(datetime="{{showISODate}}")
+      | {{showDate}}

+ 33 - 0
client/components/cards/cardDate.js

@@ -363,6 +363,33 @@ class CardEndDate extends CardDate {
 }
 }
 CardEndDate.register('cardEndDate');
 CardEndDate.register('cardEndDate');
 
 
+class CardCustomFieldDate extends CardDate {
+  template() {
+    return 'dateCustomField';
+  }
+
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.autorun(() => {
+      self.date.set(moment(self.data().value));
+    });
+  }
+
+  classes() {
+    return 'customfield-date';
+  }
+
+  showTitle() {
+    return '';
+  }
+
+  events() {
+    return [];
+  }
+}
+CardCustomFieldDate.register('cardCustomFieldDate');
+
 (class extends CardReceivedDate {
 (class extends CardReceivedDate {
   showDate() {
   showDate() {
     return this.date.get().format('l');
     return this.date.get().format('l');
@@ -387,6 +414,12 @@ CardEndDate.register('cardEndDate');
   }
   }
 }.register('minicardEndDate'));
 }.register('minicardEndDate'));
 
 
+(class extends CardCustomFieldDate {
+  showDate() {
+    return this.date.get().format('l');
+  }
+}.register('minicardCustomFieldDate'));
+
 class VoteEndDate extends CardDate {
 class VoteEndDate extends CardDate {
   onCreated() {
   onCreated() {
     super.onCreated();
     super.onCreated();

+ 9 - 5
client/components/cards/cardDate.styl

@@ -2,11 +2,11 @@
   display: block
   display: block
   border-radius: 4px
   border-radius: 4px
   padding: 1px 3px
   padding: 1px 3px
-  
+
   background-color: #dbdbdb
   background-color: #dbdbdb
   &:hover, &.is-active
   &:hover, &.is-active
     background-color: #b3b3b3
     background-color: #b3b3b3
-  
+
   &.current, &.almost-due, &.due, &.long-overdue
   &.current, &.almost-due, &.due, &.long-overdue
     color: #fff
     color: #fff
 
 
@@ -14,17 +14,17 @@
     background-color: #5ba639
     background-color: #5ba639
     &:hover, &.is-active
     &:hover, &.is-active
       background-color: darken(#5ba639, 10)
       background-color: darken(#5ba639, 10)
-  
+
   &.almost-due
   &.almost-due
     background-color: #edc909
     background-color: #edc909
     &:hover, &.is-active
     &:hover, &.is-active
       background-color: darken(#edc909, 10)
       background-color: darken(#edc909, 10)
-  
+
   &.due
   &.due
     background-color: #fa3f00
     background-color: #fa3f00
     &:hover, &.is-active
     &:hover, &.is-active
       background-color: darken(#fa3f00, 10)
       background-color: darken(#fa3f00, 10)
-  
+
   &.long-overdue
   &.long-overdue
     background-color: #fd5d47
     background-color: #fd5d47
     &:hover, &.is-active
     &:hover, &.is-active
@@ -57,3 +57,7 @@
       -webkit-font-smoothing: antialiased
       -webkit-font-smoothing: antialiased
       margin-right: 0.3em
       margin-right: 0.3em
 
 
+.customfield-date
+  display: block
+  border-radius: 4px
+  padding: 1px 3px

+ 3 - 0
client/components/cards/minicard.jade

@@ -77,6 +77,9 @@ template(name="minicard")
                 if $eq definition.type "currency"
                 if $eq definition.type "currency"
                   +viewer
                   +viewer
                     = formattedCurrencyCustomFieldValue(definition)
                     = formattedCurrencyCustomFieldValue(definition)
+                else if $eq definition.type "date"
+                  .date
+                    +minicardCustomFieldDate
                 else if $eq definition.type "checkbox"
                 else if $eq definition.type "checkbox"
                   .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
                   .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
                 else
                 else