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

refactor for blazored toast component update

Browse source
This commit is contained in:
Frede Hundewadt 2023-04-07 08:16:44 +02:00
parent 7572127425
commit e16f19ece1
10 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
View file

@ -258,18 +258,17 @@ public partial class AdvisorActivityCreatePage : IDisposable
Working = true; Working = true;
// pop a message // pop a message
Toaster.ShowError( Toaster.ShowError(
"Produkt gennemgang mangler. Vent mens produkt oversigt indlæses. Gå ikke væk fra siden!", "Produkt gennemgang mangler. Vent mens produkt oversigt indlæses. Gå ikke væk fra siden!");
"Produkt check ...");
// product inventory has not been updated // product inventory has not been updated
// send rpc call to sync ERP to CRM // send rpc call to sync ERP to CRM
Toaster.ShowInfo("Vent mens data synkroniseres ...", "ERP til CRM ..."); Toaster.ShowInfo("Vent mens data synkroniseres ...");
var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync); var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync);
while (string.IsNullOrWhiteSpace(ts)) while (string.IsNullOrWhiteSpace(ts))
await Task.Delay(500); await Task.Delay(500);
// save pDate // save pDate
await Storage.SetItemAsync($"{CompanyId}-pDate", ts); await Storage.SetItemAsync($"{CompanyId}-pDate", ts);
// request products from backend // request products from backend
Toaster.ShowInfo("Vent mens produkt oversigt hentes", "CRM produkt liste"); Toaster.ShowInfo("Vent mens produkt oversigt hentes");
CheckList = await HistoryRepo.FetchInventory(CompanyId); CheckList = await HistoryRepo.FetchInventory(CompanyId);
if (CheckList.Any()) if (CheckList.Any())
@ -489,8 +488,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
// show result message // show result message
if (result.IsSuccess) if (result.IsSuccess)
{ {
Toaster.ShowSuccess($"{result.Message}", Toaster.ShowSuccess($"{result.Message}");
DraftProvider.Draft.Items.Count == 0 ? "Besøg er oprettet" : "Bestilling/Tilbud er oprettet");
await DeleteDraft(); await DeleteDraft();
Navigator.NavigateTo($"/advisor/customers"); Navigator.NavigateTo($"/advisor/customers");
return; return;
@ -499,7 +497,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
// lower working flag // lower working flag
Working = false; Working = false;
// show error message // show error message
Toaster.ShowError(result.Message, "ORDRE FEJL"); Toaster.ShowError(result.Message);
} }
@ -511,7 +509,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
if (Company.CountryCode.ToLower() == "se" && Utils.StringToDigits(Activity.VatNumber).Length < 10 && if (Company.CountryCode.ToLower() == "se" && Utils.StringToDigits(Activity.VatNumber).Length < 10 &&
Activity.ActivityStatusEnum == "order") Activity.ActivityStatusEnum == "order")
{ {
Toaster.ShowWarning("Org nummer er ufuldstændig. Skal opdateres før bestilling kan sendes. ", "ADVARSEL"); Toaster.ShowWarning("Org nummer er ufuldstændig. Skal opdateres før bestilling kan sendes. ");
} }
} }

2
Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs
View file

@ -58,7 +58,7 @@ public partial class AdvisorActivityTodayListPage : IDisposable
private async Task GetActivities(string workDate) private async Task GetActivities(string workDate)
{ {
Working = true; Working = true;
Toaster.ShowInfo("Vent nogle sekunder for data", "HENTER DATA"); Toaster.ShowInfo("Vent nogle sekunder for data");
SelectedDate = DateTime.Parse(workDate); SelectedDate = DateTime.Parse(workDate);
ReportStatusView = new ReportStatusView(); ReportStatusView = new ReportStatusView();
ReportExist = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); ReportExist = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}");

6
Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
View file

