This commit is contained in:
Frede Hundewadt 2022-10-18 13:27:57 +02:00
parent 48e07d41ca
commit a0a7273213
5 changed files with 57 additions and 32 deletions

View file

@ -21,29 +21,32 @@
@attribute [Authorize(Roles = "Advisor")] @attribute [Authorize(Roles = "Advisor")]
<h2>@_company.Name</h2> <h2>@Company.Name</h2>
@if (_activities.Any()) <div class="list-group-flush">
{ <div class="list-group-item">
<div class="list-group"> <div class="row">
<div class="list-group-item"> <div class="col">
<div class="row"> <h4>Dato</h4>
<div class="col"> </div>
<h4>Dato</h4> <div class="col">
</div> <h4>Demo</h4>
<div class="col"> </div>
<h4>Demo</h4> <div class="col">
</div> <h4>Salg</h4>
<div class="col"> </div>
<h4>Salg</h4> <div class="col">
</div> <h4>Note /Kontor</h4>
<div class="col"> </div>
<h4>Note /Kontor</h4> <div class="col">
</div> <h4>Note /Selv</h4>
<div class="col">Note /Selv</div>
</div> </div>
</div> </div>
@foreach (var activity in _activities) </div>
@if (Activities.Any())
{
@foreach (var activity in Activities)
{ {
<div class="list-group-item"> <div class="list-group-item">
<div class="row"> <div class="row">
@ -60,15 +63,25 @@
@activity.OfficeNote @activity.OfficeNote
</div> </div>
<div class="col"> <div class="col">
</div> </div>
</div> </div>
</div> </div>
} }
}
else
{
<div class="list-group-item">
<div class="row">
<div class="col">
Ingen data
</div>
</div>
</div> </div>
} }
else </div>
@if (Working)
{ {
<LoaderThreeDots/> <LoaderThreeDots Loading="Working"/>
} }

View file

@ -31,18 +31,20 @@ public partial class CrmCompanyActivityListPage : IDisposable
[Inject] public HttpInterceptorService _interceptor { get; set; } [Inject] public HttpInterceptorService _interceptor { get; set; }
[Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
[Inject] public ICrmCompanyHttpRepository _companyRepo { get; set; } [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
private List<ReportItemView> _activities { get; set; } private List<ReportItemView> Activities { get; set; } = new();
private CompanyDto _company { get; set; } private CompanyDto Company { get; set; } = new();
private bool Working { get; set; } = true;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
_interceptor.RegisterEvent(); _interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent(); _interceptor.RegisterBeforeSendEvent();
_company = await _companyRepo.GetCompanyById(CompanyId);
_activities = await CrmActivityRepo.GetCustomerActivities(CompanyId); Company = await CompanyRepo.GetCompanyById(CompanyId);
Activities = await CrmActivityRepo.GetCustomerActivities(CompanyId);
Working = false;
} }
public void Dispose() public void Dispose()

View file

@ -7,7 +7,7 @@
"image": "grumpy-coder.png" "image": "grumpy-coder.png"
}, },
"apiConfig": { "apiConfig": {
"innoBaseUrl": "https://app.innotec.dk", "innoBaseUrl": "https://dev.innotec.dk",
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
"glsId": "", "glsId": "",
"serviceVirk": "api/v2/services/virk", "serviceVirk": "api/v2/services/virk",

View file

@ -13,6 +13,8 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
// //
using System.ComponentModel.DataAnnotations;
namespace Wonky.Entity.DTO; namespace Wonky.Entity.DTO;
public class ActivityLineDto public class ActivityLineDto
@ -20,16 +22,19 @@ public class ActivityLineDto
/// <summary> /// <summary>
/// Item Sku /// Item Sku
/// </summary> /// </summary>
[MaxLength(30, ErrorMessage = "Højst 30 teng i varenummer")]
public string Sku { get; set; } = ""; public string Sku { get; set; } = "";
/// <summary> /// <summary>
/// Description /// Description
/// </summary> /// </summary>
[MaxLength(50, ErrorMessage = "Højst 50 tegn i teksten")]
public string Text { get; set; } = ""; public string Text { get; set; } = "";
/// <summary> /// <summary>
/// ShortName /// ShortName
/// </summary> /// </summary>
[MaxLength(30, ErrorMessage = "Maks 30 tegn i forkortelse")]
public string ShortName { get; set; } = ""; public string ShortName { get; set; } = "";
/// <summary> /// <summary>

View file

@ -28,6 +28,11 @@ public class CompanyDto
[MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")]
public string Name { get; set; } = ""; public string Name { get; set; } = "";
/// <summary>
/// Note
/// </summary>
[MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")]
public string Note { get; set; } = "";
/// <summary> /// <summary>
/// Postal code /// Postal code
/// </summary> /// </summary>