refactoring
This commit is contained in:
parent
0181ca0503
commit
5cc95de069
11 changed files with 49 additions and 52 deletions
|
@ -2,8 +2,7 @@ namespace Wonky.Client;
|
|||
|
||||
public class AppId
|
||||
{
|
||||
public string Version { get; set; } = "0.2.12";
|
||||
public string Version { get; set; } = "0.2.15";
|
||||
public string Name { get; set; } = "wwo";
|
||||
|
||||
public bool IsBeta { get; set; } = true;
|
||||
}
|
|
@ -17,9 +17,9 @@
|
|||
|
||||
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectionChanged">
|
||||
<option value="-1">SØGNING</option>
|
||||
<option value="name">Firmanavn</option>
|
||||
<option value="city">Bynavn</option>
|
||||
<option value="zipCode">Postnummer</option>
|
||||
<option value="name">Navn</option>
|
||||
<option value="city">By</option>
|
||||
<option value="zipCode">Postnr</option>
|
||||
<option value="account">Konto</option>
|
||||
<option value="phone">Telefon</option>
|
||||
</select>
|
||||
|
|
|
@ -17,6 +17,6 @@
|
|||
|
||||
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectionChanged">
|
||||
<option value="-1" selected>SORTERING</option>
|
||||
<option value="name">Firmanavn</option>
|
||||
<option value="city">Bynavn</option>
|
||||
<option value="name">Navn</option>
|
||||
<option value="city">By</option>
|
||||
</select>
|
|
@ -19,25 +19,20 @@
|
|||
@using Wonky.Client.Helpers;
|
||||
@if (Companies.Any())
|
||||
{
|
||||
<div class="container">
|
||||
<ul class="list-group">
|
||||
|
||||
<ul class="list-group list-group-flush">
|
||||
@foreach (var company in Companies)
|
||||
{
|
||||
<li class="d-flex justify-content-between align-items-start list-group-item list-group-item-action" style="cursor:pointer" @onclick="() => NavigateCompany(company.CompanyId)">
|
||||
<div class="me-auto">
|
||||
<div class="fw-bold mb-1">
|
||||
<DisplayStateComponent StateClass="@(company.HasFolded == 1 ? "the-dead" : Utils.GetVisitState(company.NextVisit))"></DisplayStateComponent>@company.Name
|
||||
</div>
|
||||
<div>
|
||||
<span class="fw-bold me-1">Konto:</span>@company.Account<span class="fw-bold mx-1">Bynavn:</span>@company.City
|
||||
<DisplayStateComponent StateClass="@(company.HasFolded == 1 ? "the-dead" : Utils.GetVisitState(company.NextVisit))"></DisplayStateComponent>@company.Name
|
||||
</div>
|
||||
<span class="fw-bold me-1">Konto:</span>@company.Account<span class="fw-bold mx-1">Bynavn:</span>@company.City
|
||||
</div>
|
||||
<span class="badge bg-primary">Vis</span>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
</ul>
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectChanged">
|
||||
<option value="-1" selected>SØGNING</option>
|
||||
<option value="name">Varenavn</option>
|
||||
<option value="sku">Varenummer</option>
|
||||
<option value="shortName">Forkortelse</option>
|
||||
<option value="name">Navn</option>
|
||||
<option value="sku">Nummer</option>
|
||||
<option value="shortName">Forkort.</option>
|
||||
</select>
|
|
@ -17,6 +17,6 @@
|
|||
|
||||
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectChanged">
|
||||
<option value="-1" selected>SORTERING</option>
|
||||
<option value="name">Varenavn</option>
|
||||
<option value="sku">Varenummer</option>
|
||||
<option value="name">Navn</option>
|
||||
<option value="sku">Nummer</option>
|
||||
</select>
|
|
@ -79,14 +79,14 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Adresse</th>
|
||||
<th scope="row">Conavn</th>
|
||||
<td></td>
|
||||
<td>
|
||||
<InputText id="address1" class="form-control" @bind-Value="_companyDto.Address1"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Adresse2</th>
|
||||
<th scope="row">Adresse</th>
|
||||
<td></td>
|
||||
<td>
|
||||
<InputText id="address2" class="form-control" @bind-Value="_companyDto.Address2"/>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
@attribute [Authorize(Roles = "Adviser")]
|
||||
@page "/company/{companyId}/update"
|
||||
|
||||
@if (_company.Name != "")
|
||||
@if (_company != null)
|
||||
{
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
|
@ -37,7 +37,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="form-group row mb-2">
|
||||
<label for="address1" class="col-md-2 col-form-label">Adresse</label>
|
||||
<label for="address1" class="col-md-2 col-form-label">Conavn</label>
|
||||
<div class="col-md-10">
|
||||
<InputText id="address1" class="form-control" @bind-Value="_company.Address1"/>
|
||||
</div>
|
||||
|
@ -121,7 +121,7 @@
|
|||
<div class="card-footer">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<a class="btn btn-primary" href="/companies">Tilbage</a>
|
||||
<a class="btn btn-primary" href="/company/@_company.CompanyId">Tilbage</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -77,18 +77,13 @@ public partial class CompanyUpdate : IDisposable
|
|||
StateHasChanged();
|
||||
return;
|
||||
}
|
||||
var lv = DateTime.TryParse(_company.LastVisit, out var lvValidated);
|
||||
var nv = DateTime.TryParse(_company.NextVisit, out var nvValidated);
|
||||
if (lv && nv)
|
||||
{
|
||||
_company.LastVisit = $"{lvValidated:yyyy-MM-dd}";
|
||||
_company.NextVisit = $"{nvValidated:yyyy-MM-dd}";
|
||||
|
||||
await CompanyRepo.UpdateCompany(_company);
|
||||
|
||||
ToastService.ShowSuccess($"Godt så. Firma '{_company!.Name}' er opdateret.");
|
||||
Navigation.NavigateTo($"/company/{_company.CompanyId}");
|
||||
}
|
||||
_company.LastVisit = $"{LastVisit:yyyy-MM-dd}";
|
||||
_company.NextVisit = $"{NextVisit:yyyy-MM-dd}";
|
||||
Console.WriteLine(JsonSerializer.Serialize(_company));
|
||||
await CompanyRepo.UpdateCompany(_company);
|
||||
|
||||
ToastService.ShowSuccess($"Godt så. Firma '{_company!.Name}' er opdateret.");
|
||||
Navigation.NavigateTo($"/company/{_company.CompanyId}");
|
||||
}
|
||||
private async Task GetInfoFromVat(string vatNumber)
|
||||
{
|
||||
|
|
|
@ -24,19 +24,17 @@
|
|||
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<div class="card-header">
|
||||
<div class="h2"><img src="gravestone.png" class="img-fluid" style="float:left;width:48px;height:48px;display:@(_hasFolded ? "block" : "none")" alt="tombstone" /> @_company.Name</div>
|
||||
</div>
|
||||
<div class="h2"><img src="gravestone.png" class="img-fluid" style="float:left;width:48px;height:48px;display:@(_hasFolded ? "block" : "none")" alt="tombstone" /> @_company.Name</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-sm table-striped table-bordered">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">Navn</th>
|
||||
<td colspan="2">@_company.Name</td>
|
||||
<th scope="row">Konto</th>
|
||||
<td colspan="2">@_company.Account</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">CO navn</th>
|
||||
<th scope="row">Conavn</th>
|
||||
<td colspan="2">@_company.Address1</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
@ -77,14 +75,10 @@
|
|||
</table>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="row flex-row align-items-end">
|
||||
<div class="col flex-column">
|
||||
<a class="btn btn-primary float-start mx-2" href="/companies">Tilbage</a>
|
||||
<a class="btn btn-primary float-start" href="/company/@_company.CompanyId/update">Rediger</a>
|
||||
</div>
|
||||
<div class="col flex-column">
|
||||
<a class="btn btn-primary float-end mx-2" href="/company/@_company.CompanyId/Activity">Aktivitet</a>
|
||||
</div>
|
||||
<div class="d-flex align-items-end">
|
||||
<a class="btn btn-primary mx-2" href="/companies">Tilbage</a>
|
||||
<a class="btn btn-primary mx-2" href="/company/@_company.CompanyId/update">Rediger</a>
|
||||
<a class="btn btn-primary mx-2" href="/company/@_company.CompanyId/Activity">Aktivitet</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -36,6 +36,15 @@
|
|||
<span class="oi oi-home" aria-hidden="true"></span> Start
|
||||
</NavLink>
|
||||
</div>
|
||||
<AuthorizeView>
|
||||
<NotAuthorized>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="Login">
|
||||
<span class="oi oi-account-login"></span> Log ind
|
||||
</NavLink>
|
||||
</div>
|
||||
</NotAuthorized>
|
||||
</AuthorizeView>
|
||||
<AuthorizeView Roles="Adviser,Admin">
|
||||
<Authorized>
|
||||
<div class="nav-item px-3">
|
||||
|
@ -48,6 +57,11 @@
|
|||
<span class="oi oi-list-rich" aria-hidden="true"></span> Priskatalog
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="Logout">
|
||||
<span class="oi oi-account-logout"></span> Log af
|
||||
</NavLink>
|
||||
</div>
|
||||
</Authorized>
|
||||
</AuthorizeView>
|
||||
</nav>
|
||||
|
|
Loading…
Reference in a new issue