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

publish v0.2.43-beta

Browse source
This commit is contained in:
Frede Hundewadt 2022-05-29 12:03:26 +02:00
parent c61f330e50
commit e7f5948b96
5 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,9 @@
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Components
@using Wonky.Client.Components
@using Wonky.Client.Helpers
@attribute [Authorize(Roles = "Adviser")]
@page "/company/{companyId}/update"
@page "/company/{CompanyId}/update"
@if (DtoNgCompany != null)
{
@ -58,7 +59,10 @@
<EditForm EditContext="_updateCompany" OnValidSubmit="Update">
<DataAnnotationsValidator/>
<div class="form-group row mb-1">
<label for="vatNumber" class="col-md-2 col-form-label">CVR/ORG</label>
<label for="vatNumber" class="col-md-2 col-form-label">
<DisplayStateComponent StateClass="@_vatState"></DisplayStateComponent>
CVR/ORG
</label>
<div class="col-md-10">
<InputText id="vatNumber" class="form-control" @bind-Value="DtoNgCompany.VatNumber"/>
<ValidationMessage For="@(() => DtoNgCompany.VatNumber)"></ValidationMessage>
@ -123,7 +127,10 @@
</div>
</div>
<div class="form-group row mb-1">
<label for="lastVisit" class="col-form-label col-md-2">Sidste besøg</label>
<label for="lastVisit" class="col-form-label col-md-2">
<DisplayStateComponent StateClass="@(_hasFolded ? "the-dead" : Utils.GetVisitState(DtoNgCompany.NextVisit))"></DisplayStateComponent>
Sidste besøg
</label>
<div class="col-md-4">
<InputDate id="lastVisit" class="form-control" @bind-Value="@LastVisit"/>
</div>
@ -140,7 +147,7 @@
</div>
<div class="row mb-1">
<div class="col-sm-2 col-md-2 text-right">
<button type="submit" class="btn btn-danger">SLET</button>
<button type="button" class="btn btn-danger">SLET</button>
</div>
<div class="col-sm-2 col-md-2 text-right">
<button type="submit" class="btn btn-success">GEM</button>

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

@ -49,15 +49,16 @@ public partial class CompanyUpdate : IDisposable
private DateTime NextVisit { get; set; }
private string _vatState { get; set; } = "the-ugly";
private VatUtils _vatUtils { get; set; }
private VatAddress vatAddress;
private VatAddress vatAddress = new();
private bool validVat;
private bool _hasFolded;
protected override async Task OnInitializedAsync()
{
_vatUtils = new VatUtils();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
DtoNgCompany = await CompanyRepo.GetCompanyById(CompanyId);
vatAddress = PrepareVatAddress();
LastVisit = DateTime.Parse(DtoNgCompany.LastVisit);
NextVisit = DateTime.Parse(DtoNgCompany.NextVisit);
_updateCompany = new EditContext(DtoNgCompany);
@ -70,42 +71,40 @@ public partial class CompanyUpdate : IDisposable
if(DtoNgCompany.HasFolded == 1)
{
_hasFolded = true;
_vatState = "the-dead";
}
else
{
_vatState = _vatUtils.ValidateFormat(DtoNgCompany.CountryCode, DtoNgCompany.VatNumber) ? "the-good" : "the-draw";
}
vatAddress = PrepareVatAddress();
}
private VatAddress PrepareVatAddress()
{
var digits = "123456789".ToCharArray();
var pos = DtoNgCompany.Address1.IndexOfAny(digits);
if (pos > 0)
var pos1 = DtoNgCompany.Address1.IndexOfAny(digits);
if (pos1 > 0)
{
return new VatAddress
{
ZipCode = DtoNgCompany.ZipCode,
StreetName = DtoNgCompany.Address1[..pos],
HouseNumber = DtoNgCompany.Address1[pos..]
StreetName = DtoNgCompany.Address1[..pos1],
HouseNumber = DtoNgCompany.Address1[pos1..]
};
}
pos = DtoNgCompany.Address2.IndexOfAny(digits);
if (pos > 0)
var pos2 = DtoNgCompany.Address2.IndexOfAny(digits);
if (pos2 > 0)
{
return new VatAddress
{
ZipCode = DtoNgCompany.ZipCode,
StreetName = DtoNgCompany.Address2[..pos],
HouseNumber = DtoNgCompany.Address2[pos..]
StreetName = DtoNgCompany.Address2[..pos2],
HouseNumber = DtoNgCompany.Address2[pos2..]
};
}
return new VatAddress
{
ZipCode = DtoNgCompany.ZipCode
};
return vatAddress;
}
private async Task Update()
{

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

@ -78,7 +78,7 @@
<div class="card-footer">
<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/@DtoNgCompany.CompanyId/update">Rediger</a>
<a class="btn btn-primary mx-2" href="/company/@(DtoNgCompany.CompanyId)/update">Rediger</a>
@if (_vatInvalid || string.IsNullOrWhiteSpace(DtoNgCompany.Address1))
{
<a type="button" class="btn btn-primary mx-2 disabled" aria-disabled="true">Aktivitet</a>

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

@ -55,7 +55,7 @@
<label for="activityType" class="col-md-2 col-form-label">Kontakt</label>
<div class="col-md-4">
<select id="activityType" class="form-select" @bind-Value="@_poDraft.ActivityTypeEnum" @bind-Value:event="oninput" @onchange="CheckActivity">
<option value="" selected>IKKE VALGT</option>
<option value="" selected>"IKKE VALGT"</option>
<option value="onSite">Besøg</option>
<option value="phone">Telefon</option>
</select>
@ -64,7 +64,7 @@
<label for="statusType" class="col-md-2 col-form-label">Status</label>
<div class="col-md-4">
<select id="statusType" class="form-select" @bind-Value="@_poDraft.ActivityStatusEnum" @bind-Value:event="oninput" @onchange="CheckStatus">
<option value="" selected>IKKE VALGT</option>
<option value="" selected>"IKKE VALGT"</option>
<option value="noSale">Ingen salg</option>
<option value="order">Bestilling</option>
<option value="quote">Tilbud</option>

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

@ -7,7 +7,7 @@
}
},
"apiConfig": {
"baseAddress": "https://staging.innotec.dk",
"baseAddress": "https://app.innotec.dk",
"tokenPath": "token",
"userInfo": "api/auth/userinfo",
"customerEndpoint": "api/v2/crm/companies",