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

revert checking - add ApprovedBy to environment document listing

Browse source
This commit is contained in:
Frede Hundewadt 2023-11-20 08:32:05 +01:00
parent 6776b3ca6d
commit f536768ab1
6 changed files with 35 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs
View file

@ -60,7 +60,7 @@ public class AdvisorCustomerHistoryRepository : IAdvisorCustomerHistoryRepositor
public async Task<InvoiceListView> GetInvoiceListHeader(string companyId)
{
var response = await _client.GetAsync($"{_api.CrmCustomers}/{companyId}/invoices/head");
var response = await _client.GetAsync($"{_api.CrmCustomers}/{companyId}/invoices");
var content = await response.Content.ReadAsStringAsync();
if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content))
{

7
Wonky.Client/Pages/AdvisorActivityCreatePage.razor
View file

@ -26,7 +26,12 @@
<WorkDateComponent OnWorkDateChangedCallback="WorkDateChangedCallback"/>
</div>
</div>
@if (_invalidDate)
{
<div class="alert alert-warning">
<h4>Arbejdsdato er ændret til '@($"{SelectedDate:D}")'</h4>
</div>
}
@if (ReportClosed)
{
<div class="row">

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

@ -94,7 +94,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
private UserManagerEditView _salesRep = new();
private bool _formInvalid = true;
private bool _disableButtons = true;
private bool _invalidDate = false;
private bool _invalidDate;
protected override async Task OnInitializedAsync()
{
@ -168,27 +168,27 @@ public partial class AdvisorActivityCreatePage : IDisposable
SelectedDate = string.IsNullOrWhiteSpace(_userPref.WorkDate)
? DateTime.Now
: DateTime.Parse(_userPref.WorkDate);
// 2023-11-08 - reject dates more than a week old
// 2023-11-08 - reject dates going back more than a week
if (SelectedDate < DateTime.Now.AddDays(-7))
{
Toaster.ShowError($"Aktivitetsdato ligger for lang tilbage. Dato ændres til {DateTime.Now.Date}");
_invalidDate = true;
Toaster.ShowError($"Aktivitetsdato kan ikke anvendes. Dato ændres til {DateTime.Now.Date}");
SelectedDate = DateTime.Now;
await PreferenceService.SetWorkDate(SelectedDate);
}
// 2023-08-14 - reject orders for future dates
if (SelectedDate.Date > DateTime.Now.Date)
{
Toaster.ShowError($"Aktivitetsdato er fremtidig. Dato ændres til {DateTime.Now.Date}");
_invalidDate = true;
Toaster.ShowWarning($"Aktivitetsdato er fremtidig. Dato ændres til {DateTime.Now.Date}");
SelectedDate = DateTime.Now;
await PreferenceService.SetWorkDate(SelectedDate);
}
// raise flag if report is closed
// the flag cause a message instead of order entry
ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}");
// Lines may already have been added from the company inventory page
if (DraftProvider.Draft.DraftType == "order")
{
// set dropdown selection accordingly
if (_activity.ActivityTypeEnum != "phone")
{
_activity.ActivityTypeEnum = "onSite";
@ -201,7 +201,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
await TestOrgNumber();
}
Working = false;
// Ask for confirmation of date
Logger.LogDebug("Preferences.DateConfirmed => {}", _userPref.DateConfirmed);
if (!_userPref.DateConfirmed)
{

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

@ -99,9 +99,6 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
protected override async Task OnInitializedAsync()
{
/*
* setup interceptor
*/
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
/*
@ -153,28 +150,15 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
{
_enableActivity = 1;
}
/*
* only execute if the InfoDrawer.Company is not KANVAS
*/
Logger.LogDebug("_company => {}", JsonSerializer.Serialize(_company));
/*
* toggle view button text
*/
_toggleButtonText = _company.IsHidden == 0 ? "Udelad kunde i oversigt" : "Brug Normal Visning";
// _currentVat = _company.VatNumber;
_company.CountryCode = _userInfo.CountryCode.ToLower();
/*
* visit interval init
*/
if (_company.Interval == 0)
{
_company.Interval = 8;
}
/*
* visit date init
*/
_lastVisit = DateTime.Parse(_company.LastVisit);
_nextVisit = DateTime.Parse(_company.NextVisit);
/*
@ -183,16 +167,14 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
if (_lastVisit.Year < 2020)
{
_lastVisit = DateTime.Parse("2020-01-01");
_nextVisit = DateTime.Now;
}
/*
* set next visit according to last visit and interval
*/
if (!_company.ValidDateSpan())
{
_nextVisit = _lastVisit.AddDays(_company.Interval * 7);
}
// 2023-11-20 - remove - possibly creates an invalid _nextVisit
// enable if invalid _nextVisit continue
// if (!_company.ValidDateSpan())
// {
// _nextVisit = _lastVisit.AddDays(_company.Interval * 7);
// }
/*
* display urgency of next visit
*/

18
Wonky.Client/Wonky.Client.csproj
View file

@ -9,16 +9,16 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
<PackageReference Include="Blazored.Toast" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.0-rc.2.23480.2" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0-rc.2.23480.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0-rc.2.23480.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.2.23480.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
<PackageReference Include="Toolbelt.Blazor.HttpClientInterceptor" Version="10.2.0" />
</ItemGroup>

5
Wonky.Entity/Views/WorkplaceProductVariantDoc.cs
View file

@ -2,11 +2,12 @@ namespace Wonky.Entity.Views;
public class WorkplaceProductVariantDoc
{
public string DocumentId { get; set; } = "";
public string DocumentTypeEnum { get; set; } = "";
public string ApprovedBy { get; set; } = "";
public string DocumentDescription { get; set; } = "";
public string DocumentDate { get; set; } = "";
public string DocumentId { get; set; } = "";
public string DocumentLink { get; set; } = "";
public string DocumentTypeEnum { get; set; } = "";
public string S5A { get; set; } = "";
public string S9A { get; set; } = "";
}