This commit is contained in:
Frede Hundewadt 2023-05-15 09:55:00 +02:00
parent d77f3b612f
commit a896b5839b
7 changed files with 51 additions and 23 deletions

View file

@ -137,10 +137,9 @@ public class AuthenticationService : IAuthenticationService
{
_client.DefaultRequestHeaders.Authorization = null;
var profileBackup = await _preference.GetProfile();
await Task.Delay(150);
var km = profileBackup.KmMorning;
await _localStorage.ClearAsync();
await Task.Delay(150);
await _preference.SetProfile(profileBackup);
await _preference.SetKmMorning(km);
((AuthStateProvider)_authStateProvider).NotifyUserLogout();
}
@ -148,9 +147,9 @@ public class AuthenticationService : IAuthenticationService
{
var response = await _client.GetAsync(_apiConfig.Value.UserInfoAuth).ConfigureAwait(true);
var content = await response.Content.ReadAsStringAsync();
var userInfo = JsonSerializer.Deserialize<UserManagerEditView>(content, _options);
var userInfo = JsonSerializer.Deserialize<UserManagerEditView>(content, _options) ?? new UserManagerEditView();
if(write)
await _infoService.SetUserInfo(userInfo);
return userInfo ?? new UserManagerEditView();
return userInfo;
}
}

View file

@ -24,17 +24,26 @@
<div class="col-sm-6">
<h2>@Advisor.FullName</h2>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<h3>Support Dokumentation</h3>
</div>
<div class="col-sm-3">
<a class="btn btn-primary" href="/supervisor/advisors" ><i class="bi-chevron-left"></i> Liste</a>
</div>
<div class="col-sm-3 text-end">
<a class="btn btn-primary" href="/supervisor/advisors/@AdvisorId/documents/new"><i class="bi-plus-lg"></i> Opret</a>
<a class="btn btn-primary" href="/supervisor/advisors/@AdvisorId/documents" ><i class="bi-chevron-left"></i> Tilbage</a>
</div>
</div>
<div class="row">
<div class="col">
<h3>Support Dokumentation</h3>
<div class="col-sm-1">
<div class="text-end">
<div class="busy-signal @(Working ? "inno-visible" : "inno-hidden")" >
<div class="spinner-grow text-info" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</div>
</div>
</div>

View file

@ -38,7 +38,7 @@ public partial class SupervisorDocumentListPage : IDisposable
// #########################################################
private List<SupportDocumentEditView> Documents { get; set; } = new();
private SupportAdvisorView Advisor { get; set; } = new();
// private bool _working = true;
private bool Working { get; set; } = true;
protected override async Task OnInitializedAsync()
@ -57,7 +57,7 @@ public partial class SupervisorDocumentListPage : IDisposable
Logger.LogDebug("Documents => {}",JsonSerializer.Serialize(Documents));
// _working = false;
Working = false;
}

View file

@ -22,17 +22,28 @@
<PageTitle>Support Dokumentation</PageTitle>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-12">
<h2>@Document.AdvisorName</h2>
</div>
</div>
<div class="row">
<div class="col-sm-5">Support Dokumentation</div>
<div class="col-sm-3">
<a class="btn btn-primary" href="/supervisor/advisors" ><i class="bi-chevron-left"></i> Liste</a>
</div>
<div class="col-sm-3 text-end">
<a class="btn btn-primary" href="/supervisor/advisors/@AdvisorId/documents" ><i class="bi-chevron-left"></i> Tilbage</a>
</div>
<div class="col-sm-1">
<div class="text-end">
<div class="busy-signal @(Working ? "inno-visible" : "inno-hidden")" >
<div class="spinner-grow text-info" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</div>
</div>
</div>
<EditForm EditContext="FormContext" OnValidSubmit="SubmitDocument">
<DataAnnotationsValidator/>
<div class="card">

View file

@ -50,6 +50,7 @@ public partial class SupervisorDocumentNewPage : IDisposable
private SupportDocumentEditView Document { get; set; } = new();
private DateTime DocumentDate { get; set; } = DateTime.Now;
private bool FormInvalid { get; set; } = true;
private bool Working { get; set; } = true;
protected override async Task OnInitializedAsync()
{
@ -78,11 +79,18 @@ public partial class SupervisorDocumentNewPage : IDisposable
Document.AdvisorId = Advisor.AdvisorId;
Document.AdvisorName = Advisor.FullName;
Document.CountryCode = Advisor.CountryCode;
Working = false;
}
private async Task SubmitDocument()
{
if (Working)
{
return;
}
Working = true;
Document.DocumentDate = $"{DocumentDate:yyyy-MM-dd}";
Toaster.ShowInfo("Gemmer Evaluering");
Logger.LogDebug("Document => {}", JsonSerializer.Serialize(Document, new JsonSerializerOptions(JsonSerializerDefaults.Web)));
@ -97,6 +105,7 @@ public partial class SupervisorDocumentNewPage : IDisposable
Navigator.NavigateTo($"/supervisor/advisors/{AdvisorId}/documents");
}
Toaster.ClearAll();
Working = false;
}
private void HandleFieldChanged(object sender, FieldChangedEventArgs e)

View file

@ -23,20 +23,20 @@
<div class="col-sm-6">
<h2>@Document.AdvisorName</h2>
</div>
</div>
<div class="row">
<div class="col-sm-5">
<h3>Support Dokumentation</h3>
</div>
<div class="col-sm-3">
<a class="btn btn-primary" href="/supervisor/advisors" ><i class="bi-chevron-left"></i> Liste</a>
</div>
<div class="col-sm-3 text-end">
<a class="btn btn-primary" href="/supervisor/advisors/@AdvisorId/documents" ><i class="bi-chevron-left"></i> Tilbage</a>
</div>
</div>
<div class="row">
<div class="col">
<h3>Support Dokumentation</h3>
</div>
<div class="col">
<div class="col-sm-1">
<div class="text-end">
<div class="busy-signal" style="display:@(Working ? "block" : "none")">
<div class="busy-signal @(Working ? "inno-visible" : "inno-hidden")" >
<div class="spinner-grow text-info" role="status">
<span class="visually-hidden">Loading...</span>
</div>

View file

@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Online",
"version": "142.2",
"version": "142.3",
"rc": true,
"sandBox": true,
"image": "grumpy-coder.png"