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

refactoring

Browse source
This commit is contained in:
Frede Hundewadt 2022-04-09 18:34:04 +02:00
parent 0181ca0503
commit 5cc95de069
11 changed files with 49 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Wonky.Client/AppId.cs
View file

@ -2,8 +2,7 @@ namespace Wonky.Client;
public class AppId 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 string Name { get; set; } = "wwo";
public bool IsBeta { get; set; } = true; public bool IsBeta { get; set; } = true;
} }

6
Wonky.Client/Components/CompanySearchDropdown.razor
View file

@ -17,9 +17,9 @@
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectionChanged"> <select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectionChanged">
<option value="-1">SØGNING</option> <option value="-1">SØGNING</option>
<option value="name">Firmanavn</option> <option value="name">Navn</option>
<option value="city">Bynavn</option> <option value="city">By</option>
<option value="zipCode">Postnummer</option> <option value="zipCode">Postnr</option>
<option value="account">Konto</option> <option value="account">Konto</option>
<option value="phone">Telefon</option> <option value="phone">Telefon</option>
</select> </select>

4
Wonky.Client/Components/CompanySortDropdown.razor
View file

@ -17,6 +17,6 @@
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectionChanged"> <select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectionChanged">
<option value="-1" selected>SORTERING</option> <option value="-1" selected>SORTERING</option>
<option value="name">Firmanavn</option> <option value="name">Navn</option>
<option value="city">Bynavn</option> <option value="city">By</option>
</select> </select>

13
Wonky.Client/Components/CompanyTable.razor
View file

