From 65c146fa877c4aab0d373e9a765d8e38d922fcd4 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Wed, 2 Aug 2023 18:34:20 +0200 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=92=84=F0=9F=90=9B=20Bruker=20switch?= =?UTF-8?q?=20til=20=C3=A5=20endre=20om=20sak=20haster=20i=20redigering?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: La også til kommentar-field for å unngå BAD_REQUEST på Posting av nye feil --- frontend/src/components/RedigeringsVerktoy.tsx | 13 ++++--------- frontend/src/pages/feil.tsx | 3 ++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx index cb22ea8..6a9c8e5 100644 --- a/frontend/src/components/RedigeringsVerktoy.tsx +++ b/frontend/src/components/RedigeringsVerktoy.tsx @@ -1,5 +1,5 @@ import { FloppydiskIcon, XMarkIcon } from "@navikt/aksel-icons" -import { TextField, Textarea, RadioGroup, Radio, Button } from "@navikt/ds-react" +import { TextField, Textarea, RadioGroup, Radio, Button, Switch } from "@navikt/ds-react" import { useState } from "react" import { FeilmeldingsInnholdInterface } from "../interface" import axios from "axios" @@ -62,14 +62,9 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => { Feilen jobbes med Feilen er fikset - {setHaster(haster)}} - value={haster} - > - Ja - Nei - + setHaster(!haster)}> + Saken haster +
- + {redigeringsmodus ? { + const [kommentar, setKommentar] = useState("") + const [kommentarfelt, setKommentarfelt] = useState("") + + const oppdaterkommentar = async() => { + setKommentar(kommentarfelt) + + const payload = { + id: props.id, + tittel: kommentar, + } + + await axios.put("/api/oppdaterkommentar", payload, { + headers: { + 'Content-Type': 'application/json' + } + }).then((response) => { + console.log(response); + }).catch((error) => { + console.log(error); + }) + + props.reset() + } + return(
@@ -16,7 +44,7 @@ const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { arbeidsstatus={props.arbeidsstatus} />
-
+ {props.children} + {kommentar.length === 0 ? + oppdaterkommentar()} + /> + : + + }
) } export default FeilmeldingsInnhold; + + +interface Ikommentar { + setKommentarfelt: (val: string) => void + oppdaterKommentar: () => void +} + +interface kommentarTekstfeltInterface extends Ikommentar{ + kommentarfelt: string, +} +interface kommentarInterface { + tekst: string +} + + +const KommentarTekstfelt = (props: kommentarTekstfeltInterface) => { + return( +
+ props.setKommentarfelt(e.target.value)} + > + + +
+ ) +} + +const Kommentar = (props: kommentarInterface) => { + return( + <> + +
+ Notat +

{props.tekst}

+
+ + ) +} \ No newline at end of file diff --git a/frontend/src/interface.ts b/frontend/src/interface.ts index a95a0aa..6b698b4 100644 --- a/frontend/src/interface.ts +++ b/frontend/src/interface.ts @@ -16,6 +16,7 @@ export interface FeilmeldingsInnholdInterface extends IFeilmelding { children?: React.ReactNode setRedigeringsmodus: (redigeringsmodus: boolean) => void setVisModal: (visModal: boolean) => void + reset: () => void } export class Feilmelding implements IFeilmelding { From a399eb31d1cfe61d4eb357f8dc8b7f1b6df7bcdf Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Thu, 3 Aug 2023 10:39:47 +0200 Subject: [PATCH 6/8] =?UTF-8?q?=E2=99=BF=EF=B8=8F=20Heading=20for=20haster?= =?UTF-8?q?=20switch=20i=20innmeldingsskjema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/Skillelinje.tsx | 2 +- frontend/src/pages/feil.tsx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Skillelinje.tsx b/frontend/src/components/Skillelinje.tsx index 1df1ccd..4caef55 100644 --- a/frontend/src/components/Skillelinje.tsx +++ b/frontend/src/components/Skillelinje.tsx @@ -2,7 +2,7 @@ const Skillelinje = () => { return ( -
+
) } export default Skillelinje \ No newline at end of file diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx index 28f09f4..658ac99 100644 --- a/frontend/src/pages/feil.tsx +++ b/frontend/src/pages/feil.tsx @@ -63,7 +63,7 @@ export default function Feil() {
-
+
+ + + Haster det å fikse feilen? + setHaster(!haster)} > Saken Haster -
From 937b3dac2d2d96c037088d6e8fe5bb76d2ce5d7b Mon Sep 17 00:00:00 2001 From: "Markus A. R. Johansen" <90006516+J0hans1@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:51:04 +0200 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=92=84=20Alternativ=20Layout=20for=20?= =?UTF-8?q?redigeringsskjema=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 💄 Alternativ Layout for redigeringsskjema * 💄 Gjort endringer på Modal layout og lagt til header på redigering --------- Co-authored-by: Sid <93219711+SindreKjelsrud@users.noreply.github.com> --- frontend/src/components/FeilModal.tsx | 2 +- .../src/components/FeilmeldingsInnhold.tsx | 9 ++++--- .../src/components/RedigeringsVerktoy.tsx | 24 ++++++++++++------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/FeilModal.tsx b/frontend/src/components/FeilModal.tsx index 89069c5..e7eb4a3 100644 --- a/frontend/src/components/FeilModal.tsx +++ b/frontend/src/components/FeilModal.tsx @@ -11,7 +11,7 @@ interface modalInterface { const FeilModal = (props: modalInterface) => { return( props.setOpen(false)} diff --git a/frontend/src/components/FeilmeldingsInnhold.tsx b/frontend/src/components/FeilmeldingsInnhold.tsx index caa3c6d..d48e7be 100644 --- a/frontend/src/components/FeilmeldingsInnhold.tsx +++ b/frontend/src/components/FeilmeldingsInnhold.tsx @@ -6,7 +6,6 @@ import { useState } from "react" import Skillelinje from "./Skillelinje" import axios from "axios" - const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { const [kommentar, setKommentar] = useState("") const [kommentarfelt, setKommentarfelt] = useState("") @@ -33,8 +32,8 @@ const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { } return( -
-
+ <> +
{ onClick={() => { props.setVisModal(false) props.setRedigeringsmodus(false) - } } + }} > Lukk @@ -74,7 +73,7 @@ const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { tekst={kommentar} /> } -
+ ) } export default FeilmeldingsInnhold; diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx index 087a887..f9ca506 100644 --- a/frontend/src/components/RedigeringsVerktoy.tsx +++ b/frontend/src/components/RedigeringsVerktoy.tsx @@ -42,8 +42,12 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => { } return ( -
-
+
+ +
+ + Rediger feil + { Feilen er fikset - - Haster det å fikse feilen? - - setHaster(!haster)}> - Feilen haster - +
+ + Haster det å fikse feilen? + + setHaster(!haster)}> + Feilen haster + +
-
+