Prechádzať zdrojové kódy

Fixed date to display full date instead of "days ago" after 30 days.

Christopher Leggett 5 rokov pred
rodič
commit
ae30ff1bc4
2 zmenil súbory, kde vykonal 24 pridanie a 10 odobranie
  1. 13 8
      public/js/app.js
  2. 11 2
      resources/js/components/WorkOrderInfo.vue

+ 13 - 8
public/js/app.js

@@ -3097,6 +3097,15 @@ __webpack_require__.r(__webpack_exports__);
       });
       return list;
     }
+  },
+  methods: {
+    daysOrDate: function daysOrDate(date) {
+      if (this.daysSinceToday(date) <= 30) {
+        return Math.floor(this.daysSinceToday(date)) + "days ago";
+      } else {
+        return this.getHRDate(date);
+      }
+    }
   }
 });
 
@@ -52341,10 +52350,8 @@ var render = function() {
           [
             _vm._v(
               "\n            " +
-                _vm._s(
-                  Math.floor(this.daysSinceToday(_vm.workOrder.dropdate))
-                ) +
-                " days ago\n        "
+                _vm._s(_vm.daysOrDate(_vm.workOrder.dropdate)) +
+                "\n        "
             )
           ]
         )
@@ -52367,10 +52374,8 @@ var render = function() {
               [
                 _vm._v(
                   "\n            " +
-                    _vm._s(
-                      Math.floor(this.daysSinceToday(_vm.workOrder.pickupdate))
-                    ) +
-                    " days ago\n        "
+                    _vm._s(_vm.daysOrDate(_vm.workOrder.pickupdate)) +
+                    "\n        "
                 )
               ]
             )

+ 11 - 2
resources/js/components/WorkOrderInfo.vue

@@ -7,12 +7,12 @@
         <p><i class="fas fa-fw fa-building"></i> <span>{{ storeList[workOrder.storeid] }}</span></p>
         <p><i class="fas fa-fw fa-sign-in-alt"></i> 
             <span class="dashed-underline" data-toggle="tooltip" data-placement="bottom" v-bind:title=this.getHRDate(workOrder.dropdate)>
-                {{ Math.floor(this.daysSinceToday(workOrder.dropdate)) }} days ago
+                {{ daysOrDate(workOrder.dropdate) }}
             </span>
         </p>
         <p><i class="fas fa-sign-out-alt"></i> 
             <span class="dashed-underline" data-toggle="tooltip" data-placement="bottom" v-if="!this.isZero(workOrder.pickupdate)" v-bind:title=this.getHRDate(workOrder.pickupdate)>
-                {{ Math.floor(this.daysSinceToday(workOrder.pickupdate)) }} days ago
+                {{ daysOrDate(workOrder.pickupdate) }}
             </span>
         </p>
         <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#workordereditModal">Edit</button>
@@ -36,5 +36,14 @@
                 return list
             }
         },
+        methods: {
+            daysOrDate: function(date) {
+                if (this.daysSinceToday(date) <= 30) {
+                    return Math.floor(this.daysSinceToday(date)) + "days ago"
+                } else {
+                    return this.getHRDate(date)
+                }
+            }
+        }
     }
 </script>