Parcourir la source

First activation flag not needed anymore

master
Flo Smilari il y a 4 ans
Parent
révision
9149bac09c
2 fichiers modifiés avec 20 ajouts et 28 suppressions
  1. 16
    17
      Pages/IndexPage.razor
  2. 4
    11
      Shared/Services/Fundvelo/MasterDataService.cs

+ 16
- 17
Pages/IndexPage.razor Voir le fichier

@@ -43,26 +43,25 @@
protected async override void OnInitialized() {
base.OnInitialized();
if (MasterDataService.FirstActivation) {
Console.WriteLine("First activation");
showProgressCircle = true;
StateHasChanged();
showProgressCircle = true;
StateHasChanged();
try {
try {
try {
BicycleRestService.Initialize(Configuration);
await MasterDataService.SynchronizeMasterdata();
} catch (Exception) {
Toaster.ShowWarning(I18n.GetString("Warning.Masterdata.Title"), I18n.GetString("Warning.Masterdata.Msg"));
}
int sent = await BicycleRestService.TrySendPendingReports();
if (sent > 0) {
Toaster.ShowSuccess(I18n.GetString("Info.SendPendigs.Title"), I18n.GetString("Info.SendPendigs.Msg", sent));
}
} finally {
showProgressCircle = false;
NavigateToNext();
BicycleRestService.Initialize(Configuration);
await MasterDataService.SynchronizeMasterdata();
} catch (Exception) {
Toaster.ShowWarning(I18n.GetString("Warning.Masterdata.Title"), I18n.GetString("Warning.Masterdata.Msg"));
}
int sent = await BicycleRestService.TrySendPendingReports();
if (sent > 0) {
Toaster.ShowSuccess(I18n.GetString("Info.SendPendigs.Title"), I18n.GetString("Info.SendPendigs.Msg", sent));
}
} finally {
showProgressCircle = false;
NavigateToNext();
}
btnDisabled = false;
PageHistoryManager.Reset();
StateHasChanged();

+ 4
- 11
Shared/Services/Fundvelo/MasterDataService.cs Voir le fichier

@@ -23,8 +23,6 @@ namespace cwebplusApp.Shared.Services {
private bool initializedBcTypes;
private bool initializedBrands;
private bool initializedSearchServices;
private bool firstActivation;
public bool FirstActivation { get => firstActivation; }
private ColorItem[] colors;
private BicycleType[] bicycleTypes;
private Brand[] brands;
@@ -53,7 +51,6 @@ namespace cwebplusApp.Shared.Services {
this.bicycleRestService = _bicycleRestService;
this.i18n = _i18n;
this.onlineStatusProvider = _onlineStatusProvider;
this.firstActivation = true;
this.brands = Defaults.GetBrandDefaults(i18n).ToArray();
this.colors = Defaults.GetColorDefaults(i18n).ToArray();
this.bicycleTypes = Defaults.GetBicycleTypeDefaults(i18n).ToArray();
@@ -62,14 +59,10 @@ namespace cwebplusApp.Shared.Services {
public async Task SynchronizeMasterdata() {
if (onlineStatusProvider.Online) {
try {
await SynchronizeColors();
await SynchronizeBcTypes();
await SynchronizeBrands();
await SynchronizeSearchServices();
} finally {
this.firstActivation = false;
}
await SynchronizeColors();
await SynchronizeBcTypes();
await SynchronizeBrands();
await SynchronizeSearchServices();
} else {
throw new Exception("No internet connection available!");
}

Chargement…
Annuler
Enregistrer