From a481da521f1f58f5fd755efb3fda41b3bda48a93 Mon Sep 17 00:00:00 2001 From: tschumpr Date: Fri, 3 May 2024 16:04:40 +0200 Subject: [PATCH 1/3] Show delivery comment as description --- src/Geopilot.Api/StacServices/StacConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Geopilot.Api/StacServices/StacConverter.cs b/src/Geopilot.Api/StacServices/StacConverter.cs index 131c3f0b..8d3121f5 100644 --- a/src/Geopilot.Api/StacServices/StacConverter.cs +++ b/src/Geopilot.Api/StacServices/StacConverter.cs @@ -86,7 +86,7 @@ public StacItem ToStacItem(Delivery delivery) { Collection = GetCollectionId(delivery.DeliveryMandate), Title = DeliveryNamePrefix + delivery.Date.ToString("s"), - Description = string.Empty, + Description = delivery.Comment, DateTime = new TimeBlock(delivery.Date), }; From 2466db0997d5475bba1a5afcb6001b119558f129 Mon Sep 17 00:00:00 2001 From: tschumpr Date: Fri, 3 May 2024 16:34:51 +0200 Subject: [PATCH 2/3] Show comment on admin page --- src/Geopilot.Frontend/src/pages/admin/Admin.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Geopilot.Frontend/src/pages/admin/Admin.jsx b/src/Geopilot.Frontend/src/pages/admin/Admin.jsx index e0f93b71..c7e72668 100644 --- a/src/Geopilot.Frontend/src/pages/admin/Admin.jsx +++ b/src/Geopilot.Frontend/src/pages/admin/Admin.jsx @@ -21,11 +21,11 @@ const columns = [ `${date.getFullYear()}` ); }, - flex: 1, - minWidth: 150, + width: 180, }, - { field: "user", headerName: "Abgegeben von", flex: 1, minWidth: 200 }, - { field: "mandate", headerName: "Operat", flex: 1, minWidth: 200 }, + { field: "user", headerName: "Abgegeben von", flex: 0.5, minWidth: 200 }, + { field: "mandate", headerName: "Operat", flex: 0.5, minWidth: 200 }, + { field: "comment", headerName: "Kommentar", flex: 1, minWidth: 600 }, ]; export const Admin = () => { @@ -68,6 +68,7 @@ export const Admin = () => { date: d.date, user: d.declaringUser.fullName, mandate: d.deliveryMandate.name, + comment: d.comment, })), ); } From 78e20570e3d56e3e1c6062a115a6ac6133b116a1 Mon Sep 17 00:00:00 2001 From: tschumpr Date: Fri, 3 May 2024 16:37:52 +0200 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050a1f06..dd0c32f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Added - Add licensing information to the about page +- Show delivery comment in STAC browser and on admin page ### Changed