Merge pull request #234 from hoangkianh/master

fix #226
BuildOnViction · Oct 6, 2018 · 694911a · 694911a
2 parents 622a4c0 + 2c33b15
commit 694911a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/app/assets/scss/components/_table.scss b/app/assets/scss/components/_table.scss
@@ -649,7 +649,7 @@
 
 .tomo-table--signed {
 
-    td[aria-colindex="4"] {
+    td[aria-colindex="5"] {
         text-align: center;
         grid-template-columns: 100% !important;
 
@@ -674,11 +674,16 @@
 
         thead tr,
         tbody tr {
-            grid-template-columns: 10% 20% 60% 10%;
+            grid-template-columns: 10% 15% 55% 10% 10%;
         }
 
         th[aria-colindex="4"],
         td[aria-colindex="4"] {
+            text-align: right
+        }
+
+        th[aria-colindex="5"],
+        td[aria-colindex="5"] {
             text-align: right;
 
             a > span {

diff --git a/app/components/candidates/View.vue b/app/components/candidates/View.vue
@@ -368,6 +368,15 @@
                         <span>View on TomoScan</span>
                     </a>
                 </template>
+
+                <template
+                    slot="createdAt"
+                    slot-scope="data">
+                    <span :id="`timestamp__${data.index}`">{{ data.item.createdAt }}</span>
+                    <b-tooltip :target="`timestamp__${data.index}`">
+                        {{ data.item.dateTooltip }}
+                    </b-tooltip>
+                </template>
             </b-table>
 
             <b-pagination
@@ -548,6 +557,11 @@ export default {
                     label: 'Tx Hash',
                     sortable: false
                 },
+                {
+                    key: 'createdAt',
+                    label: 'Age',
+                    sortable: false
+                },
                 {
                     key: 'action',
                     label: '',
@@ -608,7 +622,7 @@ export default {
                     sortable: false
                 },
                 {
-                    key: 'tx',
+                    key: 'action',
                     label: '',
                     sortable: false
                 }
@@ -721,7 +735,9 @@ export default {
                 })
                 self.signs.push({
                     tx: stx[0].tx,
-                    blockNumber: bs.blockNumber
+                    blockNumber: bs.blockNumber,
+                    createdAt: moment(bs.createdAt).fromNow(),
+                    dateTooltip: moment(bs.createdAt).format('lll')
                 })
             })