Make dates consistent

VirtoCommerce · May 30, 2024 · 50e64e8 · 50e64e8
1 parent 74ee045
commit 50e64e8
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 6 deletions.
diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/locales/en.json b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/locales/en.json
@@ -100,7 +100,9 @@
             "USER_ID": "User ID",
             "USER_NAME": "Login",
             "IS_READ": "Read",
-            "IS_HIDDEN": "Hidden"
+            "IS_HIDDEN": "Hidden",
+            "CREATED_DATE": "Created date",
+            "MODIFIED_DATE": "Modified date"
           }
         }
       },

diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/draftList.ts b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/draftList.ts
@@ -69,13 +69,27 @@ export const grid: DynamicGridSchema = {
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.SHORT_MESSAGE",
           type: "html",
         },
+        {
+          id: "createdDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.CREATED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
         {
           id: "modifiedDate",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.MODIFIED_DATE",
-          sortable: true,
           type: "date-time",
+          sortable: true,
           alwaysVisible: true,
         },
+        {
+          id: "startDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.START_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
         {
           id: "recipientsTotalCount",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.RECIPIENTS_TOTAL_COUNT",

diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/messageList.ts b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/messageList.ts
@@ -77,10 +77,24 @@ export const grid: DynamicGridSchema = {
         {
           id: "createdDate",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.CREATED_DATE",
-          sortable: true,
           type: "date-time",
+          sortable: true,
           alwaysVisible: true,
         },
+        {
+          id: "modifiedDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.MODIFIED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
+        {
+          id: "startDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.START_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
         {
           id: "recipientsTotalCount",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.RECIPIENTS_TOTAL_COUNT",

diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/recipientList.ts b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/recipientList.ts
@@ -52,6 +52,20 @@ export const grid: DynamicGridSchema = {
           width: "6em",
           visible: false,
         },
+        {
+          id: "createdDate",
+          title: "PUSH_MESSAGES.PAGES.RECIPIENTS.TABLE.HEADER.CREATED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
+        {
+          id: "modifiedDate",
+          title: "PUSH_MESSAGES.PAGES.RECIPIENTS.TABLE.HEADER.MODIFIED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
       ],
     },
   ],

diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/scheduledList.ts b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/scheduledList.ts
@@ -69,11 +69,25 @@ export const grid: DynamicGridSchema = {
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.SHORT_MESSAGE",
           type: "html",
         },
+        {
+          id: "createdDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.CREATED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
+        {
+          id: "modifiedDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.MODIFIED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
         {
           id: "startDate",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.START_DATE",
-          sortable: true,
           type: "date-time",
+          sortable: true,
           alwaysVisible: true,
         },
         {

diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/sentList.ts b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/sentList.ts
@@ -77,10 +77,24 @@ export const grid: DynamicGridSchema = {
         {
           id: "createdDate",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.CREATED_DATE",
-          sortable: true,
           type: "date-time",
+          sortable: true,
           alwaysVisible: true,
         },
+        {
+          id: "modifiedDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.MODIFIED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
+        {
+          id: "startDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.START_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
         {
           id: "recipientsTotalCount",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.RECIPIENTS_TOTAL_COUNT",

diff --git a/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/trackingList.ts b/src/VirtoCommerce.PushMessages.Web/App/src/modules/push-messages/pages/trackingList.ts
@@ -72,10 +72,24 @@ export const grid: DynamicGridSchema = {
         {
           id: "createdDate",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.CREATED_DATE",
-          sortable: true,
           type: "date-time",
+          sortable: true,
           alwaysVisible: true,
         },
+        {
+          id: "modifiedDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.MODIFIED_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
+        {
+          id: "startDate",
+          title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.START_DATE",
+          type: "date-time",
+          sortable: true,
+          visible: false,
+        },
         {
           id: "recipientsTotalCount",
           title: "PUSH_MESSAGES.PAGES.LIST.TABLE.HEADER.RECIPIENTS_TOTAL_COUNT",