root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

v.0.99.1 cosmetic - order counter

Browse source
This commit is contained in:
Frede Hundewadt 2023-01-17 06:17:35 +01:00
parent a68094e068
commit fce275f19d
9 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Wonky.Client/Components/OfficeReportActivityListComponent.razor
View file

@ -1,3 +1,4 @@
@using Wonky.Client.Helpers
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
@ -15,6 +16,7 @@
//
*@
@using Wonky.Client.Helpers
@if (ActivityList.Any())
{
<table class="table table-sm table-bordered d-print-table table-striped">
@ -59,7 +61,7 @@
<td class="align-middle state">
@if (activity.Lines.Any() && activity.StatusTypeEnum == "Order")
{
<ProcessStateComponent StateClass="@GetProcessStatus(activity.ProcessStatusEnum)"/>
<ProcessStateComponent StateClass="@Utils.GetProcessStatus(activity.ProcessStatusEnum)"/>
}
</td>
</tr>

15
Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs
View file

@ -22,20 +22,7 @@ public partial class OfficeReportActivityListComponent
{
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
[Inject] private NavigationManager Navigator { get; set; }
private static string GetProcessStatus(string processStatus)
{
return processStatus.ToLower() switch
{
"express" => "the-fast",
"none" => "the-good",
"picked" => "the-bad",
"packed" => "the-ugly",
"shipped" => "the-dead",
_ => "the-draw"
};
}
private void ShowOrder(string companyId, string orderId)
{
Navigator.NavigateTo($"/office/customers/{companyId}/orders/{orderId}");

1
Wonky.Client/Components/ProcessStateComponent.razor
View file

@ -30,6 +30,7 @@
"the-bad" => "file-earmark-check",
"the-ugly" => "box2-fill",
"the-dead" => "truck",
"accepted" => "hand-thumbs-up",
_ => "question-square"
};
}

3
Wonky.Client/Helpers/Utils.cs
View file

@ -146,7 +146,8 @@ public static class Utils
"picked" => "the-bad",
"packed" => "the-ugly",
"shipped" => "the-dead",
_ => "question-square"
"accepted" => "accepted",
_ => "question"
};
}
}

4
Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor
View file

@ -32,7 +32,7 @@
<button class="btn btn-success" @onclick="() => Print(PTarget.OrderPage)"><i class="bi-printer"></i> Ordrer</button>
</div>
<div class="col-sm-2 d-grid">
<button class="btn btn-primary" type="button" @onclick="() => Print(PTarget.All)"><i class="bi-printer"></i> Rapport</button>
<button class="btn btn-primary" type="button" @onclick="ShowConfirmationModal"><i class="bi-printer"></i> Rapport</button>
</div>
</div>
@ -72,4 +72,4 @@
}
}
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" />
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" @ref="ConfirmAccepted" />

12
Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs
View file

@ -100,17 +100,19 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable
private async Task OnOkCallBack()
{
var current = 0;
var all = Report.ReportItems.Count;
foreach (var item in Report.ReportItems)
var orders = Report.ReportItems
.Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } );
var count = orders.Count();
foreach (var item in orders)
{
Toaster.ShowInfo($"Behandler {current++} af {all} ordrer. Vent venligst");
Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst");
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
{
OrderId = item.ActivityId,
ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted)
});
}
Toaster.ShowInfo("Ordrer er klar til udskrift.");
}
Toaster.ClearAll();
await Print();
}

2
Wonky.Client/Pages/ReportPrintOrderPage.razor
View file

@ -51,4 +51,4 @@ else
</div>
}
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" />
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" @ref="ConfirmAccepted" />

10
Wonky.Client/Pages/ReportPrintOrderPage.razor.cs
View file

@ -71,17 +71,19 @@ public partial class ReportPrintOrderPage
private async Task OnOkCallBack()
{
var current = 0;
var all = Items.Count;
foreach (var item in Items)
var orders = Report.ReportItems
.Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } );
var count = orders.Count();
foreach (var item in orders)
{
Toaster.ShowInfo($"Behandler {current++} af {all} ordrer. Vent venligst");
Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst");
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
{
OrderId = item.ActivityId,
ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted)
});
}
Toaster.ShowInfo("Ordrer er klar til udskrift.");
Toaster.ClearAll();
await Print();
}

4
Wonky.Client/wwwroot/appsettings.json
View file

@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Client",
"version": "0.98.xx",
"version": "0.99.1",
"rc": true,
"sandBox": false,
"image": "grumpy-coder.png"
@ -36,7 +36,7 @@
},
"Logging": {
"LogLevel": {
"Default": "Debug",
"Default": "Information",
"System": "Information",
"Microsoft": "Information"
},