added publicationDate

ConductionNL · Sep 22, 2023 · 97a36d3 · 97a36d3
1 parent fe8532b
commit 97a36d3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/pwa/src/services/dateFormat.ts b/pwa/src/services/dateFormat.ts
@@ -1,8 +1,6 @@
 import dateFormat from "dateformat";
 
 export const translateDate = (language: string, date: Date): string => {
-  if (!date) return "NVT";
-
   switch (language) {
     case "nl":
       return dateFormat(date, "dd-mm-yyyy");

diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
@@ -22,7 +22,8 @@ export const CardsResultsTemplate: React.FC<CardsResultsTemplateProps> = ({ requ
           <CardWrapper key={request.id} className={styles.cardContainer} onClick={() => navigate(request.id)}>
             <CardHeader>
               <CardHeaderDate>
-                <FontAwesomeIcon icon={faClock} /> {translateDate(i18n.language, request.Publicatiedatum) ?? "-"}
+                <FontAwesomeIcon icon={faClock} />{" "}
+                {request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : "NVT"}
               </CardHeaderDate>
               <CardHeaderTitle className={styles.title}>
                 <Heading2>{request.Titel}</Heading2>

diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
@@ -25,6 +25,7 @@ export const TableResultsTemplate: React.FC<TableResultsTemplateProps> = ({ requ
         <TableRow>
           <TableHeaderCell>Woo-verzoek</TableHeaderCell>
           <TableHeaderCell>Onderwerp</TableHeaderCell>
+          <TableHeaderCell>Publicatiedatum</TableHeaderCell>
           <TableHeaderCell>Ontvangstdatum</TableHeaderCell>
           <TableHeaderCell>Besluitdatum</TableHeaderCell>
           <TableHeaderCell>Besluit</TableHeaderCell>
@@ -35,8 +36,21 @@ export const TableResultsTemplate: React.FC<TableResultsTemplateProps> = ({ requ
           <TableRow className={styles.tableRow} key={request.id} onClick={() => navigate(request.id)}>
             <TableCell>{request.Titel}</TableCell>
             <TableCell>{request.Categorie ?? "-"}</TableCell>
-            <TableCell>{translateDate(i18n.language, request.Ontvangstdatum) ?? "-"}</TableCell>
-            <TableCell>{translateDate(i18n.language, request.Besluitdatum) ?? "-"}</TableCell>
+            <TableCell>
+              {request.Publicatiedatum
+                ? translateDate(i18n.language, request.Publicatiedatum)
+                : "Geen publicatiedatum beschikbaar"}
+            </TableCell>
+            <TableCell>
+              {request.Ontvangstdatum
+                ? translateDate(i18n.language, request.Ontvangstdatum)
+                : "Geen ontvanstdatum beschikbaar"}
+            </TableCell>
+            <TableCell>
+              {request.Besluitdatum
+                ? translateDate(i18n.language, request.Besluitdatum)
+                : "Geen besluitdatum beschikbaar"}
+            </TableCell>
             <TableCell>{request.Besluit !== "" ? request.Besluit : "Geen besluit beschikbaar"}</TableCell>
           </TableRow>
         ))}

diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx
@@ -84,6 +84,17 @@ export const WOOItemDetailTemplate: React.FC<WOOItemDetailTemplateProps> = ({ wo
                   </TableRow>
                 )}
 
+                {getItems.data.Publicatiedatum && (
+                  <TableRow className={styles.tableRow}>
+                    <TableCell>{t("Publicatiedatum")}</TableCell>
+                    <TableCell>
+                      {getItems.data.Publicatiedatum
+                        ? translateDate(i18n.language, getItems.data.Publicatiedatum)
+                        : "-"}
+                    </TableCell>
+                  </TableRow>
+                )}
+
                 {getItems.data.Ontvangstdatum && (
                   <TableRow className={styles.tableRow}>
                     <TableCell>{t("Ontvangstdatum")}</TableCell>