From fa56d6d36359ce320d042a65c618942b0eb8853b Mon Sep 17 00:00:00 2001 From: Loretta Date: Sat, 20 Sep 2025 13:07:00 +0200 Subject: [PATCH] MeasuringIn UI improvements, etc... --- .../Pages/MeasuringIn.razor | 62 ++++++++++-------- .../Pages/MeasuringIn.razor.css | 36 ++++++++++ FruitBankHybrid.Shared/wwwroot/app.css | 1 + .../wwwroot/images/ok_green_dt.png | Bin 0 -> 308 bytes .../wwwroot/images/ok_green_dt.svg | 3 + .../wwwroot/images/ok_green_lt.jpg | Bin 0 -> 359 bytes .../wwwroot/images/ok_green_lt.png | Bin 0 -> 299 bytes .../wwwroot/images/ok_green_lt.svg | 3 + 8 files changed, 78 insertions(+), 27 deletions(-) create mode 100644 FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css create mode 100644 FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.png create mode 100644 FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg create mode 100644 FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.jpg create mode 100644 FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.png create mode 100644 FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.svg diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor index 9421a2c..0edbf3c 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor @@ -10,7 +10,7 @@
- + - + - + + @bind-Value="@SelectedShippingDocument" + Text="Select partner" + ValueFieldName="@nameof(ShippingDocument.Id)" + TextFieldName="@(nameof(ShippingDocument.Partner) + '.' + nameof(Partner.Name))" + CssClass="cw-480" + Context="ctxShippingDocument" + SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs args) => OnSelectedShippingDocumentChanged(args))" + InputId="cbShippingDocument"> @ctxShippingDocument.DisplayText - + + @bind-Value="@SelectedShippingItem" + Text="Select item" + ValueFieldName="@nameof(ShippingItem.Id)" + TextFieldName="@(nameof(ShippingItem.Name))" + CssClass="cw-480" + Context="ctxShippingitem" + SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs args) => OnSelectedShippingItemChanged(args))" + InputId="cbShippingItem"> + @*
+ + +
+ @ctxShippingitem.DisplayText +
+
+ *@ @ctxShippingitem.DisplayText) @@ -94,17 +102,17 @@ OnInvalidSubmit="@HandleInvalidSubmit"> - - - + + + - + - + - + @@ -112,7 +120,7 @@ - + diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css new file mode 100644 index 0000000..f4245c2 --- /dev/null +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css @@ -0,0 +1,36 @@ +.combobox-item-template { + display: flex; + align-items: center; +} + +.combobox-item-template > img { + border-radius: 50%; + width: 2rem; + height: 2rem; +} + +img + .combobox-item-template-text { + margin-left: 1rem; +} + +.combobox-item-template-text { + display: flex; + flex-flow: column; +} + +.combobox-item-template-employee-phone { + opacity: 0.65; +} + +.icon { + margin-left: 0.5rem; + margin-right: 0.5rem; +} + +.ok_green-icon { + --icon-mask-image: var(--icon-ok_green-mask-image); +} + +.ismeasured-green { + color: green !important; +} \ No newline at end of file diff --git a/FruitBankHybrid.Shared/wwwroot/app.css b/FruitBankHybrid.Shared/wwwroot/app.css index 91af6aa..dc61a7a 100644 --- a/FruitBankHybrid.Shared/wwwroot/app.css +++ b/FruitBankHybrid.Shared/wwwroot/app.css @@ -56,6 +56,7 @@ h1:focus { --icon-home-mask-image: url("images/home-fluent.svg"); --icon-weather-mask-image: url("images/weather-fluent.svg"); --icon-counter-mask-image: url("images/counter-fluent.svg"); + --icon-ok_green-mask-image: url("images/ok_green_lt.svg"); } .icon { diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.png b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.png new file mode 100644 index 0000000000000000000000000000000000000000..e2d884a9c76bf597e70b0a560bd803ec3faec62c GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#lb$Y)Ar*{oryS%wWFX@3pMR~m{=DjqI~w`| z%wMprd!%u9N#2FU9ZA6&qTvP$4R>lR>73!Vu-!&O z!eh&0f1T=OY}_!t`{m;2?6!}z%-K0^GbvqFPJY7m*nM68agpCUSQLY1E(z2rI=7)< zYBclV6WMn>{}~$e>^QyO$@Pk9!td2gjsHKh^wpNLv-%~w0zJjx>FVdQ&MBb@0LbEW A7ytkO literal 0 HcmV?d00001 diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg new file mode 100644 index 0000000..420584b --- /dev/null +++ b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg @@ -0,0 +1,3 @@ + + + diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.jpg b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3830cf5427df2efc95889721b7bfa523d9c70ba5 GIT binary patch literal 359 zcmex=^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w zhLo6;2Fc+60R}-11_=fUW=16jCP7AKLB{__fPA1+fsRE2Ow24CKp7L?WH6o}wL56@t1rd6n=KjCMz{AW4w3bf=l}o! literal 0 HcmV?d00001 diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.png b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.png new file mode 100644 index 0000000000000000000000000000000000000000..42f284a456dc2ebef9075bc6545d0cd3a5c04d47 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#1D-C9Ar*{oC++4vWFX-1-X|ca!9{fLQGFi< zZmQ@#LnzaSxe0T>dq+HixBrO5OMUya-Rr z)0aA?4FO7zQm;5@mp^L0ZFeOk^q*|YydOnA8`ix4dU^lyU2=yxiVPj3tx`X~S+?~a z-_&l#4FzS{iNe)il@}IS8Z;`~e^ah~((~hFNC2b0flOlLWfRf + +