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

built v0.3.1

Browse source
This commit is contained in:
Frede Hundewadt 2022-05-31 19:41:02 +02:00
parent 1abd19f4c0
commit f510bdba17
3 changed files with 72 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,6 @@
<span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>} <span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>}
@code @code
{ {
private const string Version = "0.3"; private const string Version = "0.3.1";
private const bool IsBeta = true; private const bool IsBeta = true;
} }

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

@ -19,13 +19,23 @@
@attribute [Authorize(Roles = "Adviser")] @attribute [Authorize(Roles = "Adviser")]
@page "/sales-report" @page "/sales-report"
<h3>Dagsrapport</h3>
<EditForm EditContext="_editContext"> <EditForm EditContext="_editContext">
<hr/> <div class="card">
<div class="row mb-1"> <div class="card-header">
<label for="dayType" class="col-md-1 col-form-label">Dag</label> <h3>Dagsrapport</h3>
<div class="col-md-3"> </div>
<select id="dayType" class="form-select" @bind-Value="_reportDto.DayTypeEnum" @bind-Value:event="oninput" @onchange="CheckDayType"> <div class="card-body">
<table class="table">
<thead>
<th scope="col">Dagtype</th>
<th scope="col">Begyndt</th>
<th scope="col">Afsluttet</th>
</thead>
<tbody>
<tr>
<td>
<select id="dayType" class="col-md-3 form-select" @bind-Value="_reportDto.DayTypeEnum" @bind-Value:event="oninput" @onchange="CheckDayType">
<option value="" selected>"IKKE VALGT"</option> <option value="" selected>"IKKE VALGT"</option>
<option value="sales">Salgsdag</option> <option value="sales">Salgsdag</option>
<option value="meeting">Salgsmøde</option> <option value="meeting">Salgsmøde</option>
@ -36,61 +46,53 @@
<option value="noReport">Ingen Rapport</option> <option value="noReport">Ingen Rapport</option>
</select> </select>
<ValidationMessage For="@(() => _reportDto.DayTypeEnum)"></ValidationMessage> <ValidationMessage For="@(() => _reportDto.DayTypeEnum)"></ValidationMessage>
</div> </td>
@if (_reportDto.DayTypeEnum == "sales") <td>
{
<label for="checkIn" class="col-md-1 col-form½">Begyndt</label>
<div class="col-md-3 form-control">
<InputDateTime id="checkIn" class="form-control" @bind-Value="_reportDto.CheckIn"></InputDateTime> <InputDateTime id="checkIn" class="form-control" @bind-Value="_reportDto.CheckIn"></InputDateTime>
<ValidationMessage For="@(() => _reportDto.CheckIn)"></ValidationMessage> <ValidationMessage For="@(() => _reportDto.CheckIn)"></ValidationMessage>
</div> </td>
<label for="checkOut" class="col-md-1 col-form½">Afsluttet</label> <td>
<div class="col-md-3 form-control">
<InputDateTime id="checkOut" class="form-control" @bind-Value="_reportDto.CheckOut"></InputDateTime> <InputDateTime id="checkOut" class="form-control" @bind-Value="_reportDto.CheckOut"></InputDateTime>
<ValidationMessage For="@(() => _reportDto.CheckOut)"></ValidationMessage> <ValidationMessage For="@(() => _reportDto.CheckOut)"></ValidationMessage>
</td>
</tr>
</tbody>
</table>
</div> </div>
} <div class="card-body">
@if (_reportDto.DayTypeEnum.Contains("leave")) <table class="table">
{ <thead>
<label for="checkIn" class="col-md-1 col-form½">Begyndt</label> <th scope="col">Km Morgen</th>
<div class="col-md-3 form-control"> <th scope="col">Km Aften</th>
<InputDate id="checkIn" class="form-control" @bind-Value="_reportDto.CheckIn"></InputDate> <th scope="col">Km Kørt</th>
<ValidationMessage For="@(() => _reportDto.CheckIn)"></ValidationMessage> <th scope="col">Km Privat</th>
</thead>
<tbody>
<tr>
<td>
<InputNumber id="kmMorning" class="form-control" @bind-Value="_reportDto.KmMorning"/>
<ValidationMessage For="@(() => _reportDto.KmMorning)"></ValidationMessage>
</td>
<td>
<InputNumber id="kmEvening" class="form-control" @bind-Value="_reportDto.KmEvening"/>
<ValidationMessage For="@(() => _reportDto.KmEvening)"></ValidationMessage>
</td>
<td>
<InputNumber id="distance" class="form-control" @bind-Value="_reportDto.Distance" readonly=""/>
</td>
<td>
<InputNumber id="kmPrivate" class="form-control" @bind-Value="_reportDto.DistancePrivate"/>
<ValidationMessage For="@(() => _reportDto.DistancePrivate)"></ValidationMessage>
</td>
</tr>
</tbody>
</table>
</div> </div>
<label for="checkOut" class="col-md-1 col-form½">Afsluttet</label> <dic class="card-footer">
<div class="col-md-3 form-control">
<InputDate id="checkOut" class="form-control" @bind-Value="_reportDto.CheckOut"></InputDate>
<ValidationMessage For="@(() => _reportDto.CheckOut)"></ValidationMessage>
</div>
}
<div class="col-md-2"> <div class="col-md-2">
<button type="button" class="btn btn-info" @onclick="GetActivities">Hent</button> <button type="button" class="btn btn-info" @onclick="GetActivities">Hent</button>
</div> </div>
</div> </dic>
<hr/>
<h5>Km regnskab</h5>
<div class="row mb-1">
<label for="kmMorning" class="col-md-1 col-form-label">Morgen</label>
<div class="col-md-2">
<InputNumber id="kmMorning" class="form-control" @bind-Value="_reportDto.KmMorning"/>
<ValidationMessage For="@(() => _reportDto.KmMorning)"></ValidationMessage>
</div>
<label for="kmEvening" class="col-md-1 col-form-label">Aften</label>
<div class="col-md-2">
<InputNumber id="kmEvening" class="form-control" @bind-Value="_reportDto.KmEvening"/>
<ValidationMessage For="@(() => _reportDto.KmEvening)"></ValidationMessage>
</div>
<label for="distance" class="col-md-1 col-form-label">Afstand</label>
<div class="col-md-2">
<InputNumber id="distance" class="form-control" @bind-Value="_reportDto.Distance"/>
<ValidationMessage For="@(() => _reportDto.Distance)"></ValidationMessage>
</div>
<label for="kmPrivate" class="col-md-1 col-form-label">Privat</label>
<div class="col-md-2">
<InputNumber id="kmPrivate" class="form-control" @bind-Value="_reportDto.DistancePrivate"/>
<ValidationMessage For="@(() => _reportDto.DistancePrivate)"></ValidationMessage>
</div>
</div> </div>
</EditForm> </EditForm>
<hr/> <hr/>

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

@ -53,6 +53,7 @@ public partial class SalesReport
private void HandleFieldChanged(object sender, FieldChangedEventArgs e) private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
{ {
_reportDto.Distance = (int) (_reportDto.KmEvening - _reportDto.KmMorning);
_formInvalid = !_editContext.Validate(); _formInvalid = !_editContext.Validate();
StateHasChanged(); StateHasChanged();
} }