From e69d6dfeab3dd979f52e81b43c4a30da0d6b6411 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 29 Jan 2020 00:17:29 -0500
Subject: [PATCH] add support for custom time formats

---
 src/_store/index.js             |  3 ++-
 src/account/AppDataViewPage.vue | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/_store/index.js b/src/_store/index.js
index f0445bd..55d94d6 100644
--- a/src/_store/index.js
+++ b/src/_store/index.js
@@ -69,7 +69,8 @@ String.prototype.parseDateMessage = function (millis, messages) {
         d: date.getDate(),
         H: date.getHours(),
         h: (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()+1),
-        a: (date.getHours() > 12 ? messages['label_date_day_half_pm'] : messages['label_date_day_half_am']),
+        A: (date.getHours() > 12 ? messages['label_date_day_half_pm'] : messages['label_date_day_half_am']),
+        a: (date.getHours() > 12 ? messages['label_date_day_half_pm'] : messages['label_date_day_half_am']).toLowerCase(),
         m: date.getMinutes(),
         s: date.getSeconds()
     };
diff --git a/src/account/AppDataViewPage.vue b/src/account/AppDataViewPage.vue
index ca755e7..f81dbe6 100644
--- a/src/account/AppDataViewPage.vue
+++ b/src/account/AppDataViewPage.vue
@@ -10,25 +10,27 @@
             </thead>
             <tbody v-if="appData && appData.results && appData.results.length && appData.results.length > 0">
             <tr v-for="row in appData.results">
-                <td v-for="field in app.dataConfig.fields">
+                <td v-for="field in app.dataConfig.fields" nowrap="nowrap">
                     <span v-if="field.name === 'expiration'">
                         <span v-if="row[field.name] !== null && row[field.name] > 0">{{messages.date_format_app_data_expiration.parseDateMessage(row[field.name], messages)}}</span>
                         <span v-else>{{messages.message_app_data_no_expiration}}</span>
                     </span>
+                    <span v-else-if="typeof field.customFormat !== 'undefined' && field.customFormat === true">
+                        {{messages['app_'+app.name+'_view_'+viewId+'_'+field.name+'_format'].parseDateMessage(row[field.name], messages)}}
+                    </span>
                     <span v-else-if="field.name === 'ctime' || field.name === 'mtime'">
                         {{messages.date_format_app_data_epoch_time.parseDateMessage(row[field.name], messages)}}
                     </span>
                     <span v-else>{{row[field.name]}}</span>
                 </td>
-                <td>
+                <td v-if="app.dataConfig.actions && app.dataConfig.actions.length && app.dataConfig.actions.length > 0">
                     <div v-for="action in app.dataConfig.actions">
                         <button v-if="actionIsAvailable(action, row)" @click="dataAction(action, row.uuid)">{{messages['app_'+app.name+'_action_'+action.name]}}</button>
                     </div>
-
                 </td>
             </tr>
             <tr>
-                <td>{{messages.message_data_results.parseMessage(this)}}</td>
+                <td :colspan="totalColumns">{{messages.message_data_results.parseMessage(this)}}</td>
             </tr>
             <tr v-if="hasPrevPage() || hasNextPage()">
                 <td align="left" v-if="hasPrevPage()" nowrap="nowrap">