From 8ebfd471d113257bb1f2a8acc333e4fa5dd2656b Mon Sep 17 00:00:00 2001 From: Maria Katrin Bonde Date: Mon, 9 Dec 2024 12:35:05 +0100 Subject: [PATCH 1/5] default text on dateinput --- .../src/components/Agreement/components/EditDateInput.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Agreement/components/EditDateInput.tsx b/frontend/src/components/Agreement/components/EditDateInput.tsx index c852d06f..65866c70 100644 --- a/frontend/src/components/Agreement/components/EditDateInput.tsx +++ b/frontend/src/components/Agreement/components/EditDateInput.tsx @@ -69,9 +69,9 @@ export function EditDateInput({

onInputClick(e)} - className="mt-1 bg-primary/5 shadow-sm border border-primary/5 pr-10 p-2 rounded-md hover:bg-primary_darker/10" + className="mt-1 bg-primary/5 shadow-sm border border-primary/5 pr-10 p-2 rounded-md hover:bg-primary_darker/10 " > - {value?.toLocaleDateString("nb-NO")} + {value?.toLocaleDateString("nb-NO") ?? "Ikke satt"}

)} From 14ffa27902a33e65162ecc49f0135b86d33649a3 Mon Sep 17 00:00:00 2001 From: Maria Katrin Bonde Date: Mon, 9 Dec 2024 12:38:41 +0100 Subject: [PATCH 2/5] default text value on input date --- .../src/components/Agreement/components/EditDateInput.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Agreement/components/EditDateInput.tsx b/frontend/src/components/Agreement/components/EditDateInput.tsx index 65866c70..47044009 100644 --- a/frontend/src/components/Agreement/components/EditDateInput.tsx +++ b/frontend/src/components/Agreement/components/EditDateInput.tsx @@ -69,7 +69,9 @@ export function EditDateInput({

onInputClick(e)} - className="mt-1 bg-primary/5 shadow-sm border border-primary/5 pr-10 p-2 rounded-md hover:bg-primary_darker/10 " + className={`mt-1 bg-primary/5 shadow-sm border border-primary/5 pr-10 p-2 rounded-md hover:bg-primary_darker/10 ${ + value ? "" : "text-text_light_black/50 italic" + }`} > {value?.toLocaleDateString("nb-NO") ?? "Ikke satt"}

From 9c65a496c097aa4c6b0a938a1eaaa743862ad0b8 Mon Sep 17 00:00:00 2001 From: Maria Katrin Bonde Date: Mon, 9 Dec 2024 12:50:11 +0100 Subject: [PATCH 3/5] inEditIndex switched other agreements open when one was deleted --- frontend/src/components/Agreement/AgreementEdit.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Agreement/AgreementEdit.tsx b/frontend/src/components/Agreement/AgreementEdit.tsx index 1d8c27f1..42fa84ba 100644 --- a/frontend/src/components/Agreement/AgreementEdit.tsx +++ b/frontend/src/components/Agreement/AgreementEdit.tsx @@ -157,7 +157,7 @@ export function AgreementEdit({
save(form, i)} key={agreement.agreementId} - className="border-primary/5 bg-primary/5 shadow-md rounded-md p-4 mr-32 mt-2" + className="border-primary/5 bg-primary/5 shadow-md rounded-md p-4 mr-32 mt-2 overflow-hidden" >
Date: Mon, 9 Dec 2024 12:50:52 +0100 Subject: [PATCH 4/5] overflow hidden not having effect --- frontend/src/components/Agreement/AgreementEdit.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Agreement/AgreementEdit.tsx b/frontend/src/components/Agreement/AgreementEdit.tsx index 42fa84ba..a97ecdda 100644 --- a/frontend/src/components/Agreement/AgreementEdit.tsx +++ b/frontend/src/components/Agreement/AgreementEdit.tsx @@ -157,7 +157,7 @@ export function AgreementEdit({ save(form, i)} key={agreement.agreementId} - className="border-primary/5 bg-primary/5 shadow-md rounded-md p-4 mr-32 mt-2 overflow-hidden" + className="border-primary/5 bg-primary/5 shadow-md rounded-md p-4 mr-32 mt-2" >
Date: Mon, 9 Dec 2024 13:04:33 +0100 Subject: [PATCH 5/5] changed spacing --- frontend/src/components/Agreement/AgreementEdit.tsx | 2 +- frontend/src/components/Agreement/components/EditInput.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Agreement/AgreementEdit.tsx b/frontend/src/components/Agreement/AgreementEdit.tsx index a97ecdda..f3a460f9 100644 --- a/frontend/src/components/Agreement/AgreementEdit.tsx +++ b/frontend/src/components/Agreement/AgreementEdit.tsx @@ -172,7 +172,7 @@ export function AgreementEdit({ />
-
+
{agreement.agreementId !== -1 && ( any; }) { return ( -
+
{inEdit ? ( <>