Show action dashboard columns for start and end date

kausaltech · Oct 24, 2024 · cea6f58 · cea6f58
1 parent acb091f
commit cea6f58
Show file tree

Hide file tree

Showing 6 changed files with 210 additions and 146 deletions.
diff --git a/common/__generated__/graphql.ts b/common/__generated__/graphql.ts
diff --git a/common/__generated__/possible_types.json b/common/__generated__/possible_types.json
diff --git a/components/dashboard/dashboard.constants.tsx b/components/dashboard/dashboard.constants.tsx
@@ -1,3 +1,4 @@
+import dayjs from 'common/dayjs';
 import React, { ReactNode } from 'react';
 
 import { PlanContextFragment } from 'common/__generated__/graphql';
@@ -181,6 +182,23 @@ export const COLUMN_CONFIG: { [key in ColumnBlock]: Column } = {
       <LastUpdatedTooltipContent action={action} />
     ),
   },
+
+  StartDateColumnBlock: {
+    sortable: true,
+    headerKey: 'startDate',
+    renderHeader: (t, _, label) => label || t('action-start-date'),
+    renderCell: (action) =>
+      action.startDate != null && dayjs(action.startDate).format('l'),
+  },
+
+  EndDateColumnBlock: {
+    sortable: true,
+    headerKey: 'endDate',
+    renderHeader: (t, _, label) => label || t('action-end-date'),
+    renderCell: (action) =>
+      action.endDate != null && dayjs(action.endDate).format('l'),
+  },
+
   FieldColumnBlock: {
     renderHeader: (t, _, label) => label,
     renderCell: (action, _, __, attributeType) => {

diff --git a/fragments/action-list.fragment.ts b/fragments/action-list.fragment.ts
@@ -97,6 +97,12 @@ export const ACTION_TABLE_COLUMN_FRAGMENT = gql`
       ... on UpdatedAtColumnBlock {
         columnLabel
       }
+      ... on StartDateColumnBlock {
+        columnLabel
+      }
+      ... on EndDateColumnBlock {
+        columnLabel
+      }
       ... on OrganizationColumnBlock {
         columnLabel
       }

diff --git a/locales/de/actions.json b/locales/de/actions.json
@@ -4,6 +4,7 @@
     "actions-show-continuous": "Nur laufende Maßnahmen anzeigen",
     "action-description": "Beschreibung",
     "action-description-official": "Offizielle Beschreibung",
+    "action-end-date": "Ende",
     "action-id": "ID",
     "action-identifier": "Kennung",
     "action-impact": "Auswirkung",
@@ -18,6 +19,7 @@
     "action-previous": "{context, select, STRATEGY {Vorherige Strategie} CASE_STUDY {Vorherige Fallstudie} other {Vorherige Maßnahme}}",
     "action-progress": "Fortschritt",
     "action-responsibles-short": "Verantwortliche",
+    "action-start-date": "Beginn",
     "action-status-merged": "{context, select, STRATEGY {Zusammengeführt mit Strategie} CASE_STUDY {Zusammengeführt mit Fallstudie} other {Zusammengeführt mit Maßnahme}}",
     "action-status-updates": "Letzte Aktualisierungen",
     "action-task-done": "Erledigt",

diff --git a/locales/en/actions.json b/locales/en/actions.json
@@ -4,6 +4,7 @@
   "actions-show-continuous": "Show only continuous actions",
   "action-description": "Description",
   "action-description-official": "Official description",
+  "action-end-date": "End",
   "action-id": "ID",
   "action-identifier": "Identifier",
   "action-impact": "Impact",
@@ -18,6 +19,7 @@
   "action-previous": "{context, select, CASE_STUDY {Previous case study} STRATEGY {Previous strategy} other {Previous action}}",
   "action-progress": "Progress",
   "action-responsibles-short": "Responsible parties",
+  "action-start-date": "Start",
   "action-status-merged": "{context, select, CASE_STUDY {Merged with case study} STRATEGY {Merged with strategy} other {Merged with action}}",
   "action-status-updates": "Latest updates",
   "action-task-done": "Done",