From 4cdd063851d55477363323925de21b98fe2d45a5 Mon Sep 17 00:00:00 2001
From: Sindre Kjelsrud <sindre.kjelsrud@nav.no>
Date: Wed, 2 Aug 2023 16:01:53 +0200
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20Fikser=20oppdaterfeil=20rout?=
 =?UTF-8?q?ing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Amalie Erdal Mansåker <amalie.erdal.mansaker@nav.no>
---
 .../src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt
index f2b9514..470c93d 100644
--- a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt
+++ b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt
@@ -12,7 +12,10 @@ import io.ktor.server.http.content.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.request.*
 import no.nav.helse.sprik.db.FeilmeldingRepository
+import no.nav.helse.sprik.db.FeilmeldingTable
 import no.nav.helse.sprik.modell.Feilmelding
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import org.jetbrains.exposed.sql.update
 
 fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngineEnvironment {
     //Repositories for handlinger mot database:
@@ -62,9 +65,9 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin
                 val sokeresultat = feilmeldingRepository.hentSokteFeilmeldinger(sokestreng)
                 call.respond(status = HttpStatusCode.Created, message = sokeresultat)
             }
-            put("/api/oppdaterfeil/{id}") {
-                val id = call.parameters["id"]
+            put("/api/oppdaterfeil") {
                 val oppdatertFeilmelding = call.receive<Feilmelding>()
+                feilmeldingRepository.oppdaterFeilmelding(oppdatertFeilmelding)
                 call.respond(status = HttpStatusCode.Created, message = "Feilmelding oppdatert")
             }
         }

