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

v.0.100.1 - Adjusted office print - set PStatus.Accepted in the background

Browse source
This commit is contained in:
Frede Hundewadt 2023-01-17 11:49:20 +01:00
parent 025ddd5d57
commit a3a434991e
9 changed files with 32 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Wonky.Client/Overlays/CustomerInventoryOverlay.razor Normal file
View file

@ -0,0 +1,5 @@
<h3>CustomerInventoryOverlay</h3>
@code {
}

6
Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs Normal file
View file

@ -0,0 +1,6 @@
namespace Wonky.Client.Overlays;
public partial class CustomerInventoryOverlay
{
}

5
Wonky.Client/Overlays/CustomerInvoiceOverlay.razor Normal file
View file

@ -0,0 +1,5 @@
<h3>CustomerInvoiceOverlay</h3>
@code {
}

6
Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs Normal file
View file

@ -0,0 +1,6 @@
namespace Wonky.Client.Overlays;
public partial class CustomerInvoiceOverlay
{
}

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> <button class="btn btn-success" @onclick="() => Print(PTarget.OrderPage)"><i class="bi-printer"></i> Ordrer</button>
</div> </div>
<div class="col-sm-2 d-grid"> <div class="col-sm-2 d-grid">
<button class="btn btn-primary" type="button" @onclick="ShowConfirmationModal"><i class="bi-printer"></i> Rapport</button> <button class="btn btn-primary" type="button" @onclick="Print"><i class="bi-printer"></i> Rapport</button>
</div> </div>
</div> </div>
@ -71,5 +71,3 @@
<ReportItemComponent ReportItem="@item" /> <ReportItemComponent ReportItem="@item" />
} }
} }
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" @ref="ConfirmAccepted" />

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

@ -49,8 +49,6 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable
private UserPref Prefs = new(); private UserPref Prefs = new();
private string ReturnUrl = ""; private string ReturnUrl = "";
private string PrintUrl = ""; private string PrintUrl = "";
private ConfirmationModal ConfirmAccepted { get; set; }
private string BodyMessage { get; set; } = "";
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
@ -91,13 +89,7 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable
} }
} }
private void ShowConfirmationModal() private async Task Print()
{
BodyMessage = "<p>Vil du sætte ordrestatus til accepteret i CRM?</p><p>Dette sikrer at ordrelisten kun udskrives en gang.</p>";
ConfirmAccepted.Show();
}
private async Task OnOkCallBack()
{ {
var current = 0; var current = 0;
var orders = Report.ReportItems var orders = Report.ReportItems
@ -113,16 +105,6 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable
}); });
} }
Toaster.ClearAll(); Toaster.ClearAll();
await Print();
}
private void OnCancelCallback()
{
Print();
}
private async Task Print()
{
await JsModule.InvokeVoidAsync("printInvoke"); await JsModule.InvokeVoidAsync("printInvoke");
} }

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

@ -26,7 +26,7 @@
</div> </div>
<div class="col-sm-6 d-grid"> <div class="col-sm-6 d-grid">
<AuthorizeView Roles="Admin,Office"> <AuthorizeView Roles="Admin,Office">
<button class="btn btn-primary" type="button" @onclick="ShowConfirmationModal"><i class="bi-printer"></i> Udskriv</button> <button class="btn btn-primary" type="button" @onclick="Print"><i class="bi-printer"></i> Udskriv</button>
</AuthorizeView> </AuthorizeView>
<AuthorizeView Roles="Advisor"> <AuthorizeView Roles="Advisor">
<button class="btn btn-primary" type="button" @onclick="Print"><i class="bi-printer"></i> Udskriv</button> <button class="btn btn-primary" type="button" @onclick="Print"><i class="bi-printer"></i> Udskriv</button>
@ -50,5 +50,3 @@ else
</div> </div>
</div> </div>
} }
<ConfirmationModal BodyMessage="@BodyMessage" OnOkClicked="OnOkCallBack" OnCancelClicked="OnCancelCallback" @ref="ConfirmAccepted" />

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

@ -41,8 +41,7 @@ public partial class ReportPrintOrderPage
private List<ReportItemView> Items { get; set; } = new(); private List<ReportItemView> Items { get; set; } = new();
private IJSObjectReference JsModule { get; set; } private IJSObjectReference JsModule { get; set; }
private string ReturnUrl { get; set; } = ""; private string ReturnUrl { get; set; } = "";
private ConfirmationModal ConfirmAccepted { get; set; }
private string BodyMessage { get; set; } = "";
protected override async Task OnAfterRenderAsync(bool firstRender) protected override async Task OnAfterRenderAsync(bool firstRender)
{ {
if (firstRender) if (firstRender)
@ -62,13 +61,7 @@ public partial class ReportPrintOrderPage
Items = Report.ReportItems; Items = Report.ReportItems;
} }
private void ShowConfirmationModal() private async Task OfficePrint()
{
BodyMessage = "<p>Vil du sætte ordrestatus til accepteret i CRM?</p><p>Dette sikrer at ordrelisten kun udskrives en gang.</p>";
ConfirmAccepted.Show();
}
private async Task OnOkCallBack()
{ {
var current = 0; var current = 0;
var orders = Report.ReportItems var orders = Report.ReportItems
@ -84,12 +77,8 @@ public partial class ReportPrintOrderPage
}); });
} }
Toaster.ClearAll(); Toaster.ClearAll();
await Print(); await JsModule.InvokeVoidAsync("printInvoke");
} Navigator.NavigateTo(ReturnUrl);
private void OnCancelCallback()
{
Print();
} }
private async Task Print() private async Task Print()

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

@ -1,7 +1,7 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Online", "name": "Wonky Online",
"version": "0.100.x", "version": "0.100.1",
"rc": true, "rc": true,
"sandBox": false, "sandBox": false,
"image": "grumpy-coder.png" "image": "grumpy-coder.png"