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

report button - target is new or view

Browse source
This commit is contained in:
Frede Hundewadt 2022-06-20 06:28:48 +02:00
parent 248e968f47
commit fe20ca2e25
8 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wonky.Client/Helpers/Utils.cs
View file

@ -27,7 +27,7 @@ public static class Utils
public static string GetVisitState(string dtNextVisit)
{
if (dtNextVisit is "0001-01-01" or "1970-01-01")
if (dtNextVisit is "0001-01-01" or "1970-01-01" or "1970-00-00")
return "the-draw";
var dtNow = DateTime.Now;

11
Wonky.Client/Pages/ActivityToday.razor
View file

@ -29,6 +29,17 @@
<div class="col">
<WorkDateComponent OnChanged="GetActivities"></WorkDateComponent>
</div>
<div class="col">
@if (_reportExist)
{
<a class="btn btn-primary" href="/sales-reports/view/@_workDate">RAPPORT</a>
}
else
{
<a class="btn btn-primary" href="/sales-reports/new">RAPPORT</a>
}
</div>
</div>
</div>
</div>

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

@ -12,13 +12,15 @@ public partial class ActivityToday
{
[Inject] public UserPreferenceService UserPrefs { get; set; }
[Inject] public ILogger<Home> Logger { get; set; }
[Inject] private HttpInterceptorService Interceptor { get; set; }
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IActivityHttpRepository ActivityRepo { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private NavigationManager _navigator { get; set; }
[Inject] private IActivityHttpRepository _activityRepo { get; set; }
[Inject] private IReportHttpRepository _reportRepo { get; set; }
[Inject] private IToastService _toast { get; set; }
private NgActivityListView _view { get; set; } = new();
private Preferences _prefs { get; set; } = new();
private string _workDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}";
private bool _reportExist = false;
protected override async Task OnInitializedAsync()
{
@ -26,9 +28,9 @@ public partial class ActivityToday
if(!string.IsNullOrWhiteSpace(_prefs.WorkDate))
_workDate = _prefs.WorkDate;
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
_interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
_reportExist = await _reportRepo.ReportExist(_workDate);
await GetActivities(_workDate);
}
@ -37,12 +39,12 @@ public partial class ActivityToday
_toast.ShowInfo("Vent nogle sekunder for data");
_workDate = workDate;
_view = new NgActivityListView();
_view = await ActivityRepo.GetActivities(workDate);
_view = await _activityRepo.GetActivities(workDate);
}
public void Dispose()
{
Interceptor.DisposeEvent();
_interceptor.DisposeEvent();
}
}

2
Wonky.Client/Pages/CompanyView.razor
View file

@ -203,7 +203,7 @@
<a class="btn btn-primary" href="/companies">Til Oversigt</a>
</div>
<div class="col">
<ActivityButton CompanyId="@_company.CompanyId"></ActivityButton>
<ActivityButton CompanyId="@_company.CompanyId" Enabled="@_company.ValidVat"></ActivityButton>
</div>
</div>
</div>

2
Wonky.Client/Pages/ReportCreate.razor
View file

@ -86,7 +86,7 @@
}
<th>
<button type="button" class="btn btn-info"
@onclick="InitializeReport" disabled="@(!_noFigures)">
@onclick="GetKeyFigures" disabled="@(!_noFigures)">
Nøgletal
</button>
</th>

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

@ -147,12 +147,12 @@ public partial class ReportCreate : IDisposable
_report.ToDateTime = $"{_workDate:yyyy-MM-dd 12:00}";
}
private async Task InitializeReport()
private async Task GetKeyFigures()
{
_fetching = true;
var data = await ReportRepo.InitializeReportData($"{_workDate:yyyy-MM-dd}");
if(data.Closed)
Navigator.NavigateTo($"/sales-report/view/{_workDate:yyyy-MM-dd}");
Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}");
_noFigures = false;
_report.Figures = data.Figures;
_init = data.Figures;

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

@ -2,8 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "None",
"System": "Error",
"Microsoft": "Error"
"System": "Information",
"Microsoft": "Information"
},
"Debug": {
"LogLevel": {
@ -18,7 +18,7 @@
},
"appInfo": {
"name": "Wonky Client",
"version": "0.8.10",
"version": "0.8.12",
"isBeta": true,
"image": "grumpy-coder.png"
},

4
Wonky.Entity/DTO/CompanyDto.cs
View file

@ -64,9 +64,9 @@ public class CompanyDto
public string CountryCode { get; set; } = "";
public string LastVisit { get; set; } = "";
public string LastVisit { get; set; } = "1970-01-01";
public string NextVisit { get; set; } = "";
public string NextVisit { get; set; } = "1970-01-01";
[Range(1, 52, ErrorMessage = "Angiv interval mellem 1 og 52 uger")]
public int Interval { get; set; } = 8;