From 65c146fa877c4aab0d373e9a765d8e38d922fcd4 Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Wed, 2 Aug 2023 18:34:20 +0200
Subject: [PATCH 2/4] =?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) => {
                     <Radio value={1}>Feilen jobbes med</Radio>
                     <Radio value={2}>Feilen er fikset</Radio>
                 </RadioGroup>
-                <RadioGroup
-                    legend="Hvor vil du sitte?"
-                    onChange={(haster: boolean) => {setHaster(haster)}}
-                    value={haster}
-                >
-                    <Radio value={true}>Ja</Radio>
-                    <Radio value={false}>Nei</Radio>
-                </RadioGroup>
+                <Switch checked={haster} onClick={() => setHaster(!haster)}>
+                    Saken haster
+                </Switch>
             </div>
             <div className="flex gap-4 items-start">
                 <Button
diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx
index 803374c..2cbd365 100644
--- a/frontend/src/pages/feil.tsx
+++ b/frontend/src/pages/feil.tsx
@@ -22,7 +22,8 @@ export default function Feil() {
             beskrivelse: beskrivelse,
             dato: new Date().toISOString().replace('Z', ''), // Litt wack fix, burde endres
             arbeidsstatus: 0,
-            haster: false
+            haster: false,
+            kommentar: ""
         }
         
         axios.post("/api/nyfeil", payload, {

From 194bda6739ca709134cef31e467502e372595e70 Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Wed, 2 Aug 2023 18:50:48 +0200
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=92=84=20Gj=C3=B8r=20sm=C3=A5=20styli?=
 =?UTF-8?q?ng=20forbedringer,=20forbedret=20UU=20ved=20=C3=A5=20lage=20ski?=
 =?UTF-8?q?llelinjer=20i=20forms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/BildeOpplastning.tsx   | 5 ++++-
 frontend/src/components/FeilModal.tsx          | 2 +-
 frontend/src/components/RedigeringsVerktoy.tsx | 5 ++++-
 frontend/src/components/Skillelinje.tsx        | 8 ++++++++
 frontend/src/pages/feil.tsx                    | 3 +++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/components/Skillelinje.tsx

diff --git a/frontend/src/components/BildeOpplastning.tsx b/frontend/src/components/BildeOpplastning.tsx
index f3eb29b..345dfa3 100644
--- a/frontend/src/components/BildeOpplastning.tsx
+++ b/frontend/src/components/BildeOpplastning.tsx
@@ -1,5 +1,5 @@
 import { FileImageIcon, UploadIcon } from "@navikt/aksel-icons"
-import { Button } from "@navikt/ds-react"
+import { Button, Heading } from "@navikt/ds-react"
 
 
 /**
@@ -10,6 +10,9 @@ import { Button } from "@navikt/ds-react"
 const BildeOpplastning = () => {
     return(
         <div className="flex gap-2 flex-col">
+            <Heading size="xsmall">
+                Skjermbilder
+            </Heading>
             <div className="
                 h-48 p-5 bg-bg-subtle hover:bg-surface-selected border-2 border-blue-500
                 rounded-lg border-dashed flex flex-col items-center justify-center text-center gap-2 
diff --git a/frontend/src/components/FeilModal.tsx b/frontend/src/components/FeilModal.tsx
index 483684c..89069c5 100644
--- a/frontend/src/components/FeilModal.tsx
+++ b/frontend/src/components/FeilModal.tsx
@@ -11,7 +11,7 @@ interface modalInterface {
 const FeilModal = (props: modalInterface) => {
     return(                  
         <Modal
-            className="w-3/5"
+            className="w-3/5 p-5"
             open={props.open}
             aria-label={" modal"}
             onClose={() => props.setOpen(false)}
diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx
index 6a9c8e5..9b7c2f9 100644
--- a/frontend/src/components/RedigeringsVerktoy.tsx
+++ b/frontend/src/components/RedigeringsVerktoy.tsx
@@ -3,6 +3,7 @@ import { TextField, Textarea, RadioGroup, Radio, Button, Switch } from "@navikt/
 import { useState } from "react"
 import { FeilmeldingsInnholdInterface } from "../interface"
 import axios from "axios"
+import Skillelinje from "./Skillelinje"
 
 interface redigeringsInterface extends FeilmeldingsInnholdInterface {
     reset: () => void
@@ -53,6 +54,7 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => {
                     value={beskrivelse}
                     onChange={e => setBeskrivelse(e.target.value)}
                 />
+                <Skillelinje/>
                 <RadioGroup
                     legend="Velg arbeidsstatus for feil"
                     onChange={(arbeidsstatus: number) => {setArbeidsstatus(arbeidsstatus)}}
@@ -62,6 +64,7 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => {
                     <Radio value={1}>Feilen jobbes med</Radio>
                     <Radio value={2}>Feilen er fikset</Radio>
                 </RadioGroup>
+                <Skillelinje/>
                 <Switch checked={haster} onClick={() => setHaster(!haster)}>
                     Saken haster
                 </Switch>
@@ -87,4 +90,4 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => {
         </div>
     )
 }
-export default RedigeringsVerktoy;
\ No newline at end of file
+export default RedigeringsVerktoy;
diff --git a/frontend/src/components/Skillelinje.tsx b/frontend/src/components/Skillelinje.tsx
new file mode 100644
index 0000000..1df1ccd
--- /dev/null
+++ b/frontend/src/components/Skillelinje.tsx
@@ -0,0 +1,8 @@
+
+
+const Skillelinje = () => {
+    return (
+        <div className="h-1 bg-gray-200 my-4 rounded-lg w-full"></div>
+    )
+}
+export default Skillelinje
\ No newline at end of file
diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx
index 2cbd365..f962b90 100644
--- a/frontend/src/pages/feil.tsx
+++ b/frontend/src/pages/feil.tsx
@@ -7,6 +7,7 @@ import { useState } from "react";
 import BildeOpplastning from "../components/BildeOpplastning";
 import Header from "../components/Header";
 import { useNavigate } from "react-router-dom";
+import Skillelinje from "../components/Skillelinje";
 
 export default function Feil() {
     const [tittel, setTittel] = useState("");
@@ -85,7 +86,9 @@ export default function Feil() {
                             description="Detaljert beskrivelse av problemet"
                             onChange={e => setBeskrivelse(e.target.value)}
                         />
+                        <Skillelinje/>
                         <BildeOpplastning/>
+                        <Skillelinje/>
                     </div>
                     <div className="w-1/2 flex flex-col gap-2 justify-center">
                         {status != 0 ? handleAlerts() : <></>}

From dee5b627a3b2a7b811ad46563d92579a00bc181e Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Wed, 2 Aug 2023 18:57:45 +0200
Subject: [PATCH 4/4] =?UTF-8?q?=E2=99=BF=EF=B8=8F=20La=20til=20heading=20p?=
 =?UTF-8?q?=C3=A5=20Switch=20i=20redigeringsskjema?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/RedigeringsVerktoy.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx
index 9b7c2f9..087a887 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, Switch } from "@navikt/ds-react"
+import { TextField, Textarea, RadioGroup, Radio, Button, Switch, Heading } from "@navikt/ds-react"
 import { useState } from "react"
 import { FeilmeldingsInnholdInterface } from "../interface"
 import axios from "axios"
@@ -65,8 +65,11 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => {
                     <Radio value={2}>Feilen er fikset</Radio>
                 </RadioGroup>
                 <Skillelinje/>
+                <Heading size="xsmall">
+                    Haster det å fikse feilen?
+                </Heading>
                 <Switch checked={haster} onClick={() => setHaster(!haster)}>
-                    Saken haster
+                    Feilen haster
                 </Switch>
             </div>
             <div className="flex gap-4 items-start">