@ -19,25 +19,20 @@
@using Wonky.Client.Helpers; @using Wonky.Client.Helpers;
@if (Companies.Any()) @if (Companies.Any())
{ {
<div class="container"> <ul class="list-group list-group-flush">
<ul class="list-group">
@foreach (var company in Companies) @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)"> <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="me-auto">
<div class="fw-bold mb-1"> <div class="fw-bold mb-1">
<DisplayStateComponent StateClass="@(company.HasFolded == 1 ? "the-dead" : Utils.GetVisitState(company.NextVisit))"></DisplayStateComponent>@company.Name <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
</div> </div>
<span class="fw-bold me-1">Konto:</span>@company.Account<span class="fw-bold mx-1">Bynavn:</span>@company.City
</div> </div>
<span class="badge bg-primary">Vis</span> <span class="badge bg-primary">Vis</span>
</li> </li>
} }
</ul> </ul>
</div>
} }
else else
{ {

6
Wonky.Client/Components/ItemSearchDropdown.razor
View file

@ -17,7 +17,7 @@
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectChanged"> <select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectChanged">
<option value="-1" selected>SØGNING</option> <option value="-1" selected>SØGNING</option>
<option value="name">Varenavn</option> <option value="name">Navn</option>
<option value="sku">Varenummer</option> <option value="sku">Nummer</option>
<option value="shortName">Forkortelse</option> <option value="shortName">Forkort.</option>
</select> </select>

4
Wonky.Client/Components/ItemSortDropdown.razor
View file

@ -17,6 +17,6 @@
<select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectChanged"> <select class="form-select" @bind-value="@Selection" @bind-value:event="oninput" @onchange="OnSelectChanged">
<option value="-1" selected>SORTERING</option> <option value="-1" selected>SORTERING</option>
<option value="name">Varenavn</option> <option value="name">Navn</option>
<option value="sku">Varenummer</option> <option value="sku">Nummer</option>
</select> </select>

4
Wonky.Client/Pages/CompanyCreate.razor
View file

@ -79,14 +79,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row">Adresse</th> <th scope="row">Conavn</th>
<td></td> <td></td>
<td> <td>
<InputText id="address1" class="form-control" @bind-Value="_companyDto.Address1"/> <InputText id="address1" class="form-control" @bind-Value="_companyDto.Address1"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row">Adresse2</th> <th scope="row">Adresse</th>
<td></td> <td></td>
<td> <td>
<InputText id="address2" class="form-control" @bind-Value="_companyDto.Address2"/> <InputText id="address2" class="form-control" @bind-Value="_companyDto.Address2"/>

6
Wonky.Client/Pages/CompanyUpdate.razor
View file

@ -20,7 +20,7 @@
@attribute [Authorize(Roles = "Adviser")] @attribute [Authorize(Roles = "Adviser")]
@page "/company/{companyId}/update" @page "/company/{companyId}/update"
@if (_company.Name != "") @if (_company != null)
{ {
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<div class="form-group row mb-2"> <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"> <div class="col-md-10">
<InputText id="address1" class="form-control" @bind-Value="_company.Address1"/> <InputText id="address1" class="form-control" @bind-Value="_company.Address1"/>
</div> </div>
@ -121,7 +121,7 @@
<div class="card-footer"> <div class="card-footer">
<div class="row"> <div class="row">
<div class="col"> <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> </div>
</div> </div>

19
Wonky.Client/Pages/CompanyUpdate.razor.cs
View file

@ -77,18 +77,13 @@ public partial class CompanyUpdate : IDisposable
StateHasChanged(); StateHasChanged();
return; return;
} }
var lv = DateTime.TryParse(_company.LastVisit, out var lvValidated); _company.LastVisit = $"{LastVisit:yyyy-MM-dd}";
var nv = DateTime.TryParse(_company.NextVisit, out var nvValidated); _company.NextVisit = $"{NextVisit:yyyy-MM-dd}";
if (lv && nv) Console.WriteLine(JsonSerializer.Serialize(_company));
{ await CompanyRepo.UpdateCompany(_company);
_company.LastVisit = $"{lvValidated:yyyy-MM-dd}";
_company.NextVisit = $"{nvValidated:yyyy-MM-dd}"; ToastService.ShowSuccess($"Godt så. Firma '{_company!.Name}' er opdateret.");
Navigation.NavigateTo($"/company/{_company.CompanyId}");
await CompanyRepo.UpdateCompany(_company);
ToastService.ShowSuccess($"Godt så. Firma '{_company!.Name}' er opdateret.");
Navigation.NavigateTo($"/company/{_company.CompanyId}");
}
} }
private async Task GetInfoFromVat(string vatNumber) private async Task GetInfoFromVat(string vatNumber)
{ {

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

@ -24,19 +24,17 @@
<div class="card"> <div class="card">
<div class="card-header"> <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 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> </div>
<div class="card-body"> <div class="card-body">
<table class="table table-sm table-striped table-bordered"> <table class="table table-sm table-striped table-bordered">
<tbody> <tbody>
<tr> <tr>
<th scope="row">Navn</th> <th scope="row">Konto</th>
<td colspan="2">@_company.Name</td> <td colspan="2">@_company.Account</td>
</tr> </tr>
<tr> <tr>
<th scope="row">CO navn</th> <th scope="row">Conavn</th>
<td colspan="2">@_company.Address1</td> <td colspan="2">@_company.Address1</td>
</tr> </tr>
<tr> <tr>
@ -77,14 +75,10 @@
</table> </table>
</div> </div>
<div class="card-footer"> <div class="card-footer">
<div class="row flex-row align-items-end"> <div class="d-flex align-items-end">
<div class="col flex-column"> <a class="btn btn-primary mx-2" href="/companies">Tilbage</a>
<a class="btn btn-primary float-start 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 float-start" href="/company/@_company.CompanyId/update">Rediger</a> <a class="btn btn-primary mx-2" href="/company/@_company.CompanyId/Activity">Aktivitet</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> </div>
</div> </div>
</div> </div>

14
Wonky.Client/Shared/NavMenu.razor
View file

@ -36,6 +36,15 @@
<span class="oi oi-home" aria-hidden="true"></span> Start <span class="oi oi-home" aria-hidden="true"></span> Start
</NavLink> </NavLink>
</div> </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"> <AuthorizeView Roles="Adviser,Admin">
<Authorized> <Authorized>
<div class="nav-item px-3"> <div class="nav-item px-3">
@ -48,6 +57,11 @@
<span class="oi oi-list-rich" aria-hidden="true"></span> Priskatalog <span class="oi oi-list-rich" aria-hidden="true"></span> Priskatalog
</NavLink> </NavLink>
</div> </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> </Authorized>
</AuthorizeView> </AuthorizeView>
</nav> </nav>