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

publish 0.2.42-beta

Browse source
This commit is contained in:
Frede Hundewadt 2022-05-28 16:27:54 +02:00
parent 146c7da868
commit 8cc2f1ee2e
4 changed files with 77 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wonky.Client/Components/AppVersion.razor
View file

@ -17,7 +17,7 @@
<span class="version">@Name</span> <span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>}
@code
{
private const string Version = "0.2.41";
private const string Version = "0.2.42";
private const string Name = "wwo";
private const bool IsBeta = true;
}

31
Wonky.Client/Pages/SalesReport.razor
View file

@ -18,18 +18,32 @@
@attribute [Authorize(Roles = "Adviser")]
@page "/sales-report"
<h3>Rapport</h3>
<div class="row">
<div class="col">
<h3>Dagsrapport</h3>
<EditForm EditContext="_editContext">
<div class="row mb-1">
<label for="dayType" class="col-md-2 col-form-label">Dag</label>
<div class="col-md-4">
<select id="dayType" class="form-select" @bind-Value="_reportDto.DayTypeEnum" @bind-Value:event="oninput" @onchange="CheckDayType">
<option value="" selected>"IKKE VALGT"</option>
<option value="sales">Salgsdag</option>
<option value="meeting">Salgsmøde</option>
<option value="office">Kontordag</option>
<option value="supervisor">Supervisor</option>
<option value="sickLeave">Sygdom</option>
<option value="leave">Ferie</option>
<option value="noReport">Ingen Rapport</option>
</select>
<ValidationMessage For="@(() => _reportDto.DayTypeEnum)"></ValidationMessage>
</div>
<label for="reportDate" class="col-md-2 col-form-label">Dato</label>
<div class="col-md-4">
<EditForm EditContext="ReportDate">
<InputDate id="reportDate" class="form-control" @bind-Value="@(_reportDate)"/>
<button class="btn btn-info" @onclick="GetActivities">Hent aktiviteter</button>
</EditForm>
</div>
</div>
</div>
</EditForm>
@if (Activities != null)
{
<div class="row">
@ -56,11 +70,8 @@
</div>
}
</div>
<div class="row">
</div>
}
else
{
<span>Ingen aktivitet for dato</span>
<AppSpinner></AppSpinner>
}

9
Wonky.Client/Pages/SalesReport.razor.cs
View file

@ -30,15 +30,20 @@ public partial class SalesReport
[Inject] private IActivityHttpRepository ActivityRepo { get; set; }
private DateTime _reportDate;
private EditContext ReportDate { get; set; }
private EditContext _editContext { get; set; }
private SalesReportDto _reportDto = new();
private List<ReportActivity>? Activities { get; set; } = new();
protected override void OnInitialized()
{
_reportDate = DateTime.Now;
ReportDate = new EditContext(_reportDate);
_editContext = new EditContext(_reportDate);
}
private void CheckDayType()
{
}
private async Task GetActivities()
{
Activities = await ActivityRepo.GetActivities($"{_reportDate:yyyy-MM-dd}").ConfigureAwait(true);

29
Wonky.Entity/DTO/SalesReportDto.cs Normal file
View file

@ -0,0 +1,29 @@
namespace Wonky.Entity.DTO;
public class SalesReportDto
{
public string ActivityDate { get; set; } = "";
public string DayTypeEnum { get; set; } = "";
public string Comment { get; set; } = "";
//
public long KmStart { get; set; }
public long KmFinished { get; set; }
public int Distance { get; set; }
public int DistancePrivate { get; set; }
//
public int VisitNewCount { get; set; }
public int VisitRecallCount { get; set; }
public int DemoNewCount { get; set; }
public int DemoRecallCount { get; set; }
public int SalesNewCount { get; set; }
public int SalesRecallCount { get; set; }
public int SasCount { get; set; }
//
public decimal SumSalesDay { get; set; }
public decimal SumSasDay { get; set; }
public decimal SumTotalDay { get; set; }
}