Skip to content

Commit 64bbe22

Browse files
Ap73MKaAp73MKa
committed
UPDATE: use pallet variable for shipped and deleted functional
1 parent 1c0eec3 commit 64bbe22

9 files changed

+113
-110
lines changed

‎Src/Apps/Desktop/ScalesDesktop/Source/Features/PalletOverview.razor

+23-10
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,33 @@
55
<div class="w-full flex justify-between items-center">
66
<div class="flex gap-3 items-center">
77
<h2 class="font-medium text-xl">@WsDataLocalizer["ColPallet"] №@Pallet.Number от @Pallet.ProdDt.ToString("dd.MM.yyyy")</h2>
8-
<Badge Class="pb-1 !bg-green-500">@Localizer["PalletFlagDelivered"]</Badge>
8+
@if (Pallet.IsShipped)
9+
{
10+
<Badge Class="pb-1">@Localizer["PalletFlagShipped"]</Badge>
11+
}
12+
else
13+
{
14+
<Badge Variant="BadgeVariant.Secondary" Class="pb-1">@Localizer["PalletFlagNotShipped"]</Badge>
15+
}
16+
@if (Pallet.DeletedAt != null)
17+
{
18+
<Badge Variant="BadgeVariant.Destructive" Class="pb-1" id="badge-deleted-pallet">Удалено</Badge>
19+
<Tooltip Anchor="badge-deleted-pallet">
20+
@Pallet.DeletedAt
21+
</Tooltip>
22+
}
923
</div>
10-
@if (!IsDeleted)
24+
@if (Pallet.DeletedAt == null)
1125
{
12-
<Button Variant="ButtonVariant.Destructive" OnClick="@(() => IsDeleted = !IsDeleted)">
26+
<Button Variant="ButtonVariant.Destructive">
1327
<TrashIcon class="size-4 mr-2" />
1428
@Localizer["BtnDelete"]
1529
</Button>
1630
}
1731
else
1832
{
19-
<Button OnClick="@(() => IsDeleted = !IsDeleted)">
33+
<Button>
34+
<ArrowUturnRightIcon class="size-4 mr-2" />
2035
@Localizer["BtnRestore"]
2136
</Button>
2237
}
@@ -110,17 +125,17 @@
110125
/>
111126
</div>
112127
<div class="space-y-2">
113-
<FieldLabel for="tray">@WsDataLocalizer["ColTrayWeight"] (@WsDataLocalizer["MeasureKg"])</FieldLabel>
128+
<FieldLabel for="tray-weight">@WsDataLocalizer["ColTrayWeight"] (@WsDataLocalizer["MeasureKg"])</FieldLabel>
114129
<InputTextField
115-
id="tray"
130+
id="tray-weight"
116131
Value="@Pallet.WeightTray.ToString(CultureInfo.InvariantCulture)"
117132
ReadOnly
118133
/>
119134
</div>
120135
<div class="space-y-2">
121-
<FieldLabel for="tray">@WsDataLocalizer["ColWeightTotal"] (@WsDataLocalizer["MeasureKg"])</FieldLabel>
136+
<FieldLabel for="weight-total">@WsDataLocalizer["ColWeightTotal"] (@WsDataLocalizer["MeasureKg"])</FieldLabel>
122137
<InputTextField
123-
id="tray"
138+
id="weight-total"
124139
Value="@((Pallet.WeightTray + Pallet.WeightBrutto).ToString(CultureInfo.InvariantCulture))"
125140
ReadOnly
126141
/>
@@ -137,7 +152,5 @@
137152

138153
# endregion
139154

140-
private bool IsDeleted { get; set; }
141-
142155
[Parameter, EditorRequired] public PalletInfo Pallet { get; set; } = default!;
143156
}

‎Src/Apps/Desktop/ScalesDesktop/Source/Shared/Localization/ApplicationResources.Designer.cs

+18-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Src/Apps/Desktop/ScalesDesktop/Source/Shared/Localization/ApplicationResources.en-US.resx

