From e9aeaecfc9bbef0e02728cf48451e513abf21222 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Wed, 7 Feb 2024 18:37:06 -0400
Subject: [PATCH] FOUR-14062 Date columns are not showing in the uesr's format

---
 .../js/components/shared/FilterTable.vue      | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/shared/FilterTable.vue b/resources/js/components/shared/FilterTable.vue
index f3fc0b3be4..e7352ba76b 100644
--- a/resources/js/components/shared/FilterTable.vue
+++ b/resources/js/components/shared/FilterTable.vue
@@ -222,15 +222,24 @@ export default {
         this.resizingColumnIndex = -1;
       }
     },
-    formatDate(date, mask) {
-      const dateTimeFormat = "MM/DD/YY HH:mm";
-      const dateFormat = "MM/DD/YY";
-      if (mask === "datetime") {
-        return date === null ? "-" : moment(date).format(dateTimeFormat);
+    formatDate(value, format) {
+      let config = "";
+      if (typeof ProcessMaker !== "undefined" && ProcessMaker.user && ProcessMaker.user.datetime_format) {
+        if (format === "datetime") {
+          config = ProcessMaker.user.datetime_format;
+        }
+        if (format === "date") {
+          config = ProcessMaker.user.datetime_format.replace(/[\sHh:msaAzZ]/g, "");
+        }
       }
-      if (mask === "date") {
-        return date === null ? "-" : moment(date).format(dateFormat);
+      if (value) {
+        if (moment(value).isValid()) {
+          return window.moment(value)
+            .format(config);
+        }
+        return value;
       }
+      return "-";
     },
     handleRowClick(row) {
       this.$emit("table-row-click", row);