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

wip

Browse source
This commit is contained in:
Frede Hundewadt 2022-04-11 17:03:53 +02:00
parent c25f78ea9e
commit bf4b5bf2b4
5 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,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.18";
private const string Version = "0.2.20";
private const string Name = "wwo";
private const bool IsBeta = true;
}

2
Wonky.Client/Models/PurchaseOrder.cs
View file

@ -28,6 +28,8 @@ namespace Wonky.Client.Models
[Required(ErrorMessage = "Navn skal udfyldes")] public string Name { get; set; } = "";
[Required(ErrorMessage = "Bynavn skal udfyldes")] public string City { get; set; }= "";
[Required(ErrorMessage = "Postnummer skal udfyldes")] public string ZipCode { get; set; } = "";
[Required(ErrorMessage = "Vælg aktivitet")] public string ActivityType { get; set; } = "";
public string OurRef { get; set; } = ""; // sales rep
public string Address { get; set; } = "";
public string Address2 { get; set; } = "";

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

@ -22,13 +22,13 @@
@if (_company != null)
{
<h2>@_purchaseOrder.Name</h2>
<EditForm EditContext="_editContext" OnValidSubmit="CreateActivity" class="card card-body bg-light mt-5">
<EditForm EditContext="_editContext" OnValidSubmit="CreateActivity" >
<DataAnnotationsValidator/>
<div class="accordion" id="crmActivity">
<div class="accordion-flush" id="crmActivity">
@* Section for activity header *@
<div class="accordion-item">
<h2 class="accordion-header" id="activityHeader">
<button class="accordion-button bg-dark text-white" type="button"
<button class="accordion-button bg-light" type="button"
data-bs-toggle="collapse" data-bs-target="#activityBody"
aria-expanded="true" aria-controls="activityBody">
Aktivitet
@ -38,13 +38,22 @@
aria-labelledby="activityHeader" data-bs-parent="#crmActivity">
<div class="accordion-body">
<div class="row mb-1">
<label for="activityType" class="col-md-2 col-form-label" >Aktivitet</label>
<div class="col-md-2">
<select id="activityType" class="form-select" @bind-value="@_purchaseOrder.ActivityType" @bind-value:event="oninput">
<option value="" selected></option>
<option value="onSite">Besøg</option>
<option value="phone">Telefon</option>
<option value="canvas">Kanvas</option>
</select>
</div>
<label for="account" class="col-md-2 col-form-label">Konto</label>
<div class="col-md-4">
<div class="col-md-2">
<InputText id="account" class="form-control" @bind-Value="_purchaseOrder.Account" readonly/>
<ValidationMessage For="@(() => _purchaseOrder.Account)"></ValidationMessage>
</div>
<label for="salesRep" class="col-md-2 col-form-label">Sælger</label>
<div class="col-md-4">
<div class="col-md-2">
<InputText id="salesRep" class="form-control" @bind-Value="_purchaseOrder.SalesRep" readonly/>
<ValidationMessage For="@(() => _purchaseOrder.SalesRep)"></ValidationMessage>
</div>
@ -57,7 +66,7 @@
</div>
<div class="row mb-1">
<label for="vatNumber" class="col-md-2 col-form-label">CVR nummer</label>
<div class="col-md-10">
<div class="col-md-2">
<InputText id="vatNumber" class="form-control" @bind-Value="_purchaseOrder.VatNumber"/>
<ValidationMessage For="@(() => _purchaseOrder.VatNumber)"></ValidationMessage>
</div>
@ -95,7 +104,7 @@
@* Section for delivery address *@
<div class="accordion-item">
<h2 class="accordion-header" id="deliveryHeader">
<button class="accordion-button collapsed bg-dark text-white" type="button"
<button class="accordion-button collapsed bg-light" type="button"
data-bs-toggle="collapse" data-bs-target="#deliveryBody"
aria-expanded="false" aria-controls="deliveryBody">
Leveringsadresse
@ -140,10 +149,10 @@
@* Catalog selection for draft *@
<div class="accordion-item">
<h2 class="accordion-header" id="catalogHeader">
<button class="accordion-button collapsed bg-dark text-white" type="button"
<button class="accordion-button collapsed bg-light" type="button"
data-bs-toggle="collapse" data-bs-target="#catalogBody"
aria-expanded="false" aria-controls="catalogBody">
Produkt katalog
Produkt søgning
</button>
</h2>
<div id="catalogBody" class="accordion-collapse collapse"
@ -214,7 +223,7 @@
@if (_selectedItem != null && ShowItem)
{
<div class="card mb-3 mt-3">
<div class="card-header bg-info fw-bold text-white">Kladdelinje</div>
<div class="card-header bg-dark fw-bold text-white">Kladdelinje</div>
<div class="card-body">
<div class="row">
<div class="col col-md-4 fw-bold">
@ -259,7 +268,7 @@
@* Draft lines *@
<div class="accordion-item">
<h2 class="accordion-header" id="draftHeader">
<button class="accordion-button collapsed bg-dark text-white" type="button"
<button class="accordion-button bg-light" type="button"
data-bs-toggle="collapse" data-bs-target="#draftBody"
aria-expanded="false" aria-controls="draftBody">
Kladdelinjer <span class="mx-2 draft-expires-msg">Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet)</span>
@ -319,7 +328,7 @@
</div>
@* ---------------------------------------------- *@
@* Display action buttons *@
<div class="row mb-2">
<div class="row mt-2 mb-2">
<div class="col">
<a class="btn btn-primary" href="/company/@_company.CompanyId">Tilbage</a>
<button type="submit" class="btn btn-success" disabled="@_poFormInvalid">Tilbud</button>

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

@ -164,7 +164,7 @@ public partial class CrmActivityCreate : IDisposable
{
await StorageService.SetItemAsync(CompanyId, _purchaseOrder);
ToastService.ShowSuccess($"Aktivitet oprettet.");
//ToastService.ShowSuccess($"Aktivitet oprettet.");
}
private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
{
@ -173,6 +173,13 @@ public partial class CrmActivityCreate : IDisposable
}
private void ValidationChanged(object sender, ValidationStateChangedEventArgs e)
{
if (!string.IsNullOrEmpty(_purchaseOrder.VatNumber))
{
if(!VatUtils.ValidateFormat(_company.CountryCode, _purchaseOrder.VatNumber))
ToastService.ShowWarning("CVR / ORG nummer er ikke et gyldigt registreringsnummer");
}
if (string.IsNullOrEmpty(_purchaseOrder.ActivityType))
ToastService.ShowWarning("Aktivitet type kan ikke være tom");
_poFormInvalid = false;
_editContext.OnFieldChanged -= HandleFieldChanged;
_editContext = new EditContext(_purchaseOrder);

3
Wonky.Client/wwwroot/css/app.css
View file

@ -14,6 +14,9 @@
min-width: 24px;
min-height: 24px;
}
.text-inno {
color: #ffaa00;
}
.tombstone {
background-image: url(../gravestone.png);
}