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() + feilmeldingRepository.oppdaterFeilmelding(oppdatertFeilmelding) call.respond(status = HttpStatusCode.Created, message = "Feilmelding oppdatert") } } 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(
+ + Skjermbilder +
props.setOpen(false)} diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx index cb22ea8..087a887 100644 --- a/frontend/src/components/RedigeringsVerktoy.tsx +++ b/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)} /> + {setArbeidsstatus(arbeidsstatus)}} @@ -62,14 +64,13 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => { Feilen jobbes med Feilen er fikset - {setHaster(haster)}} - value={haster} - > - Ja - Nei - + + + Haster det å fikse feilen? + + setHaster(!haster)}> + Feilen haster +
) } -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 ( +
+ ) +} +export default Skillelinje \ No newline at end of file diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx index b556155..28f09f4 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,12 +86,14 @@ export default function Feil() { description="Detaljert beskrivelse av problemet" onChange={e => setBeskrivelse(e.target.value)} /> + setHaster(!haster)} > Saken Haster +