Meldeperiode

Author: igorweber

models/Meldeperiode.ts

@@ -0,0 +1,6 @@
+export type Meldeperiode = {
+  meldeperiodeId: number;
+  fomDato: Date;
+  tomDato: Date;
+  frist: Date;
+}

src/auth.utils.ts

@@ -9,7 +9,7 @@ if (process.env.AUTH_PROVIDER == "local") {
     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
   getSession = makeSession({
     identityProvider: async () => staticToken,
-    oboProvider: async (token: string, audience: string) => token + audience,
+    oboProvider: async (token: string, audience: string) => token + "." + audience,
   });
 } else {
   getSession = makeSession({

src/pages/_app.tsx

@@ -40,6 +40,7 @@ i18n
           "period": "Periode",
           "date": "Dato",
           "week": "Uke",
+          "deadline": "Frist",
           "startFillingOut": "Begynn utfylling"
         }
       },
@@ -61,7 +62,7 @@ i18n
 
           "period": "Period",
           "date": "Date",
-          "week": "Week",
+          "deadline": "Deadline",
           "startFillingOut": "Start filling out"
         }
       }

src/pages/api/save.ts renamed to src/pages/api/period/save.ts

@@ -1,5 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from "next";
-import { getSession } from "../../auth.utils";
+import { getSession } from "../../../auth.utils";
 import { v4 as uuid } from 'uuid';
 
 export default async function handler(
@@ -19,7 +19,7 @@ export default async function handler(
 
     const callId = uuid();
     const dpRappApiUrl = process.env.DP_RAPP_API_URL;
-    const url = `${dpRappApiUrl}/api/v1/lagre`;
+    const url = `${dpRappApiUrl}/api/v1/mellomlagring/lagre`;
     const response = await fetch(url, {
       method: "POST",
       headers: {

src/pages/api/send.ts renamed to src/pages/api/period/send.ts

@@ -1,5 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from "next";
-import { getSession } from "../../auth.utils";
+import { getSession } from "../../../auth.utils";
 import { v4 as uuid } from 'uuid';
 
 export default async function handler(

src/pages/form.tsx

@@ -58,7 +58,7 @@ export async function getServerSideProps() {
 
   // Get saved values
   try {
-    const response = await fetch(process.env.DP_RAPP_API_URL + '/api/v1/hente/' + currentId);
+    const response = await fetch(process.env.DP_RAPP_API_URL + '/api/v1/mellomlagring/hente/' + currentId);
     if (response.ok) {
       loadedData = await response.json();
     }
@@ -127,7 +127,7 @@ export default function Page(props: InitialState) {
   };
 
   const save = async () => {
-    const response = await postData('/api/save');
+    const response = await postData('/api/period/save');
 
     if (!response.ok) {
       setError('Feil i vårt baksystem. Kunne ikke lagre data');
@@ -138,7 +138,7 @@ export default function Page(props: InitialState) {
   }
 
   const send = async () => {
-    const response = await postData('/api/send');
+    const response = await postData('/api/period/send');
 
     if (response.ok) {
       setCurrentStep(currentStep + 1);

src/pages/index.tsx

@@ -2,27 +2,45 @@ import { Table } from "@navikt/ds-react";
 import Menu from "../../components/Menu";
 import Spacer from "../../components/Spacer";
 import NavPanel from "../../components/NavPanel";
-import { format, getISOWeek } from "date-fns";
+import { format, getISOWeek, parseISO } from "date-fns";
 import { useTranslation } from "react-i18next";
+import { Meldeperiode } from "../../models/Meldeperiode";
 
-export default function Page() {
+type InitialState = {
+  periods: Meldeperiode[];
+}
 
-  const { t } = useTranslation();
+export async function getServerSideProps() {
+  let periods: Meldeperiode[] = [];
 
-  const data = [
-    {
-      startDate: new Date(2022, 10, 21, 12, 0),
-      endDate: new Date(2022, 11, 4, 12, 0),
-    },
-    {
-      startDate: new Date(2022, 11, 5, 12, 0),
-      endDate: new Date(2022, 11, 18, 12, 0),
-    },
-    {
-      startDate: new Date(2022, 11, 19, 12, 0),
-      endDate: new Date(2023, 0, 1, 12, 0),
+  // Get saved values
+  try {
+    const response = await fetch(process.env.DP_RAPP_API_URL + '/api/v1/meldeperiode/hente');
+    if (response.ok) {
+      periods = await response.json();
     }
-  ];
+  } catch (e) {
+    // Couldn't load period list
+  }
+
+  // Data comes to page as props
+  return {
+    props: {
+      periods
+    },
+  };
+}
+
+export default function Page(props: InitialState) {
+
+  const { t } = useTranslation();
+
+  const data = props.periods.map(period => ({
+    meldeperiodeId: period.meldeperiodeId,
+    fomDato: parseISO(period.fomDato + "T12:00:00"),
+    tomDato: parseISO(period.tomDato + "T12:00:00"),
+    frist: parseISO(period.frist + "T12:00:00")
+  }));
 
   return (
     <main>
@@ -36,17 +54,21 @@ export default function Page() {
           <Table.Row>
             <Table.HeaderCell scope="col">{t('period')}</Table.HeaderCell>
             <Table.HeaderCell scope="col">{t('date')}</Table.HeaderCell>
+            <Table.HeaderCell scope="col">{t('deadline')}</Table.HeaderCell>
           </Table.Row>
         </Table.Header>
         <Table.Body>
-          {data.map(({ startDate, endDate }) => {
+          {data.map(({ fomDato, tomDato, frist }) => {
             return (
-              <Table.Row key={startDate.getTime()}>
+              <Table.Row key={fomDato.getTime()}>
                 <Table.HeaderCell scope="row">
-                  {t('week')} {getISOWeek(startDate)} - {getISOWeek(endDate)}
+                  {t('week')} {getISOWeek(fomDato)} - {getISOWeek(tomDato)}
                 </Table.HeaderCell>
                 <Table.DataCell>
-                  {format(startDate, "dd.MM.yyyy")} - {format(endDate, "dd.MM.yyyy")}
+                  {format(fomDato, "dd.MM.yyyy")} - {format(tomDato, "dd.MM.yyyy")}
+                </Table.DataCell>
+                <Table.DataCell>
+                  {format(frist, "dd.MM.yyyy")}
                 </Table.DataCell>
               </Table.Row>
             );