+13-16
Original file line numberDiff line numberDiff line change
@@ -230,18 +230,6 @@
230230
<data name="ScalesStatusInitializing" xml:space="preserve">
231231
<value>The scales are initializing</value>
232232
</data>
233-
<data name="PalletSortDate" xml:space="preserve">
234-
<value>By date</value>
235-
</data>
236-
<data name="PalletSortNumber" xml:space="preserve">
237-
<value>By number</value>
238-
</data>
239-
<data name="PalletSortPlu" xml:space="preserve">
240-
<value>By Plu</value>
241-
</data>
242-
<data name="PalletSortLabelsCount" xml:space="preserve">
243-
<value>By labels count</value>
244-
</data>
245233
<data name="PalletOverviewDividerCommon" xml:space="preserve">
246234
<value>Common</value>
247235
</data>
@@ -332,10 +320,19 @@
332320
<data name="BtnRestore" xml:space="preserve">
333321
<value>Restore</value>
334322
</data>
335-
<data name="PalletFlagNotDelivered" xml:space="preserve">
336-
<value>Not delivered</value>
323+
<data name="PalletFlagNotShipped" xml:space="preserve">
324+
<value>Not shipped</value>
325+
</data>
326+
<data name="PalletFlagShipped" xml:space="preserve">
327+
<value>Shipped</value>
328+
</data>
329+
<data name="PalletFilterNoFilter" xml:space="preserve">
330+
<value>No filter</value>
331+
</data>
332+
<data name="PalletFilterShipped" xml:space="preserve">
333+
<value>Shipped</value>
337334
</data>
338-
<data name="PalletFlagDelivered" xml:space="preserve">
339-
<value>Delivered</value>
335+
<data name="PalletFilterDeleted" xml:space="preserve">
336+
<value>Deleted</value>
340337
</data>
341338
</root>

‎Src/Apps/Desktop/ScalesDesktop/Source/Shared/Localization/ApplicationResources.resx

+11-14
Original file line numberDiff line numberDiff line change
@@ -230,18 +230,6 @@
230230
<data name="ScalesStatusInitializing" xml:space="preserve">
231231
<value/>
232232
</data>
233-
<data name="PalletSortDate" xml:space="preserve">
234-
<value/>
235-
</data>
236-
<data name="PalletSortNumber" xml:space="preserve">
237-
<value/>
238-
</data>
239-
<data name="PalletSortPlu" xml:space="preserve">
240-
<value/>
241-
</data>
242-
<data name="PalletSortLabelsCount" xml:space="preserve">
243-
<value/>
244-
</data>
245233
<data name="PalletOverviewDividerCommon" xml:space="preserve">
246234
<value/>
247235
</data>
@@ -332,10 +320,19 @@
332320
<data name="BtnRestore" xml:space="preserve">
333321
<value />
334322
</data>
335-
<data name="PalletFlagDelivered" xml:space="preserve">
323+
<data name="PalletFlagShipped" xml:space="preserve">
324+
<value />
325+
</data>
326+
<data name="PalletFlagNotShipped" xml:space="preserve">
327+
<value />
328+
</data>
329+
<data name="PalletFilterNoFilter" xml:space="preserve">
330+
<value />
331+
</data>
332+
<data name="PalletFilterShipped" xml:space="preserve">
336333
<value />
337334
</data>
338-
<data name="PalletFlagNotDelivered" xml:space="preserve">
335+
<data name="PalletFilterDeleted" xml:space="preserve">
339336
<value />
340337
</data>
341338
</root>

‎Src/Apps/Desktop/ScalesDesktop/Source/Shared/Localization/ApplicationResources.ru-RU.resx

+16-16
Original file line numberDiff line numberDiff line change
@@ -227,18 +227,6 @@
227227
<data name="ScalesStatusInitializing" xml:space="preserve">
228228
<value>Подготовка весов</value>
229229
</data>
230-
<data name="PalletSortDate" xml:space="preserve">
231-
<value>По дате</value>
232-
</data>
233-
<data name="PalletSortNumber" xml:space="preserve">
234-
<value>По номеру</value>
235-
</data>
236-
<data name="PalletSortPlu" xml:space="preserve">
237-
<value>По ПЛУ</value>
238-
</data>
239-
<data name="PalletSortLabelsCount" xml:space="preserve">
240-
<value>По кол-во этикеток</value>
241-
</data>
242230
<data name="PalletOverviewDividerCommon" xml:space="preserve">
243231
<value>Общее</value>
244232
</data>
@@ -329,10 +317,22 @@
329317
<data name="BtnRestore" xml:space="preserve">
330318
<value>Восстановить</value>
331319
</data>
332-
<data name="PalletFlagNotDelivered" xml:space="preserve">
333-
<value>Не отгружен</value>
320+
<data name="TrayWeightInputPlaceholder" xml:space="preserve">
321+
<value>Введите вес паллеты</value>
322+
</data>
323+
<data name="PalletFlagNotShipped" xml:space="preserve">
324+
<value>Не отгружено</value>
325+
</data>
326+
<data name="PalletFlagShipped" xml:space="preserve">
327+
<value>Отгружено</value>
328+
</data>
329+
<data name="PalletFilterNoFilter" xml:space="preserve">
330+
<value>Без фильтра</value>
331+
</data>
332+
<data name="PalletFilterShipped" xml:space="preserve">
333+
<value>Отгруженные</value>
334334
</data>
335-
<data name="PalletFlagDelivered" xml:space="preserve">
336-
<value>Отгружен</value>
335+
<data name="PalletFilterDeleted" xml:space="preserve">
336+
<value>Удаленные</value>
337337
</data>
338338
</root>

