Merge branch 'main' into meldInnHasteSak

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}") {
+            put("/api/oppdaterfeil") {
-                val id = call.parameters["id"]
                 val oppdatertFeilmelding = call.receive<Feilmelding>()
+                feilmeldingRepository.oppdaterFeilmelding(oppdatertFeilmelding)
                 call.respond(status = HttpStatusCode.Created, message = "Feilmelding oppdatert")
             }
         }

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 

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)}

frontend/src/components/RedigeringsVerktoy.tsx

@@ -1,8 +1,9 @@
 import { FloppydiskIcon, XMarkIcon } from "@navikt/aksel-icons"
-import { TextField, Textarea, RadioGroup, Radio, Button } 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"
+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,14 +64,13 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => {
                     <Radio value={1}>Feilen jobbes med</Radio>
                     <Radio value={2}>Feilen er fikset</Radio>
                 </RadioGroup>
-                <RadioGroup
+                <Skillelinje/>
-                    legend="Hvor vil du sitte?"
+                <Heading size="xsmall">
-                    onChange={(haster: boolean) => {setHaster(haster)}}
+                    Haster det å fikse feilen?
-                    value={haster}
+                </Heading>
-                >
+                <Switch checked={haster} onClick={() => setHaster(!haster)}>
-                    <Radio value={true}>Ja</Radio>
+                    Feilen haster
-                    <Radio value={false}>Nei</Radio>
+                </Switch>
-                </RadioGroup>
             </div>
             <div className="flex gap-4 items-start">
                 <Button

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

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,12 +86,14 @@ export default function Feil() {
                             description="Detaljert beskrivelse av problemet"
                             onChange={e => setBeskrivelse(e.target.value)}
                         />
+                        <Skillelinje/>
                         <BildeOpplastning/>
                         <Switch 
                             onClick={() => setHaster(!haster)}
                         >
                             Saken Haster
                         </Switch>
+                        <Skillelinje/>
                     </div>