From aa756f266db63e49962d1e4f67992e6670abf178 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Tue, 1 Aug 2023 10:16:33 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8D=B1=20Oppdaterer=20interface=20fro?= =?UTF-8?q?ntend=20for=20=C3=A5=20matche=20nye=20felt=20haster=20og=20arbe?= =?UTF-8?q?idsstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/FeilCard.tsx | 18 +++++++++++++++--- frontend/src/interface.ts | 7 ++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/FeilCard.tsx b/frontend/src/components/FeilCard.tsx index d71eded..d0e2383 100644 --- a/frontend/src/components/FeilCard.tsx +++ b/frontend/src/components/FeilCard.tsx @@ -31,10 +31,22 @@ export const FeilKort = (props: IFeilKort) => { active:bg-surface-active" onClick={() => setVisModal(true)} > - + - +
{/* TODO: HER KOMMER CONTENT */} @@ -60,7 +72,7 @@ export const FeilkortHeader = (props: IFeilmelding) => {

{props.dato.toDateString()}

{props.beskrivelse}

- + ) } diff --git a/frontend/src/interface.ts b/frontend/src/interface.ts index 4edcb50..4757bd0 100644 --- a/frontend/src/interface.ts +++ b/frontend/src/interface.ts @@ -6,14 +6,17 @@ export interface IFeilmelding { tittel: string, beskrivelse: string - // haster: boolean dato: Date + haster: boolean + arbeidsstatus: number } export class Feilmelding implements IFeilmelding { tittel: string = "default tittel" beskrivelse: string = "default beskrivelse" dato: Date = new Date() + haster: boolean = false + arbeidsstatus: number = 0 /** * Typescript 2.1 syntax som lar deg sende inn et JSON object og mappe det til class. @@ -24,6 +27,8 @@ export class Feilmelding implements IFeilmelding { tittel: string, beskrivelse: string, dato: Date + haster: boolean + arbeidsstatus: number }) { if (fields) Object.assign(this, fields); } From 0fbde2fa576ee511b6bec279cc3fd9b19404ea47 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Tue, 1 Aug 2023 10:28:09 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20Manglet=20nye=20props=20i=20?= =?UTF-8?q?cardcontainer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/CardsContainer.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/components/CardsContainer.tsx b/frontend/src/components/CardsContainer.tsx index e2a9dbd..1e93578 100644 --- a/frontend/src/components/CardsContainer.tsx +++ b/frontend/src/components/CardsContainer.tsx @@ -10,15 +10,19 @@ interface ICardsContainer { * @returns grid med feilmeldinger */ const CardsContainer = (props: ICardsContainer) => { + {props.feilmeldinger.map((feilMelding) => console.log(feilMelding))} return (
+ {props.feilmeldinger.map((feilMelding) => ( )) } From 791c7093991a4893d1d83970f9532f96bfe74e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amalie=20Mans=C3=A5ker?= Date: Tue, 1 Aug 2023 10:32:15 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20S=C3=B8rger=20for=20at=20fei?= =?UTF-8?q?lmelding=20som=20blir=20sendt=20fra=20frontend=20matcher=20feil?= =?UTF-8?q?meldingsobjekt=20i=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sindre Kjelsrud --- frontend/src/pages/feil.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx index ee889c1..ac0de6d 100644 --- a/frontend/src/pages/feil.tsx +++ b/frontend/src/pages/feil.tsx @@ -18,7 +18,9 @@ export default function Feil() { const payload = { tittel: tittel, beskrivelse: beskrivelse, - dato: new Date().toISOString().replace('Z', '') + dato: new Date().toISOString().replace('Z', ''), // Litt wack fix, burde endres + arbeidsstatus: 0, + haster: false } axios.post("/api/nyfeil", payload, { From 676986f1058033aabcd10e5f016aef267fbee817 Mon Sep 17 00:00:00 2001 From: "Markus A. R. Johansen" <90006516+J0hans1@users.noreply.github.com> Date: Tue, 1 Aug 2023 10:42:20 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=E2=9C=A8=20Statusflagg=20(#19)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ Tagbar støtter toggling av arbeidsstatusflagg, ved å ta inn et arbeidsstatus prop som er 0,1 eller 2 * 🗃️ Legger til PK, arbeidsstatus og haster i database Co-authored-by: Amalie Erdal Mansåker * ✏️ Fikser glemt semikolon + glemte felt i tester Co-authored-by: Amalie Erdal Mansåker * 🍱 Oppdaterer interface frontend for å matche nye felt haster og arbeidsstatus * 🐛 Manglet nye props i cardcontainer * ✨ Tagbar støtter toggling av arbeidsstatusflagg, ved å ta inn et arbeidsstatus prop som er 0,1 eller 2 --------- Co-authored-by: Sindre Kjelsrud Co-authored-by: Amalie Erdal Mansåker Co-authored-by: Sid <93219711+SindreKjelsrud@users.noreply.github.com> --- frontend/src/components/CardsContainer.tsx | 4 +-- frontend/src/components/FeilCard.tsx | 34 ++++++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/CardsContainer.tsx b/frontend/src/components/CardsContainer.tsx index 1e93578..d51318d 100644 --- a/frontend/src/components/CardsContainer.tsx +++ b/frontend/src/components/CardsContainer.tsx @@ -9,9 +9,7 @@ interface ICardsContainer { * Komponent som laster inn feilmeldinger i kort fra database. * @returns grid med feilmeldinger */ -const CardsContainer = (props: ICardsContainer) => { - {props.feilmeldinger.map((feilMelding) => console.log(feilMelding))} - +const CardsContainer = (props: ICardsContainer) => { return (
diff --git a/frontend/src/components/FeilCard.tsx b/frontend/src/components/FeilCard.tsx index d0e2383..7cbbcb5 100644 --- a/frontend/src/components/FeilCard.tsx +++ b/frontend/src/components/FeilCard.tsx @@ -71,8 +71,8 @@ export const FeilkortHeader = (props: IFeilmelding) => { {props.tittel}

{props.dato.toDateString()}

{props.beskrivelse}

-
- +
+ ) } @@ -80,17 +80,39 @@ export const FeilkortHeader = (props: IFeilmelding) => { interface TagBarInterface { haster: boolean + arbeidsstatus: number } /** * Komponentet er en bar (vanrett linje) som inneholder to statusflagg: "arbeidsstatus" og "Haster". * Komponentet er en del av FeilKortHeader - * @param haster + * @param haster er en boolean som beskriver om feilen haster eller ikke. + * @param arbeidsstatus */ const TagBar = (props: TagBarInterface) => { + + /** + * Funksjonen tar inn + * @param arbeidsstatus + * @returns + */ + const toggleArbeidsstatus = (arbeidsstatus: number) => { + switch (arbeidsstatus) { + case 0: + return Ikke påbegynt; + case 1: + return Feilen jobbes med; + case 2: + return Feilen er fikset; + default: + throw new Error("Ikke gyldig arbeidsstatus-kode. Koden må være 0, 1 eller 2"); + + } + } + return ( -
- Jobbes med - {props.haster === true ? Haster : <>} +
+ {toggleArbeidsstatus(props.arbeidsstatus)} + {props.haster ? Haster : <>}
) }