‎Src/Apps/Desktop/ScalesDesktop/Source/Widgets/PalletSelect/PalletSelect.razor

+6-8
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</div>
4141
</div>
4242
<PalletSelectSearching
43-
@bind-Sorting="PalletSort"
43+
@bind-Filter="PalletFilter"
4444
@bind-SearchingString="InputSearchCounter"
4545
/>
4646
@if (string.IsNullOrEmpty(InputSearchCounter))
@@ -112,7 +112,7 @@
112112

113113
# endregion
114114

115-
private PalletSortEnum PalletSort { get; set; } = PalletSortEnum.Date;
115+
private PalletFilterEnum PalletFilter { get; set; } = PalletFilterEnum.NoFilter;
116116
private DateTime? StartDate { get; set; } = GetStartOfWorkingShift();
117117
private DateTime? EndDate { get; set; } = GetEndOfWorkingShift();
118118
private string InputSearchCounter { get; set; } = string.Empty;
@@ -125,12 +125,10 @@
125125
if (!string.IsNullOrEmpty(InputSearchCounter))
126126
filteredPallets = pallets.Where(x => x.Number.ToString().Contains(InputSearchCounter));
127127

128-
filteredPallets = PalletSort switch
128+
filteredPallets = PalletFilter switch
129129
{
130-
PalletSortEnum.Date => filteredPallets.OrderByDescending(x => x.CreateDt),
131-
PalletSortEnum.Number => filteredPallets.OrderByDescending(x => x.Number),
132-
PalletSortEnum.Plu => filteredPallets.OrderByDescending(x => x.Plus.Min(p => p.Number)),
133-
PalletSortEnum.LabelsCount => filteredPallets.OrderByDescending(x => x.BoxCount),
130+
PalletFilterEnum.Shipped => filteredPallets.Where(x => x.IsShipped),
131+
PalletFilterEnum.Deleted => filteredPallets.Where(x => x.DeletedAt != null),
134132
_ => filteredPallets
135133
};
136134

@@ -153,7 +151,7 @@
153151
{
154152
StartDate = GetStartOfWorkingShift();
155153
EndDate = GetEndOfWorkingShift();
156-
PalletSort = PalletSortEnum.Date;
154+
PalletFilter = PalletFilterEnum.NoFilter;
157155
InputSearchCounter = string.Empty;
158156
}
159157

‎Src/Apps/Desktop/ScalesDesktop/Source/Widgets/PalletSelect/PalletSelectItem.razor

+13-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,19 @@
2929
</Badge>
3030
}
3131
</div>
32-
<Badge Variant="BadgeVariant.Secondary" Class="@Css.Class(IsSelected ? "!border-primary/[.1]" : "")">
33-
<CalculatorIcon class="size-3 mr-1"/>
34-
<span class="text-xs pt-px">@Pallet.BoxCount</span>
35-
</Badge>
32+
<div class="flex items-center gap-1">
33+
@if (Pallet.DeletedAt != null)
34+
{
35+
<Badge Variant="BadgeVariant.Destructive">
36+
<TrashIcon class="size-4" />
37+
</Badge>
38+
}
39+
<Badge Variant="BadgeVariant.Secondary" Class="@Css.Class(IsSelected ? "!border-primary/[.1]" : "")">
40+
<CalculatorIcon class="size-3 mr-1"/>
41+
<span class="text-xs pt-px">@Pallet.BoxCount</span>
42+
</Badge>
43+
</div>
44+
3645
</div>
3746
</div>
3847
</button>

0 commit comments

Comments
 (0)