@ -305,7 +305,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
if (Working) if (Working)
return; return;
Working = true; Working = true;
Toaster.ShowInfo("Vent venligst ...", "OPDATERER CRM DATA"); Toaster.ShowInfo("Vent venligst ...");
Company.LastVisit = $"{LastVisit:yyyy-MM-dd}"; Company.LastVisit = $"{LastVisit:yyyy-MM-dd}";
Company.NextVisit = $"{NextVisit:yyyy-MM-dd}"; Company.NextVisit = $"{NextVisit:yyyy-MM-dd}";
Company.IsHidden = 0; Company.IsHidden = 0;
@ -330,7 +330,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
return; return;
ErpEditDisabled = true; ErpEditDisabled = true;
Working = true; Working = true;
Toaster.ShowInfo("Vent venligst ...", "OPDATERER STAM DATA"); Toaster.ShowInfo("Vent venligst ...");
var result = await CustomerRepo.UpdateErpData(CompanyId, Company); var result = await CustomerRepo.UpdateErpData(CompanyId, Company);
if (!string.IsNullOrWhiteSpace(result.CompanyId)) if (!string.IsNullOrWhiteSpace(result.CompanyId))
{ {
@ -359,7 +359,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
return; return;
VatEditDisabled = true; VatEditDisabled = true;
Working = true; Working = true;
Toaster.ShowInfo("Vent venligst ...", "OPDATERER MOMS NUMMER"); Toaster.ShowInfo("Vent venligst ...");
var result = await CustomerRepo.UpdateCompanyVat(CompanyId, Company.VatNumber); var result = await CustomerRepo.UpdateCompanyVat(CompanyId, Company.VatNumber);
if (!string.IsNullOrWhiteSpace(result.CompanyId)) if (!string.IsNullOrWhiteSpace(result.CompanyId))
{ {

2
Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
View file

@ -76,7 +76,7 @@ public partial class AdvisorQuoteListPage : IDisposable
quote.QuoteStatusEnum = Utils.EnumToString(args.Status); quote.QuoteStatusEnum = Utils.EnumToString(args.Status);
// send update request to backend // send update request to backend
var response = await AdvisorActivityRepo.UpdateQuoteStatus(quote); var response = await AdvisorActivityRepo.UpdateQuoteStatus(quote);
Toaster.ShowInfo($"{response.Message}", $"HTTP STATUS {response.Code}"); Toaster.ShowInfo($"{response.Message}");
// clear and reload quotes // clear and reload quotes
QuoteList = new List<ReportItemView>(); QuoteList = new List<ReportItemView>();
await Storage.RemoveItemAsync("quotes"); await Storage.RemoveItemAsync("quotes");

6
Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
View file

@ -168,7 +168,7 @@ public partial class AdvisorReportCreatePage : IDisposable
Report.Figures.DistancePrivateMonth = Report.Figures.DistancePrivate + CurrKmPrivate; Report.Figures.DistancePrivateMonth = Report.Figures.DistancePrivate + CurrKmPrivate;
if (Report.Figures.Distance is > 1000 or < 0) if (Report.Figures.Distance is > 1000 or < 0)
{ {
Toaster.ShowError($"Kørte km for rapporten er '{Report.Figures.Distance}'. Er du sikker på at det er rigtigt?", "KM tal"); Toaster.ShowError($"Kørte km for rapporten er '{Report.Figures.Distance}'. Er du sikker på at det er rigtigt?");
} }
StateHasChanged(); StateHasChanged();
} }
@ -219,13 +219,13 @@ public partial class AdvisorReportCreatePage : IDisposable
// check day type // check day type
if (string.IsNullOrWhiteSpace(Report.DayTypeEnum)) if (string.IsNullOrWhiteSpace(Report.DayTypeEnum))
{ {
Toaster.ShowError("Dagtype skal vælges", "Dag type mangler"); Toaster.ShowError("Dagtype skal vælges");
return; return;
} }
// distance day check - only if not leave // distance day check - only if not leave
if (Report.Figures.KmMorning > Report.Figures.KmEvening && !Report.DayTypeEnum.ToLower().Contains("leave")) if (Report.Figures.KmMorning > Report.Figures.KmEvening && !Report.DayTypeEnum.ToLower().Contains("leave"))
{ {
Toaster.ShowError("Km udregning er negativ - kontroller venligst km tal", "Kontroller km tal"); Toaster.ShowError("Km udregning er negativ - kontroller venligst km tal");
return; return;
} }
// local working variables // local working variables

4
Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs
View file

@ -316,7 +316,7 @@ public partial class OfficeOrderCreatePage : IDisposable
// show result message // show result message
if (result.IsSuccess) if (result.IsSuccess)
{ {
Toaster.ShowSuccess($"{result.Message}", "Telefon Ordre oprettet"); Toaster.ShowSuccess($"{result.Message}");
await DeleteDraft(); await DeleteDraft();
Navigator.NavigateTo($"/office/customers/{CompanyId}/orders/{result.Id}"); Navigator.NavigateTo($"/office/customers/{CompanyId}/orders/{result.Id}");
Working = false; Working = false;
@ -326,7 +326,7 @@ public partial class OfficeOrderCreatePage : IDisposable
// lower working flag // lower working flag
Working = false; Working = false;
// show error message // show error message
Toaster.ShowError(result.Message, "ORDRE FEJL"); Toaster.ShowError(result.Message);
} }

6
Wonky.Client/Pages/OfficeOrderViewPage.razor.cs
View file

@ -119,13 +119,11 @@ public partial class OfficeOrderViewPage : IDisposable
{ {
Toast Toast
.ShowSuccess( .ShowSuccess(
$"Status er opdateret og notifikation sendt til {salesRep.FirstName}.", "OK"); $"Status er opdateret og notifikation sendt til {salesRep.FirstName}.");
} }
else else
{ {
Toast Toast.ShowWarning($"Notifikation til {salesRep.FirstName} kunne ikke sendes. {sendMail.Message}");
.ShowWarning(
$"Notifikation til {salesRep.FirstName} kunne ikke sendes. {sendMail.Message}", "ADVARSEL");
} }
Logger.LogDebug("SendMail Result => \n {}", JsonSerializer.Serialize(sendMail)); Logger.LogDebug("SendMail Result => \n {}", JsonSerializer.Serialize(sendMail));
// disable further notifications // disable further notifications

2
Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs
View file

@ -62,7 +62,7 @@ public partial class SystemSupervisorViewEditPage : IDisposable
private async Task SaveChanges() private async Task SaveChanges()
{ {
await UserRepo.UpdateUserInfo(UserId, UserData); await UserRepo.UpdateUserInfo(UserId, UserData);
Toaster.ShowSuccess("Tilknyttede sælgere er opdateret", "Det var det."); Toaster.ShowSuccess("Tilknyttede sælgere er opdateret");
} }
public void Dispose() public void Dispose()

2
Wonky.Client/Wonky.Client.csproj
View file

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" /> <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.Toast" Version="3.2.2" /> <PackageReference Include="Blazored.Toast" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.15" /> <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.15" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.15" /> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.15" />

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

@ -1,7 +1,7 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Online", "name": "Wonky Online",
"version": "0.132.1", "version": "0.133.0",
"rc": true, "rc": true,
"sandBox": false, "sandBox": false,
"image": "grumpy-coder.png" "image": "grumpy-coder.png"
@ -19,7 +19,7 @@
} }
}, },
"apiConfig": { "apiConfig": {
"baseUrl": "https://zeta.innotec.dk", "baseUrl": "https://dev.innotec.dk",
"catalog": "api/v2/catalog/country", "catalog": "api/v2/catalog/country",
"crmCustomers": "api/v2/crm/companies", "crmCustomers": "api/v2/crm/companies",
"crmInventoryExt": "history/inventory", "crmInventoryExt": "history/inventory",