revert stupid change- doh!
This commit is contained in:
Frede Hundewadt
parent
f7b6225262
commit
bc22649172
111 changed files with 415 additions and 406 deletions
|
|
@ -29,7 +29,7 @@ namespace Wonky.Client.Components;
|
|||
|
||||
public partial class AdvisorCustomerListComponent
|
||||
{
|
||||
[Parameter] public List<CompanyModel> CompanyList { get; set; } = new();
|
||||
[Parameter] public List<CompanyDto> CompanyList { get; set; } = new();
|
||||
[Parameter] public EventCallback<string> OnDelete { get; set; }
|
||||
[Parameter] public EventCallback<string> OnSelect { get; set; }
|
||||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
|
|
|
|||
|
|
@ -87,6 +87,6 @@
|
|||
@code{
|
||||
|
||||
[Parameter]
|
||||
public ReportFiguresModel ReportData { get; set; } = new();
|
||||
public ReportFiguresDto ReportData { get; set; } = new();
|
||||
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ public partial class OfficeCountryCustomerListComponent
|
|||
// ******************************************************
|
||||
// parameters
|
||||
[Parameter] public string CountryCode { get; set; } = "";
|
||||
[Parameter] public List<CompanyModel> CompanyList { get; set; } = new();
|
||||
[Parameter] public List<CompanyDto> CompanyList { get; set; } = new();
|
||||
// [Parameter] public EventCallback<DraftItem> OnOrderItem { get; set; }
|
||||
[CascadingParameter] public DraftStateProvider DraftProvider { get; set; }
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ public partial class OfficeCountryCustomerListComponent
|
|||
private InvoiceListView InvoiceList { get; set; } = new();
|
||||
private List<ReportItemView> ActivityList { get; set; } = new();
|
||||
private List<ProductInventoryView> ProductList { get; set; } = new();
|
||||
private CompanyModel SelectedCompany { get; set; } = new();
|
||||
private CompanyDto SelectedCompany { get; set; } = new();
|
||||
|
||||
// ******************************************************
|
||||
// functions
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<thead>
|
||||
<tr class="bg-dark text-white opacity-75 border-bottom">
|
||||
<th></th>
|
||||
<th class="text-center" colspan="2" scope="col">Dagens Demo @(ReportDataView.NewDemoCount + ReportDataView.RecallDemoCount)</th>
|
||||
<th class="text-center" colspan="2" scope="col">Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount)</th>
|
||||
<th class="text-center border-end" colspan="2" scope="col">Dagens Resultat</th>
|
||||
<th class="text-center" colspan="4" scope="col">Måneds Resultat</th>
|
||||
</tr>
|
||||
|
|
@ -40,47 +40,47 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<th scope="row">N</th>
|
||||
<td class="text-end">@ReportDataView.NewVisitCount</td>
|
||||
<td class="text-end">@ReportDataView.NewDemoCount</td>
|
||||
<td class="text-end">@ReportDataView.NewSaleCount</td>
|
||||
<td class="text-end border-end">@ReportDataView.NewTurnover</td>
|
||||
<td class="text-end">@ReportDataView.NewVisitCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.NewDemoCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.NewSaleCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.NewTurnoverMonth</td>
|
||||
<td class="text-end">@ReportData.NewVisitCount</td>
|
||||
<td class="text-end">@ReportData.NewDemoCount</td>
|
||||
<td class="text-end">@ReportData.NewSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.NewTurnover</td>
|
||||
<td class="text-end">@ReportData.NewVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.NewTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">R</th>
|
||||
<td class="text-end">@ReportDataView.RecallVisitCount</td>
|
||||
<td class="text-end">@ReportDataView.RecallDemoCount</td>
|
||||
<td class="text-end">@ReportDataView.RecallSaleCount</td>
|
||||
<td class="text-end border-end">@ReportDataView.RecallTurnover</td>
|
||||
<td class="text-end">@ReportDataView.RecallVisitCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.RecallDemoCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.RecallSaleCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.RecallTurnoverMonth</td>
|
||||
<td class="text-end">@ReportData.RecallVisitCount</td>
|
||||
<td class="text-end">@ReportData.RecallDemoCount</td>
|
||||
<td class="text-end">@ReportData.RecallSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.RecallTurnover</td>
|
||||
<td class="text-end">@ReportData.RecallVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.RecallTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">SAS</th>
|
||||
<td class="bg-light"></td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="text-end">@ReportDataView.SasCount</td>
|
||||
<td class="text-end border-end">@ReportDataView.SasTurnover</td>
|
||||
<td class="text-end">@ReportData.SasCount</td>
|
||||
<td class="text-end border-end">@ReportData.SasTurnover</td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="bg-light"></td>
|
||||
<td class="text-end">@ReportDataView.SasCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.SasTurnoverMonth</td>
|
||||
<td class="text-end">@ReportData.SasCountMonth</td>
|
||||
<td class="text-end">@ReportData.SasTurnoverMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">TOTAL</th>
|
||||
<td class="text-end">@ReportDataView.TotalVisitCount</td>
|
||||
<td class="text-end">@ReportDataView.TotalDemoCount</td>
|
||||
<td class="text-end">@ReportDataView.TotalSaleCount</td>
|
||||
<td class="text-end border-end">@ReportDataView.TotalTurnover</td>
|
||||
<td class="text-end">@ReportDataView.TotalVisitCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.TotalDemoCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.TotalSaleCountMonth</td>
|
||||
<td class="text-end">@ReportDataView.TotalTurnoverMonth</td>
|
||||
<td class="text-end">@ReportData.TotalVisitCount</td>
|
||||
<td class="text-end">@ReportData.TotalDemoCount</td>
|
||||
<td class="text-end">@ReportData.TotalSaleCount</td>
|
||||
<td class="text-end border-end">@ReportData.TotalTurnover</td>
|
||||
<td class="text-end">@ReportData.TotalVisitCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalDemoCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalSaleCountMonth</td>
|
||||
<td class="text-end">@ReportData.TotalTurnoverMonth</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -88,5 +88,5 @@
|
|||
</div>
|
||||
|
||||
@code{
|
||||
[Parameter] public ReportDataView ReportDataView { get; set; } = new();
|
||||
[Parameter] public ReportData ReportData { get; set; } = new();
|
||||
}
|
||||
|
|
@ -26,27 +26,27 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">Aften</th>
|
||||
<td class="text-end">@ReportDataView.KmEvening</td>
|
||||
<td class="text-end">@ReportData.KmEvening</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Morgen</th>
|
||||
<td class="text-end">@ReportDataView.KmMorning</td>
|
||||
<td class="text-end">@ReportData.KmMorning</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Kørt Dag</th>
|
||||
<td class="text-end">@ReportDataView.Distance</td>
|
||||
<td class="text-end">@ReportData.Distance</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Kørt Md.</th>
|
||||
<td class="text-end">@ReportDataView.DistanceMonth</td>
|
||||
<td class="text-end">@ReportData.DistanceMonth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Privat</th>
|
||||
<td class="text-end">@ReportDataView.DistancePrivate</td>
|
||||
<td class="text-end">@ReportData.DistancePrivate</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Privat Md.</th>
|
||||
<td class="text-end">@ReportDataView.DistancePrivateMonth</td>
|
||||
<td class="text-end">@ReportData.DistancePrivateMonth</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ namespace Wonky.Client.Components;
|
|||
|
||||
public partial class ReportDistanceLedgerComponent
|
||||
{
|
||||
[Parameter] public ReportDataView ReportDataView { get; set; } = new();
|
||||
[Parameter] public ReportData ReportData { get; set; } = new();
|
||||
|
||||
}
|
||||
|
|
@ -24,20 +24,20 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">Beskrivelse</th>
|
||||
<td colspan="2">@ReportDataView.Description</td>
|
||||
<td colspan="2">@ReportData.Description</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Supervisor</th>
|
||||
<td colspan="2">@ReportDataView.SupervisedBy</td>
|
||||
<td colspan="2">@ReportData.SupervisedBy</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Dækkende</th>
|
||||
<td colspan="2">
|
||||
@{
|
||||
switch (ReportDataView.DayTypeEnum)
|
||||
switch (ReportData.DayTypeEnum)
|
||||
{
|
||||
case "Sales":
|
||||
<span>Salgsdag @ReportDataView.SalesDayNumber</span>
|
||||
<span>Salgsdag @ReportData.SalesDayNumber</span>
|
||||
break;
|
||||
case "SickLeave":
|
||||
<span>Sygefravær</span>
|
||||
|
|
@ -65,16 +65,16 @@
|
|||
<th scope="row">Periode</th>
|
||||
<td>
|
||||
@{
|
||||
switch (ReportDataView.DayTypeEnum)
|
||||
switch (ReportData.DayTypeEnum)
|
||||
{
|
||||
case "Sales":
|
||||
<span>@(ReportDataView.FromDateTime.Split(" ")[1])</span>
|
||||
<span>@(ReportData.FromDateTime.Split(" ")[1])</span>
|
||||
break;
|
||||
case "SickLeave":
|
||||
<span>@(ReportDataView.FromDateTime.Split(" ")[0])</span>
|
||||
<span>@(ReportData.FromDateTime.Split(" ")[0])</span>
|
||||
break;
|
||||
case "Leave":
|
||||
<span>@(ReportDataView.FromDateTime.Split(" ")[0])</span>
|
||||
<span>@(ReportData.FromDateTime.Split(" ")[0])</span>
|
||||
break;
|
||||
case "Office":
|
||||
<span></span>
|
||||
|
|
@ -90,16 +90,16 @@
|
|||
</td>
|
||||
<td>
|
||||
@{
|
||||
switch (ReportDataView.DayTypeEnum)
|
||||
switch (ReportData.DayTypeEnum)
|
||||
{
|
||||
case "Sales":
|
||||
<span>@(ReportDataView.ToDateTime.Split(" ")[1])</span>
|
||||
<span>@(ReportData.ToDateTime.Split(" ")[1])</span>
|
||||
break;
|
||||
case "SickLeave":
|
||||
<span>@(ReportDataView.ToDateTime.Split(" ")[0])</span>
|
||||
<span>@(ReportData.ToDateTime.Split(" ")[0])</span>
|
||||
break;
|
||||
case "Leave":
|
||||
<span>@(ReportDataView.ToDateTime.Split(" ")[0])</span>
|
||||
<span>@(ReportData.ToDateTime.Split(" ")[0])</span>
|
||||
break;
|
||||
case "Office":
|
||||
<span></span>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ namespace Wonky.Client.Components;
|
|||
|
||||
public partial class ReportSummaryComponent
|
||||
{
|
||||
[Parameter] public ReportDataView ReportDataView { get; set; } = new();
|
||||
[Parameter] public ReportData ReportData { get; set; } = new();
|
||||
|
||||
}
|
||||
|
|
@ -24,7 +24,7 @@ namespace Wonky.Client.Components;
|
|||
|
||||
public partial class TaskItemTableComponent
|
||||
{
|
||||
[Parameter] public List<TaskItemModel> TaskItemList { get; set; } = new();
|
||||
[Parameter] public List<TaskItemDto> TaskItemList { get; set; } = new();
|
||||
[Parameter] public EventCallback<string> OnDeleteTask { get; set; }
|
||||
[Parameter] public EventCallback<string> OnCompleteTask { get; set; }
|
||||
[Parameter] public EventCallback<string> OnTaskCompleted { get; set; }
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ internal interface IValidator<in T>
|
|||
bool Validate(T t);
|
||||
}
|
||||
|
||||
public class CustomerValidator : IValidator<CompanyModel>
|
||||
public class CustomerValidator : IValidator<CompanyDto>
|
||||
{
|
||||
public bool Validate(CompanyModel t)
|
||||
public bool Validate(CompanyDto t)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(t.Name)
|
||||
|| string.IsNullOrWhiteSpace(t.ZipCode)
|
||||
|
|
|
|||
|
|
@ -80,11 +80,11 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository
|
|||
/// <summary>
|
||||
/// Create new activity
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="activity"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ApiResponseView> CreateActivity(ActivityModel model)
|
||||
public async Task<ApiResponseView> CreateActivity(ActivityDto activity)
|
||||
{
|
||||
var response = await _client.PostAsJsonAsync($"{_api.CrmActivities}", model, _options);
|
||||
var response = await _client.PostAsJsonAsync($"{_api.CrmActivities}", activity, _options);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
var result = JsonSerializer.Deserialize<ApiResponseView>(content, _options);
|
||||
if (result.IsSuccess) return result!;
|
||||
|
|
@ -115,11 +115,11 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository
|
|||
/// </summary>
|
||||
/// <param name="activityId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ActivityModel> GetActivity(string activityId)
|
||||
public async Task<ActivityDto> GetActivity(string activityId)
|
||||
{
|
||||
var salesItem = await _client
|
||||
.GetFromJsonAsync<ActivityModel>($"{_api.CrmActivities}/{activityId}");
|
||||
return salesItem ?? new ActivityModel();
|
||||
.GetFromJsonAsync<ActivityDto>($"{_api.CrmActivities}/{activityId}");
|
||||
return salesItem ?? new ActivityDto();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -173,7 +173,7 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository
|
|||
/// Update office note for activity
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
public async Task UpdateOfficeNote(ActivityOfficeNoteModel model)
|
||||
public async Task UpdateOfficeNote(ActivityOfficeNote model)
|
||||
{
|
||||
await _client.PutAsJsonAsync($"{_api.CrmActivities}/note/{model.ActivityId}", model, _options);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@ public class AdvisorContactRepository : IAdvisorContactRepository
|
|||
/// <summary>
|
||||
/// Create Contact
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="contact"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<string> CreateContact(ContactModel model)
|
||||
public async Task<string> CreateContact(ContactDto contact)
|
||||
{
|
||||
var response = await _client.PostAsJsonAsync(
|
||||
$"{_conf.CrmCustomers}/{model.CompanyId}/contacts", model, _options);
|
||||
$"{_conf.CrmCustomers}/{contact.CompanyId}/contacts", contact, _options);
|
||||
|
||||
return await response.Content.ReadAsStringAsync();
|
||||
}
|
||||
|
|
@ -63,9 +63,9 @@ public class AdvisorContactRepository : IAdvisorContactRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="contactId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ContactModel> GetContact(string companyId, string contactId)
|
||||
public async Task<ContactDto> GetContact(string companyId, string contactId)
|
||||
{
|
||||
return await _client.GetFromJsonAsync<ContactModel>(
|
||||
return await _client.GetFromJsonAsync<ContactDto>(
|
||||
$"{_conf.CrmCustomers}/{companyId}/contacts/{contactId}");
|
||||
}
|
||||
|
||||
|
|
@ -74,14 +74,14 @@ public class AdvisorContactRepository : IAdvisorContactRepository
|
|||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<List<ContactModel>> GetContacts(string companyId)
|
||||
public async Task<List<ContactDto>> GetContacts(string companyId)
|
||||
{
|
||||
var response = await _client.GetAsync(
|
||||
$"{_conf.CrmCustomers}/{companyId}/contacts");
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
return string.IsNullOrWhiteSpace(content)
|
||||
? new List<ContactModel>()
|
||||
: JsonSerializer.Deserialize<List<ContactModel>>(content, _options);
|
||||
? new List<ContactDto>()
|
||||
: JsonSerializer.Deserialize<List<ContactDto>>(content, _options);
|
||||
}
|
||||
/// <summary>
|
||||
/// Delete Contact
|
||||
|
|
@ -98,11 +98,11 @@ public class AdvisorContactRepository : IAdvisorContactRepository
|
|||
/// <summary>
|
||||
/// Update Contact
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="contact"></param>
|
||||
/// <returns></returns>
|
||||
public async Task UpdateContact(ContactModel model)
|
||||
public async Task UpdateContact(ContactDto contact)
|
||||
{
|
||||
await _client.PutAsJsonAsync(
|
||||
$"{_conf.CrmCustomers}/{model.CompanyId}/contacts/{model.ContactId}", model, _options);
|
||||
$"{_conf.CrmCustomers}/{contact.CompanyId}/contacts/{contact.ContactId}", contact, _options);
|
||||
}
|
||||
}
|
||||
|
|
@ -55,7 +55,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
|
|||
/// </summary>
|
||||
/// <param name="pagingParameters"></param>
|
||||
/// <returns>A paged response defined by pagingParameters</returns>
|
||||
public async Task<PagingResponse<CompanyModel>> GetCompanies(CustomerPaging pagingParameters)
|
||||
public async Task<PagingResponse<CompanyDto>> GetCompanies(CustomerPaging pagingParameters)
|
||||
{
|
||||
var queryString = new Dictionary<string, string>
|
||||
{
|
||||
|
|
@ -71,18 +71,18 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
|
|||
|
||||
if (!response.IsSuccessStatusCode)
|
||||
{
|
||||
return new PagingResponse<CompanyModel>
|
||||
return new PagingResponse<CompanyDto>
|
||||
{
|
||||
Items = new List<CompanyModel>(),
|
||||
Items = new List<CompanyDto>(),
|
||||
MetaData = new MetaData()
|
||||
};
|
||||
}
|
||||
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
|
||||
var pagingResponse = new PagingResponse<CompanyModel>
|
||||
var pagingResponse = new PagingResponse<CompanyDto>
|
||||
{
|
||||
Items = JsonSerializer.Deserialize<List<CompanyModel>>(content, _options),
|
||||
Items = JsonSerializer.Deserialize<List<CompanyDto>>(content, _options),
|
||||
MetaData = JsonSerializer.Deserialize<MetaData>(response.Headers.GetValues("X-Pagination").First(),
|
||||
_options)
|
||||
};
|
||||
|
|
@ -94,21 +94,21 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
|
|||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
public async Task<CompanyModel> GetCompanyById(string companyId)
|
||||
public async Task<CompanyDto> GetCompanyById(string companyId)
|
||||
{
|
||||
return await _client.GetFromJsonAsync<CompanyModel>($"{_conf.CrmCustomers}/{companyId}", _options);
|
||||
return await _client.GetFromJsonAsync<CompanyDto>($"{_conf.CrmCustomers}/{companyId}", _options);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Create Customer (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns>The Id of the entity</returns>
|
||||
public async Task<string> CreateCompany(CompanyModel model)
|
||||
public async Task<string> CreateCompany(CompanyDto company)
|
||||
{
|
||||
var response = await _client.PostAsJsonAsync($"{_conf.CrmCustomers}", model, _options);
|
||||
var response = await _client.PostAsJsonAsync($"{_conf.CrmCustomers}", company, _options);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
var result = JsonSerializer.Deserialize<CompanyModel>(content, _options);
|
||||
var result = JsonSerializer.Deserialize<CompanyDto>(content, _options);
|
||||
return result.CompanyId;
|
||||
}
|
||||
|
||||
|
|
@ -127,48 +127,48 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
|
|||
/// Update CRM customer properties (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
public async Task<CompanyModel> UpdateCrmData(string companyId, CompanyModel model)
|
||||
public async Task<CompanyDto> UpdateCrmData(string companyId, CompanyDto company)
|
||||
{
|
||||
var updateModel = new UpdateCrmModel
|
||||
var updateModel = new UpdateCrmDto
|
||||
{
|
||||
Interval = model.Interval,
|
||||
Note = model.Note,
|
||||
CrmNotes = model.CrmNotes,
|
||||
IsHidden = model.IsHidden,
|
||||
LastVisit = model.LastVisit,
|
||||
NextVisit = model.NextVisit
|
||||
Interval = company.Interval,
|
||||
Note = company.Note,
|
||||
CrmNotes = company.CrmNotes,
|
||||
IsHidden = company.IsHidden,
|
||||
LastVisit = company.LastVisit,
|
||||
NextVisit = company.NextVisit
|
||||
};
|
||||
var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/crmData", updateModel, _options);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
return JsonSerializer.Deserialize<CompanyModel>(content);
|
||||
return JsonSerializer.Deserialize<CompanyDto>(content);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Update ERP customer properties (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
public async Task<CompanyModel> UpdateErpData(string companyId, CompanyModel model)
|
||||
public async Task<CompanyDto> UpdateErpData(string companyId, CompanyDto company)
|
||||
{
|
||||
var updateModel = new UpdateErpModel
|
||||
var updateModel = new UpdateErpDto
|
||||
{
|
||||
Address1 = model.Address1,
|
||||
Address2 = model.Address2,
|
||||
Attention = model.Attention,
|
||||
City = model.City,
|
||||
Email = model.Email,
|
||||
Mobile = model.Mobile,
|
||||
Name = model.Name,
|
||||
Phone = model.Phone,
|
||||
ZipCode = model.ZipCode
|
||||
Address1 = company.Address1,
|
||||
Address2 = company.Address2,
|
||||
Attention = company.Attention,
|
||||
City = company.City,
|
||||
Email = company.Email,
|
||||
Mobile = company.Mobile,
|
||||
Name = company.Name,
|
||||
Phone = company.Phone,
|
||||
ZipCode = company.ZipCode
|
||||
};
|
||||
|
||||
var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/erpData", updateModel, _options);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
return JsonSerializer.Deserialize<CompanyModel>(content);
|
||||
return JsonSerializer.Deserialize<CompanyDto>(content);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -177,7 +177,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="vatNumber"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
public async Task<CompanyModel> UpdateCompanyVat(string companyId, string vatNumber)
|
||||
public async Task<CompanyDto> UpdateCompanyVat(string companyId, string vatNumber)
|
||||
{
|
||||
var model = new Dictionary<string, string>
|
||||
{
|
||||
|
|
@ -185,10 +185,10 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
|
|||
};
|
||||
var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/vat", model, _options);
|
||||
if (!response.IsSuccessStatusCode)
|
||||
return new CompanyModel();
|
||||
return new CompanyDto();
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
return JsonSerializer.Deserialize<CompanyModel>(content)
|
||||
?? new CompanyModel { Name = "ERROR", VatNumber = vatNumber, CrmNotes = $"FEJL: {content}" };
|
||||
return JsonSerializer.Deserialize<CompanyDto>(content)
|
||||
?? new CompanyDto { Name = "ERROR", VatNumber = vatNumber, CrmNotes = $"FEJL: {content}" };
|
||||
}
|
||||
|
||||
// public async Task<bool> ToggleVisibility(string companyId, bool hide)
|
||||
|
|
|
|||
|
|
@ -85,23 +85,23 @@ public class AdvisorReportRepository : IAdvisorReportRepository
|
|||
/// </summary>
|
||||
/// <param name="workDate"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ReportInitModel> InitializeReportData(string workDate)
|
||||
public async Task<ReportInitDto> InitializeReportData(string workDate)
|
||||
{
|
||||
var initData = await _client
|
||||
.GetFromJsonAsync<ReportInitModel>($"{_api.CrmReports}/init/{workDate}");
|
||||
return initData ?? new ReportInitModel();
|
||||
.GetFromJsonAsync<ReportInitDto>($"{_api.CrmReports}/init/{workDate}");
|
||||
return initData ?? new ReportInitDto();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Create Report for given data - using reportData
|
||||
/// </summary>
|
||||
/// <param name="workDate"></param>
|
||||
/// <param name="reportModel"></param>
|
||||
/// <param name="reportDto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ApiResponseView> CreateReport(string workDate, ReportModel reportModel)
|
||||
public async Task<ApiResponseView> CreateReport(string workDate, ReportDto reportDto)
|
||||
{
|
||||
var response = await _client
|
||||
.PostAsJsonAsync($"{_api.CrmReports}/{workDate}", reportModel, _options);
|
||||
.PostAsJsonAsync($"{_api.CrmReports}/{workDate}", reportDto, _options);
|
||||
if (!response.IsSuccessStatusCode)
|
||||
return new ApiResponseView
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository
|
|||
/// Get Task List (SalesRep)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public async Task<List<TaskItemModel>> GetTaskList()
|
||||
public async Task<List<TaskItemDto>> GetTaskList()
|
||||
{
|
||||
return await _client.GetFromJsonAsync<List<TaskItemModel>>($"{_apiConfig.CrmTasks}", _options);
|
||||
return await _client.GetFromJsonAsync<List<TaskItemDto>>($"{_apiConfig.CrmTasks}", _options);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -59,9 +59,9 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository
|
|||
/// </summary>
|
||||
/// <param name="workDate"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<List<TaskItemModel>> GetTaskList(string workDate)
|
||||
public async Task<List<TaskItemDto>> GetTaskList(string workDate)
|
||||
{
|
||||
return await _client.GetFromJsonAsync<List<TaskItemModel>>($"{_apiConfig.CrmTasks}/date/{workDate}", _options);
|
||||
return await _client.GetFromJsonAsync<List<TaskItemDto>>($"{_apiConfig.CrmTasks}/date/{workDate}", _options);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -69,9 +69,9 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository
|
|||
/// </summary>
|
||||
/// <param name="taskItemId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<TaskItemModel> GetTaskItem(string taskItemId)
|
||||
public async Task<TaskItemDto> GetTaskItem(string taskItemId)
|
||||
{
|
||||
return await _client.GetFromJsonAsync<TaskItemModel>($"{_apiConfig.CrmTasks}/{taskItemId}", _options);
|
||||
return await _client.GetFromJsonAsync<TaskItemDto>($"{_apiConfig.CrmTasks}/{taskItemId}", _options);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -79,7 +79,7 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository
|
|||
/// </summary>
|
||||
/// <param name="taskItem"></param>
|
||||
/// <returns></returns>
|
||||
public async Task CreateTaskItem(TaskItemModel taskItem)
|
||||
public async Task CreateTaskItem(TaskItemDto taskItem)
|
||||
{
|
||||
await _client.PostAsJsonAsync($"{_apiConfig.CrmTasks}", taskItem, _options);
|
||||
}
|
||||
|
|
@ -89,7 +89,7 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository
|
|||
/// </summary>
|
||||
/// <param name="taskItemId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task UpdateTaskItem(string taskItemId, TaskItemModel taskItem)
|
||||
public async Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem)
|
||||
{
|
||||
await _client.PutAsJsonAsync($"{_apiConfig.CrmTasks}/{taskItemId}", taskItem, _options);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="workplaceId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<WorkplaceModel> GetWorkplace(string companyId, string workplaceId)
|
||||
public async Task<WorkplaceDto> GetWorkplace(string companyId, string workplaceId)
|
||||
{
|
||||
var result = await _client.GetFromJsonAsync<WorkplaceModel>(
|
||||
var result = await _client.GetFromJsonAsync<WorkplaceDto>(
|
||||
$"{_api.CrmCustomers}/{companyId}/{_api.CrmWorkplaceExt}/{workplaceId}", _options);
|
||||
return result ?? new WorkplaceModel();
|
||||
return result ?? new WorkplaceDto();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -77,7 +77,7 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="workplace"></param>
|
||||
/// <returns></returns>
|
||||
public async Task CreateWorkplace(string companyId, WorkplaceModel workplace)
|
||||
public async Task CreateWorkplace(string companyId, WorkplaceDto workplace)
|
||||
{
|
||||
await _client.PostAsJsonAsync(
|
||||
$"{_api.CrmCustomers}/{companyId}/{_api.CrmWorkplaceExt}", workplace, _options);
|
||||
|
|
@ -89,7 +89,7 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="workplace"></param>
|
||||
/// <returns></returns>
|
||||
public async Task UpdateWorkplace(string companyId, WorkplaceModel workplace)
|
||||
public async Task UpdateWorkplace(string companyId, WorkplaceDto workplace)
|
||||
{
|
||||
await _client.PutAsJsonAsync(
|
||||
$"{_api.CrmCustomers}/{companyId}/{_api.CrmWorkplaceExt}/{workplace.WorkplaceId}", workplace, _options);
|
||||
|
|
|
|||
|
|
@ -53,11 +53,11 @@ public class CountryActivityRepository : ICountryActivityRepository
|
|||
/// </summary>
|
||||
/// <param name="activityId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ActivityModel> RequestActivity(string activityId)
|
||||
public async Task<ActivityDto> RequestActivity(string activityId)
|
||||
{
|
||||
var activity = await _client
|
||||
.GetFromJsonAsync<ActivityModel>($"{_api.CrmActivities}/{activityId}");
|
||||
return activity ?? new ActivityModel();
|
||||
.GetFromJsonAsync<ActivityDto>($"{_api.CrmActivities}/{activityId}");
|
||||
return activity ?? new ActivityDto();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -76,7 +76,7 @@ public class CountryActivityRepository : ICountryActivityRepository
|
|||
: JsonSerializer.Deserialize<List<ReportItemView>>(content, _options);
|
||||
}
|
||||
|
||||
public async Task<ApiResponseView> CreatePhoneOrder(string customerId, ActivityModel activity)
|
||||
public async Task<ApiResponseView> CreatePhoneOrder(string customerId, ActivityDto activity)
|
||||
{
|
||||
var response = await _client.PostAsJsonAsync($"{_api.OfficeCustomers}/{activity.CountryCode}/id/{customerId}/activities", activity);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository
|
|||
/// <param name="paging"></param>
|
||||
/// <param name="countryCode"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<PagingResponse<CompanyModel>> GetCompaniesPaged(string countryCode, CustomerPaging paging)
|
||||
public async Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, CustomerPaging paging)
|
||||
{
|
||||
var queryString = new Dictionary<string, string>
|
||||
{
|
||||
|
|
@ -72,9 +72,9 @@ public class CountryCustomerRepository : ICountryCustomerRepository
|
|||
var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/{countryCode}", queryString));
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
|
||||
var pagingResponse = new PagingResponse<CompanyModel>
|
||||
var pagingResponse = new PagingResponse<CompanyDto>
|
||||
{
|
||||
Items = JsonSerializer.Deserialize<List<CompanyModel>>(content, _options),
|
||||
Items = JsonSerializer.Deserialize<List<CompanyDto>>(content, _options),
|
||||
MetaData = JsonSerializer.Deserialize<MetaData>(response.Headers.GetValues("X-Pagination").First(), _options)
|
||||
};
|
||||
return pagingResponse;
|
||||
|
|
@ -87,7 +87,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository
|
|||
/// <param name="salesRepId"></param>
|
||||
/// <param name="paging"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<PagingResponse<CompanyModel>> GetCompaniesPaged(string countryCode, string salesRepId,
|
||||
public async Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, string salesRepId,
|
||||
CustomerPaging paging)
|
||||
{
|
||||
var queryString = new Dictionary<string, string>
|
||||
|
|
@ -103,9 +103,9 @@ public class CountryCustomerRepository : ICountryCustomerRepository
|
|||
|
||||
var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/{countryCode}/salesRep/{salesRepId}/", queryString));
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
var pagingResponse = new PagingResponse<CompanyModel>
|
||||
var pagingResponse = new PagingResponse<CompanyDto>
|
||||
{
|
||||
Items = JsonSerializer.Deserialize<List<CompanyModel>>(content, _options),
|
||||
Items = JsonSerializer.Deserialize<List<CompanyDto>>(content, _options),
|
||||
MetaData = JsonSerializer.Deserialize<MetaData>(response.Headers.GetValues("X-Pagination").First(), _options)
|
||||
};
|
||||
return pagingResponse;
|
||||
|
|
@ -118,10 +118,10 @@ public class CountryCustomerRepository : ICountryCustomerRepository
|
|||
/// <param name="countryCode"></param>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<CompanyModel> GetByCustomerId(string countryCode, string companyId)
|
||||
public async Task<CompanyDto> GetByCustomerId(string countryCode, string companyId)
|
||||
{
|
||||
var company = await _client.GetFromJsonAsync<CompanyModel>($"{_api.OfficeCustomers}/{countryCode}/id/{companyId}");
|
||||
return company ?? new CompanyModel();
|
||||
var company = await _client.GetFromJsonAsync<CompanyDto>($"{_api.OfficeCustomers}/{countryCode}/id/{companyId}");
|
||||
return company ?? new CompanyDto();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -129,11 +129,11 @@ public class CountryCustomerRepository : ICountryCustomerRepository
|
|||
/// </summary>
|
||||
/// <param name="countryCode"></param>
|
||||
/// <param name="companyId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<bool> UpdateCompany(string countryCode, string companyId, CompanyModel model)
|
||||
public async Task<bool> UpdateCompany(string countryCode, string companyId, CompanyDto company)
|
||||
{
|
||||
var response = await _client.PutAsJsonAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}", model);
|
||||
var response = await _client.PutAsJsonAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}", company);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
Console.WriteLine(content);
|
||||
return response.IsSuccessStatusCode;
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ public interface IAdvisorActivityRepository
|
|||
/// <summary>
|
||||
/// Create new activity
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="activity"></param>
|
||||
/// <returns></returns>
|
||||
Task<ApiResponseView> CreateActivity(ActivityModel model);
|
||||
Task<ApiResponseView> CreateActivity(ActivityDto activity);
|
||||
|
||||
/// <summary>
|
||||
/// Get activities by date
|
||||
|
|
@ -55,7 +55,7 @@ public interface IAdvisorActivityRepository
|
|||
/// </summary>
|
||||
/// <param name="activityId"></param>
|
||||
/// <returns></returns>
|
||||
Task<ActivityModel> GetActivity(string activityId);
|
||||
Task<ActivityDto> GetActivity(string activityId);
|
||||
|
||||
/// <summary>
|
||||
/// Get activities for customer Id
|
||||
|
|
@ -82,5 +82,5 @@ public interface IAdvisorActivityRepository
|
|||
/// Update office note for activity
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
Task UpdateOfficeNote(ActivityOfficeNoteModel model);
|
||||
Task UpdateOfficeNote(ActivityOfficeNote model);
|
||||
}
|
||||
|
|
@ -26,9 +26,9 @@ public interface IAdvisorContactRepository
|
|||
/// <summary>
|
||||
/// Create Contact
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="contact"></param>
|
||||
/// <returns></returns>
|
||||
Task<string> CreateContact(ContactModel model);
|
||||
Task<string> CreateContact(ContactDto contact);
|
||||
|
||||
/// <summary>
|
||||
/// Get Contact
|
||||
|
|
@ -36,14 +36,14 @@ public interface IAdvisorContactRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="contactId"></param>
|
||||
/// <returns></returns>
|
||||
Task<ContactModel> GetContact(string companyId, string contactId);
|
||||
Task<ContactDto> GetContact(string companyId, string contactId);
|
||||
|
||||
/// <summary>
|
||||
/// Get Contacts
|
||||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns></returns>
|
||||
Task<List<ContactModel>> GetContacts(string companyId);
|
||||
Task<List<ContactDto>> GetContacts(string companyId);
|
||||
|
||||
/// <summary>
|
||||
/// Delete Contact
|
||||
|
|
@ -56,7 +56,7 @@ public interface IAdvisorContactRepository
|
|||
/// <summary>
|
||||
/// Update Contact
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="contact"></param>
|
||||
/// <returns></returns>
|
||||
Task UpdateContact(ContactModel model);
|
||||
Task UpdateContact(ContactDto contact);
|
||||
}
|
||||
|
|
@ -29,21 +29,21 @@ public interface IAdvisorCustomerRepository
|
|||
/// </summary>
|
||||
/// <param name="pagingParameters"></param>
|
||||
/// <returns>A paged response defined by pagingParameters</returns>
|
||||
Task<PagingResponse<CompanyModel>> GetCompanies(CustomerPaging pagingParameters);
|
||||
Task<PagingResponse<CompanyDto>> GetCompanies(CustomerPaging pagingParameters);
|
||||
|
||||
/// <summary>
|
||||
/// Get CRM customer by Id (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
Task<CompanyModel> GetCompanyById(string companyId);
|
||||
Task<CompanyDto> GetCompanyById(string companyId);
|
||||
|
||||
/// <summary>
|
||||
/// Create Customer (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns>The Id of the entity</returns>
|
||||
Task<string> CreateCompany(CompanyModel model);
|
||||
Task<string> CreateCompany(CompanyDto company);
|
||||
|
||||
/// <summary>
|
||||
/// Delete the CRM customer (SalesRep)
|
||||
|
|
@ -56,17 +56,17 @@ public interface IAdvisorCustomerRepository
|
|||
/// Update CRM customer properties (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
Task<CompanyModel> UpdateCrmData(string companyId, CompanyModel model);
|
||||
Task<CompanyDto> UpdateCrmData(string companyId, CompanyDto company);
|
||||
|
||||
/// <summary>
|
||||
/// Update ERP customer properties (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="companyId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
Task<CompanyModel> UpdateErpData(string companyId, CompanyModel model);
|
||||
Task<CompanyDto> UpdateErpData(string companyId, CompanyDto company);
|
||||
|
||||
/// <summary>
|
||||
/// Update customer Vat Number (SalesRep)
|
||||
|
|
@ -74,7 +74,7 @@ public interface IAdvisorCustomerRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="vatNumber"></param>
|
||||
/// <returns>A CRM Company entity</returns>
|
||||
Task<CompanyModel> UpdateCompanyVat(string companyId, string vatNumber);
|
||||
Task<CompanyDto> UpdateCompanyVat(string companyId, string vatNumber);
|
||||
|
||||
// Task<bool> ToggleVisibility(string companyId, bool hide);
|
||||
}
|
||||
|
|
@ -48,13 +48,13 @@ public interface IAdvisorReportRepository
|
|||
/// </summary>
|
||||
/// <param name="workDate"></param>
|
||||
/// <returns></returns>
|
||||
Task<ReportInitModel> InitializeReportData(string workDate);
|
||||
Task<ReportInitDto> InitializeReportData(string workDate);
|
||||
|
||||
/// <summary>
|
||||
/// Create Report for given data - using reportData
|
||||
/// </summary>
|
||||
/// <param name="workDate"></param>
|
||||
/// <param name="reportModel"></param>
|
||||
/// <param name="reportDto"></param>
|
||||
/// <returns></returns>
|
||||
Task<ApiResponseView> CreateReport(string workDate, ReportModel reportModel);
|
||||
Task<ApiResponseView> CreateReport(string workDate, ReportDto reportDto);
|
||||
}
|
||||
|
|
@ -26,35 +26,35 @@ public interface IAdvisorTaskItemRepository
|
|||
/// Get Task List (SalesRep)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
Task<List<TaskItemModel>> GetTaskList();
|
||||
Task<List<TaskItemDto>> GetTaskList();
|
||||
|
||||
/// <summary>
|
||||
/// Get Task List for given workDate (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="workDate"></param>
|
||||
/// <returns></returns>
|
||||
Task<List<TaskItemModel>> GetTaskList(string workDate);
|
||||
Task<List<TaskItemDto>> GetTaskList(string workDate);
|
||||
|
||||
/// <summary>
|
||||
/// Get Task Item by id (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="taskItemId"></param>
|
||||
/// <returns></returns>
|
||||
Task<TaskItemModel> GetTaskItem(string taskItemId);
|
||||
Task<TaskItemDto> GetTaskItem(string taskItemId);
|
||||
|
||||
/// <summary>
|
||||
/// Create task using taskItem (SalesRep)
|
||||
/// </summary>
|
||||
/// <param name="taskItem"></param>
|
||||
/// <returns></returns>
|
||||
Task CreateTaskItem(TaskItemModel taskItem);
|
||||
Task CreateTaskItem(TaskItemDto taskItem);
|
||||
|
||||
/// <summary>
|
||||
/// Delete Task Item (SalesRep
|
||||
/// </summary>
|
||||
/// <param name="taskItemId"></param>
|
||||
/// <returns></returns>
|
||||
Task UpdateTaskItem(string taskItemId, TaskItemModel taskItem);
|
||||
Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem);
|
||||
|
||||
/// <summary>
|
||||
/// Delete Task Item (SalesRep
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public interface IAdvisorWorkplaceRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="workplaceId"></param>
|
||||
/// <returns></returns>
|
||||
Task<WorkplaceModel> GetWorkplace(string companyId, string workplaceId);
|
||||
Task<WorkplaceDto> GetWorkplace(string companyId, string workplaceId);
|
||||
|
||||
/// <summary>
|
||||
/// Create new workplace given the customer id and workplace data
|
||||
|
|
@ -44,7 +44,7 @@ public interface IAdvisorWorkplaceRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="workplace"></param>
|
||||
/// <returns></returns>
|
||||
Task CreateWorkplace(string companyId, WorkplaceModel workplace);
|
||||
Task CreateWorkplace(string companyId, WorkplaceDto workplace);
|
||||
|
||||
/// <summary>
|
||||
/// Update workplace given the customer id and updated data
|
||||
|
|
@ -52,7 +52,7 @@ public interface IAdvisorWorkplaceRepository
|
|||
/// <param name="companyId"></param>
|
||||
/// <param name="workplace"></param>
|
||||
/// <returns></returns>
|
||||
Task UpdateWorkplace(string companyId, WorkplaceModel workplace);
|
||||
Task UpdateWorkplace(string companyId, WorkplaceDto workplace);
|
||||
|
||||
/// <summary>
|
||||
/// Delete workplace given customer id and workplace id
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public interface ICountryActivityRepository
|
|||
/// </summary>
|
||||
/// <param name="activityId"></param>
|
||||
/// <returns></returns>
|
||||
Task<ActivityModel> RequestActivity(string activityId);
|
||||
Task<ActivityDto> RequestActivity(string activityId);
|
||||
|
||||
/// <summary>
|
||||
/// Get activities for customer Id
|
||||
|
|
@ -37,5 +37,5 @@ public interface ICountryActivityRepository
|
|||
/// <returns></returns>
|
||||
Task<List<ReportItemView>> RequestActivityList(string customerId);
|
||||
|
||||
Task<ApiResponseView> CreatePhoneOrder(string customerId, ActivityModel activity);
|
||||
Task<ApiResponseView> CreatePhoneOrder(string customerId, ActivityDto activity);
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ public interface ICountryCustomerRepository
|
|||
/// <param name="paging"></param>
|
||||
/// <param name="countryCode"></param>
|
||||
/// <returns></returns>
|
||||
Task<PagingResponse<CompanyModel>> GetCompaniesPaged(string countryCode, CustomerPaging paging);
|
||||
Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, CustomerPaging paging);
|
||||
|
||||
/// <summary>
|
||||
/// Get customers paged for given sales rep
|
||||
|
|
@ -39,7 +39,7 @@ public interface ICountryCustomerRepository
|
|||
/// <param name="salesRepId"></param>
|
||||
/// <param name="paging"></param>
|
||||
/// <returns></returns>
|
||||
Task<PagingResponse<CompanyModel>> GetCompaniesPaged(string countryCode, string salesRepId, CustomerPaging paging);
|
||||
Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, string salesRepId, CustomerPaging paging);
|
||||
|
||||
/// <summary>
|
||||
/// Get customer by Id
|
||||
|
|
@ -47,14 +47,14 @@ public interface ICountryCustomerRepository
|
|||
/// <param name="countryCode"></param>
|
||||
/// <param name="companyId"></param>
|
||||
/// <returns></returns>
|
||||
Task<CompanyModel> GetByCustomerId(string countryCode, string companyId);
|
||||
Task<CompanyDto> GetByCustomerId(string countryCode, string companyId);
|
||||
|
||||
/// <summary>
|
||||
/// Update Company data
|
||||
/// </summary>
|
||||
/// <param name="countryCode"></param>
|
||||
/// <param name="companyId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns></returns>
|
||||
Task<bool> UpdateCompany(string countryCode, string companyId, CompanyModel model);
|
||||
Task<bool> UpdateCompany(string countryCode, string companyId, CompanyDto company);
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ public interface IOrderProcessRepository
|
|||
/// <summary>
|
||||
/// Update Order status setting new process status
|
||||
/// </summary>
|
||||
/// <param name="processStateModel"></param>
|
||||
/// <param name="processState"></param>
|
||||
/// <returns></returns>
|
||||
Task UpdateWarehouseOrderStatus(OrderProcessStateModel processStateModel);
|
||||
Task UpdateWarehouseOrderStatus(OrderProcessState processState);
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ public interface ISystemSendMailService
|
|||
/// Send Mail
|
||||
/// </summary>
|
||||
/// <param name="messageType"></param>
|
||||
/// <param name="messageModel"></param>
|
||||
/// <param name="message"></param>
|
||||
/// <returns></returns>
|
||||
Task<ApiResponseView> SendMail(string messageType, EmailMessageModel messageModel);
|
||||
Task<ApiResponseView> SendMail(string messageType, EmailMessage message);
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ public interface ISystemSendSmsService
|
|||
/// Send Mail
|
||||
/// </summary>
|
||||
/// <param name="messageType"></param>
|
||||
/// <param name="messageModel"></param>
|
||||
/// <param name="message"></param>
|
||||
/// <returns></returns>
|
||||
Task<ApiResponseView> SendSms(ShortMessageModel messageModel);
|
||||
Task<ApiResponseView> SendSms(ShortMessage message);
|
||||
}
|
||||
|
|
@ -40,14 +40,14 @@ public interface ISystemUserRepository
|
|||
/// </summary>
|
||||
/// <param name="userId"></param>
|
||||
/// <returns></returns>
|
||||
Task<UserAdminEditView> GetUserInfo(string userId);
|
||||
Task<UserManagerEditView> GetUserInfo(string userId);
|
||||
|
||||
/// <summary>
|
||||
/// Update User using userId and updated data
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
Task<UserAdminEditView> CreateUser(UserAdminCreateModel model);
|
||||
Task<UserManagerEditView> CreateUser(UserManagerCreate model);
|
||||
|
||||
/// <summary>
|
||||
/// Update User using userId and updated data
|
||||
|
|
@ -55,7 +55,7 @@ public interface ISystemUserRepository
|
|||
/// <param name="userId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
Task UpdateUserInfo(string userId, UserAdminEditView model);
|
||||
Task UpdateUserInfo(string userId, UserManagerEditView model);
|
||||
|
||||
/// <summary>
|
||||
/// Delete the user with id
|
||||
|
|
|
|||
|
|
@ -81,11 +81,11 @@ public class OrderProcessRepository : IOrderProcessRepository
|
|||
/// <summary>
|
||||
/// Update Order status setting new process status
|
||||
/// </summary>
|
||||
/// <param name="processStateModel"></param>
|
||||
/// <param name="processState"></param>
|
||||
/// <returns></returns>
|
||||
public async Task UpdateWarehouseOrderStatus(OrderProcessStateModel processStateModel)
|
||||
public async Task UpdateWarehouseOrderStatus(OrderProcessState processState)
|
||||
{
|
||||
_logger.LogDebug("process => {}", JsonSerializer.Serialize(processStateModel, _options));
|
||||
await _client.PutAsJsonAsync($"{_api.Warehouse}/{processStateModel.OrderId}", processStateModel, _options);
|
||||
_logger.LogDebug("process => {}", JsonSerializer.Serialize(processState, _options));
|
||||
await _client.PutAsJsonAsync($"{_api.Warehouse}/{processState.OrderId}", processState, _options);
|
||||
}
|
||||
}
|
||||
|
|
@ -48,11 +48,11 @@ public class SystemSendMailService : ISystemSendMailService
|
|||
/// Send Mail
|
||||
/// </summary>
|
||||
/// <param name="messageType"></param>
|
||||
/// <param name="messageModel"></param>
|
||||
/// <param name="message"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ApiResponseView> SendMail(string messageType, EmailMessageModel messageModel)
|
||||
public async Task<ApiResponseView> SendMail(string messageType, EmailMessage message)
|
||||
{
|
||||
var response = await _client.PostAsJsonAsync($"{_api.ServicesMail}/{messageType}", messageModel, _options);
|
||||
var response = await _client.PostAsJsonAsync($"{_api.ServicesMail}/{messageType}", message, _options);
|
||||
if (!response.IsSuccessStatusCode)
|
||||
return new ApiResponseView
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,11 +47,11 @@ public class SystemSendSmsService : ISystemSendSmsService
|
|||
/// <summary>
|
||||
/// Send Mail
|
||||
/// </summary>
|
||||
/// <param name="messageModel"></param>
|
||||
/// <param name="message"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ApiResponseView> SendSms(ShortMessageModel messageModel)
|
||||
public async Task<ApiResponseView> SendSms(ShortMessage message)
|
||||
{
|
||||
var response = await _client.PostAsJsonAsync($"{_api.ServicesSms}", messageModel, _options);
|
||||
var response = await _client.PostAsJsonAsync($"{_api.ServicesSms}", message, _options);
|
||||
if (!response.IsSuccessStatusCode)
|
||||
return new ApiResponseView
|
||||
{
|
||||
|
|
|
|||
|
|
@ -62,9 +62,9 @@ public class SystemUserRepository : ISystemUserRepository
|
|||
/// </summary>
|
||||
/// <param name="userId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<UserAdminEditView> GetUserInfo(string userId)
|
||||
public async Task<UserManagerEditView> GetUserInfo(string userId)
|
||||
{
|
||||
return await _client.GetFromJsonAsync<UserAdminEditView>($"{_api.UserManager}/{userId}");
|
||||
return await _client.GetFromJsonAsync<UserManagerEditView>($"{_api.UserManager}/{userId}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -72,18 +72,18 @@ public class SystemUserRepository : ISystemUserRepository
|
|||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<UserAdminEditView> CreateUser(UserAdminCreateModel model)
|
||||
public async Task<UserManagerEditView> CreateUser(UserManagerCreate model)
|
||||
{
|
||||
var result = await _client.PostAsJsonAsync($"{_api.UserManager}", model, _options);
|
||||
if (!result.IsSuccessStatusCode)
|
||||
return new UserAdminEditView();
|
||||
return new UserManagerEditView();
|
||||
try
|
||||
{
|
||||
return await result.Content.ReadFromJsonAsync<UserAdminEditView>();
|
||||
return await result.Content.ReadFromJsonAsync<UserManagerEditView>();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new UserAdminEditView();
|
||||
return new UserManagerEditView();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ public class SystemUserRepository : ISystemUserRepository
|
|||
/// <param name="userId"></param>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public async Task UpdateUserInfo(string userId, UserAdminEditView model)
|
||||
public async Task UpdateUserInfo(string userId, UserManagerEditView model)
|
||||
{
|
||||
await _client.PutAsJsonAsync($"{_api.UserManager}/{userId}", model, _options);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public partial class CustomerInventoryListOverlay : IDisposable
|
|||
|
||||
private string _modalDisplay = "";
|
||||
private bool _showBackdrop;
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
// private List<ProductInventoryView> ProductList { get; set; } = new();
|
||||
private DraftItem DraftItem { get; set; } = new();
|
||||
private SalesItemView SalesItem { get; set; } = new();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ namespace Wonky.Client.OverlayOffice;
|
|||
|
||||
public partial class OfficeCustomerActivityListOverlay
|
||||
{
|
||||
[Parameter] public CompanyModel Company { get; set; } = new();
|
||||
[Parameter] public CompanyDto Company { get; set; } = new();
|
||||
[Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
|
||||
|
||||
private string _modalDisplay = "";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace Wonky.Client.OverlayOffice;
|
|||
|
||||
public partial class OfficeCustomerInventoryReorderOverlay
|
||||
{
|
||||
[Parameter] public CompanyModel Company { get; set; }
|
||||
[Parameter] public CompanyDto Company { get; set; }
|
||||
[Parameter] public SalesItemView SalesItem { get; set; } = new();
|
||||
[Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; }
|
||||
[Parameter] public EventCallback<DraftItem> OrderItemCallback { get; set; }
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace Wonky.Client.OverlayOffice;
|
|||
public partial class OfficeCustomerInvoiceListOverlay
|
||||
{
|
||||
[Parameter] public InvoiceListView InvoiceList { get; set; } = new();
|
||||
[Parameter] public CompanyModel Company { get; set; } = new();
|
||||
[Parameter] public CompanyDto Company { get; set; } = new();
|
||||
// dependency injection
|
||||
[Inject] public ILogger<OfficeCustomerInvoiceListOverlay> Logger { get; set; }
|
||||
private string InvoiceId { get; set; } = "";
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public partial class OfficeCustomerProductListOverlay : IDisposable
|
|||
private OfficeCustomerInventoryReorderOverlay ReorderOverlay { get; set; } = new();
|
||||
private bool Descending { get; set; }
|
||||
|
||||
[Parameter] public CompanyModel Company { get; set; } = new();
|
||||
[Parameter] public CompanyDto Company { get; set; } = new();
|
||||
[Parameter] public List<ProductInventoryView> Inventory { get; set; } = new();
|
||||
|
||||
protected override void OnParametersSet()
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public partial class OfficeOrderInventoryListOverlay : IDisposable
|
|||
[Inject] public ICountryCatalogRepository CatalogRepo { get; set; }
|
||||
[Inject] public ILogger<OfficeOrderInventoryListOverlay> Logger { get; set; }
|
||||
|
||||
[Parameter] public CompanyModel Company { get; set; } = new();
|
||||
[Parameter] public CompanyDto Company { get; set; } = new();
|
||||
[Parameter] public List<ProductInventoryView> Inventory { get; set; } = new();
|
||||
[Parameter] public EventCallback<DraftItem> OnSelected { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace Wonky.Client.OverlayOffice;
|
|||
public partial class OfficeOrderInventoryReorderOverlay
|
||||
{
|
||||
[Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; }
|
||||
[Parameter] public CompanyModel Company { get; set; } = new();
|
||||
[Parameter] public CompanyDto Company { get; set; } = new();
|
||||
[Parameter] public SalesItemView SalesItem { get; set; } = new();
|
||||
[Parameter] public EventCallback<DraftItem> OnSelected { get; set; }
|
||||
private List<ProductHistoryView>? ProductHistory { get; set; } = new();
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
|||
private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true };
|
||||
private SalesItemView SelectedItem { get; set; } = new();
|
||||
private UserProfile UserProfile { get; set; } = new();
|
||||
private ActivityModel Activity { get; set; } = new();
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private ActivityDto Activity { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private EditContext? ActivityContext { get; set; }
|
||||
private bool PoFormInvalid { get; set; } = true;
|
||||
private bool ShowItem { get; set; }
|
||||
|
|
@ -77,7 +77,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
|||
private bool InvalidActivity { get; set; } = true;
|
||||
private bool ReportClosed { get; set; }
|
||||
private bool Working { get; set; } = true;
|
||||
private UserAdminEditView SalesRep { get; set; } = new();
|
||||
private UserManagerEditView SalesRep { get; set; } = new();
|
||||
private DateTime SelectedDate { get; set; }
|
||||
private string OldPhone { get; set; } = "";
|
||||
private string PromptDateConfirm { get; set; } = "";
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@
|
|||
<EditForm EditContext="NoteContext">
|
||||
<div class="row mb-2">
|
||||
<label class="form-label mb-1" for="office-note">Note /Kontor</label>
|
||||
<InputTextArea class="form-control mb-1" id="office-note" rows="5" @bind-Value="NoteModel.OfficeNote"></InputTextArea>
|
||||
<InputTextArea class="form-control mb-1" id="office-note" rows="5" @bind-Value="Note.OfficeNote"></InputTextArea>
|
||||
<div>
|
||||
Ordre noten lukkes efter @GraceTime minutter eller når den er plukket.
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public partial class AdvisorActivityViewEditPage : IDisposable
|
|||
[Inject] public IToastService Toaster { get; set; }
|
||||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
private ReportItemView ReportItem { get; set; } = new();
|
||||
private ActivityOfficeNoteModel NoteModel { get; set; } = new();
|
||||
private ActivityOfficeNote Note { get; set; } = new();
|
||||
private EditContext NoteContext { get; set; }
|
||||
private bool Disabled { get; set; }
|
||||
private int GraceTime { get; set; } = 60;
|
||||
|
|
@ -47,11 +47,11 @@ public partial class AdvisorActivityViewEditPage : IDisposable
|
|||
{
|
||||
Interceptor.RegisterEvent();
|
||||
Interceptor.RegisterBeforeSendEvent();
|
||||
NoteContext = new EditContext(NoteModel);
|
||||
NoteContext = new EditContext(Note);
|
||||
NoteContext.OnFieldChanged += HandleFieldChanged;
|
||||
ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId);
|
||||
NoteModel.ActivityId = ReportItem.ActivityId;
|
||||
NoteModel.OfficeNote = ReportItem.OfficeNote;
|
||||
Note.ActivityId = ReportItem.ActivityId;
|
||||
Note.OfficeNote = ReportItem.OfficeNote;
|
||||
Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem));
|
||||
Working = false;
|
||||
}
|
||||
|
|
@ -65,8 +65,8 @@ public partial class AdvisorActivityViewEditPage : IDisposable
|
|||
{
|
||||
Working = true;
|
||||
Disabled = true;
|
||||
Logger.LogDebug("OfficeNote => \n {}", JsonSerializer.Serialize(NoteModel));
|
||||
await AdvisorActivityRepo.UpdateOfficeNote(NoteModel);
|
||||
Logger.LogDebug("OfficeNote => \n {}", JsonSerializer.Serialize(Note));
|
||||
await AdvisorActivityRepo.UpdateOfficeNote(Note);
|
||||
Toaster.ShowInfo($"{ReportItem.ESalesNumber} - notat opdateret");
|
||||
Navigator.NavigateTo("/advisor/activity-today");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public partial class AdvisorCustomerActivityListPage : IDisposable
|
|||
[Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
|
||||
[Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
|
||||
private List<ReportItemView> ActivityList { get; set; } = new();
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public partial class AdvisorCustomerCreatePage : IDisposable
|
|||
[Inject] public IUserInfoService UserInfoService { get; set; }
|
||||
|
||||
private EditContext CompanyContext { get; set; }
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private VatAddress CompanyVatAddress { get; set; } = new();
|
||||
private VatLookupDkModal VatLookupPopup { get; set; } = new();
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
|
|||
|
||||
|
||||
private readonly JsonSerializerOptions _options = new JsonSerializerOptions(JsonSerializerDefaults.Web);
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
private SalesItemView SalesItem { get; set; } = new();
|
||||
private CustomerInventoryReorderOverlay ReorderOverlay { get; set; } = new();
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable
|
|||
[Parameter] public string CompanyId { get; set; } = "";
|
||||
|
||||
private InvoiceListView CompanyInvoices { get; set; } = new();
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private CustomerInvoiceViewOverlay CustomerInvoiceView { get; set; } = new();
|
||||
private string InvoiceId { get; set; } = "";
|
||||
private bool Working { get; set; }
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
[Inject] public IUserInfoService UserInfoService { get; set; }
|
||||
|
||||
private List<CompanyModel> CompanyList { get; set; } = new();
|
||||
private List<CompanyDto> CompanyList { get; set; } = new();
|
||||
private UserProfile Profile { get; set; } = new();
|
||||
private UserAdminEditView UserInfo { get; set; } = new();
|
||||
private UserManagerEditView UserInfo { get; set; } = new();
|
||||
private string SavedSearch { get; set; } = "";
|
||||
private bool Working { get; set; } = true;
|
||||
private MetaData PageData { get; set; } = new();
|
||||
|
|
@ -78,7 +78,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
Working = true;
|
||||
ShowFolded = !ShowFolded;
|
||||
ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.HasFolded = ShowFolded ? 1 : 0;
|
||||
await FetchCustomers();
|
||||
|
|
@ -89,7 +89,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
Working = true;
|
||||
ShowHidden = !ShowHidden;
|
||||
ToggleHiddenText = ShowHidden ? "Normal Visning" : "Inkl. Skjulte";
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.IsHidden = ShowHidden ? 1 : 0;
|
||||
await FetchCustomers();
|
||||
|
|
@ -97,14 +97,14 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
|
||||
private async Task SetSelectedPage(int page)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = page;
|
||||
await FetchCustomers();
|
||||
}
|
||||
|
||||
private async Task SetSearchCol(string searchColumn)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.SearchColumn = searchColumn;
|
||||
Paging.PageNumber = 1;
|
||||
await FetchCustomers();
|
||||
|
|
@ -112,7 +112,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
|
||||
private async Task SetPageSize(string pageSize)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageSize = Convert.ToInt32(pageSize);
|
||||
Paging.PageNumber = 1;
|
||||
await FetchCustomers();
|
||||
|
|
@ -120,7 +120,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
|
||||
private async Task SetSearchPhrase(string searchTerm)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.SearchTerm = searchTerm;
|
||||
await FetchCustomers();
|
||||
|
|
@ -128,7 +128,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
|
||||
private async Task SetSortCol(string orderBy)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.OrderBy = orderBy;
|
||||
await FetchCustomers();
|
||||
}
|
||||
|
|
@ -139,7 +139,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
/// <param name="companyId"></param>
|
||||
private async Task DeleteCompany(string companyId)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
await CompanyRepo.DeleteCompany(companyId);
|
||||
if (Paging.PageNumber > 1 && CompanyList.Count == 1)
|
||||
Paging.PageNumber--;
|
||||
|
|
@ -158,7 +158,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
|||
}
|
||||
else
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
PageData = new MetaData();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
[Inject] public IUserInfoService UserInfoService { get; set; }
|
||||
|
||||
private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true };
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private EditContext ErpContext { get; set; }
|
||||
private DateTime LastVisit { get; set; }
|
||||
private DateTime NextVisit { get; set; }
|
||||
|
|
@ -64,12 +64,12 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
private bool CountryIsDk { get; set; } = true;
|
||||
private bool ErpEditDisabled { get; set; } = true;
|
||||
private bool VatEditDisabled { get; set; } = true;
|
||||
private List<ContactModel> Contacts { get; set; } = new();
|
||||
private List<ContactDto> Contacts { get; set; } = new();
|
||||
private VatLookupDkModal VatLookupPopup { get; set; } = new();
|
||||
private ContactModel SelectedContact { get; set; } = new();
|
||||
private ContactModel DefaultContact { get; set; } = new();
|
||||
private ContactDto SelectedContact { get; set; } = new();
|
||||
private ContactDto DefaultContact { get; set; } = new();
|
||||
private ContactModal ContactPopup { get; set; } = new();
|
||||
private UserAdminEditView UserInfo { get; set; } = new();
|
||||
private UserManagerEditView UserInfo { get; set; } = new();
|
||||
private string ToggleButtonText { get; set; } = "";
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
|
|
@ -79,7 +79,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
Interceptor.RegisterBeforeSendEvent();
|
||||
|
||||
// initialize default contact
|
||||
DefaultContact = new ContactModel { CompanyId = CompanyId, ContactId = "", FirstName = "" };
|
||||
DefaultContact = new ContactDto { CompanyId = CompanyId, ContactId = "", FirstName = "" };
|
||||
// setup form context
|
||||
ErpContext = new EditContext(Company);
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
/// Open contact edit popup
|
||||
/// </summary>
|
||||
/// <param name="contact"></param>
|
||||
private void OpenContactPopup(ContactModel contact)
|
||||
private void OpenContactPopup(ContactDto contact)
|
||||
{
|
||||
// write contact to debug log
|
||||
Logger.LogDebug("CompanyView => SaveContactCallback <= {}", JsonSerializer.Serialize(contact));
|
||||
|
|
@ -243,7 +243,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
/// Callback for writing contact to backend
|
||||
/// </summary>
|
||||
/// <param name="contact"></param>
|
||||
private async Task WriteContactCallback(ContactModel contact)
|
||||
private async Task WriteContactCallback(ContactDto contact)
|
||||
{
|
||||
Working = true;
|
||||
// write contact to debug log
|
||||
|
|
@ -265,7 +265,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
}
|
||||
|
||||
// reset selected contact
|
||||
SelectedContact = new ContactModel();
|
||||
SelectedContact = new ContactDto();
|
||||
// reload contacts from backend
|
||||
await FetchContacts(CompanyId);
|
||||
Working = false;
|
||||
|
|
@ -282,7 +282,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
// send delete request to backend
|
||||
await AdvisorContactRepo.DeleteContact(CompanyId, contactId);
|
||||
// reset selected contact
|
||||
SelectedContact = new ContactModel();
|
||||
SelectedContact = new ContactDto();
|
||||
// reload contacts from backend
|
||||
await FetchContacts(CompanyId);
|
||||
Working = false;
|
||||
|
|
@ -366,32 +366,32 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
|
|||
/// <summary>
|
||||
/// Prepare vat address from company model
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <param name="company"></param>
|
||||
/// <returns></returns>
|
||||
private static VatAddress PrepareVatAddress(CompanyModel model)
|
||||
private static VatAddress PrepareVatAddress(CompanyDto company)
|
||||
{
|
||||
var digits = "1234567890".ToCharArray();
|
||||
// process address1
|
||||
var pos1 = model.Address1.IndexOfAny(digits);
|
||||
var pos1 = company.Address1.IndexOfAny(digits);
|
||||
if (pos1 > 0)
|
||||
{
|
||||
return new VatAddress
|
||||
{
|
||||
ZipCode = model.ZipCode.Trim(),
|
||||
StreetName = model.Address1[..pos1].Trim(),
|
||||
HouseNumber = Regex.Replace(model.Address1[pos1..], "[^0-9]", "").Trim()
|
||||
ZipCode = company.ZipCode.Trim(),
|
||||
StreetName = company.Address1[..pos1].Trim(),
|
||||
HouseNumber = Regex.Replace(company.Address1[pos1..], "[^0-9]", "").Trim()
|
||||
};
|
||||
}
|
||||
|
||||
// process address2
|
||||
var pos2 = model.Address2.IndexOfAny(digits);
|
||||
var pos2 = company.Address2.IndexOfAny(digits);
|
||||
if (pos2 > 0)
|
||||
{
|
||||
return new VatAddress
|
||||
{
|
||||
ZipCode = model.ZipCode.Trim(),
|
||||
StreetName = model.Address2[..pos2].Trim(),
|
||||
HouseNumber = Regex.Replace(model.Address2[pos2..], "[^0-9]", "").Trim()
|
||||
ZipCode = company.ZipCode.Trim(),
|
||||
StreetName = company.Address2[..pos2].Trim(),
|
||||
HouseNumber = Regex.Replace(company.Address2[pos2..], "[^0-9]", "").Trim()
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ public partial class AdvisorReportCreatePage : IDisposable
|
|||
[Inject] public ILogger<AdvisorReportCreatePage> Logger { get; set; }
|
||||
[Inject] public IToastService Toaster { get; set; }
|
||||
private EditContext ReportContext { get; set; }
|
||||
private ReportModel Report { get; set; } = new();
|
||||
private ReportDto Report { get; set; } = new();
|
||||
private List<ReportItemView> Activities { get; set; } = new();
|
||||
private ReportFiguresModel InitialValues { get; set; } = new();
|
||||
private ReportFiguresDto InitialValues { get; set; } = new();
|
||||
private UserProfile Profiles { get; set; } = new();
|
||||
private bool FormInvalid { get; set; } = true;
|
||||
private bool NoFigures { get; set; } = true;
|
||||
|
|
@ -117,8 +117,8 @@ public partial class AdvisorReportCreatePage : IDisposable
|
|||
return;
|
||||
Working = true;
|
||||
|
||||
Report.Figures = new ReportFiguresModel();
|
||||
InitialValues = new ReportFiguresModel();
|
||||
Report.Figures = new ReportFiguresDto();
|
||||
InitialValues = new ReportFiguresDto();
|
||||
Activities = new List<ReportItemView>();
|
||||
|
||||
var data = await AdvisorReportRepo.InitializeReportData(WorkDate);
|
||||
|
|
@ -283,8 +283,8 @@ public partial class AdvisorReportCreatePage : IDisposable
|
|||
ThisWorkDate = DateTime.Parse(workDate);
|
||||
|
||||
NoFigures = true;
|
||||
Report.Figures = new ReportFiguresModel();
|
||||
InitialValues = new ReportFiguresModel();
|
||||
Report.Figures = new ReportFiguresDto();
|
||||
InitialValues = new ReportFiguresDto();
|
||||
Activities = new List<ReportItemView>();
|
||||
|
||||
Report.Figures.KmEvening = 0;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
@using Wonky.Client.Models
|
||||
@attribute [Authorize(Roles = "Advisor")]
|
||||
@page "/advisor/reports/view/{ReportDate}"
|
||||
<PageTitle>@Report.ReportDataView.Name</PageTitle>
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="row bg-dark text-white rounded-2 mb-2 py-2 align-items-center d-print-none">
|
||||
<div class="col-sm-6">
|
||||
<WorkDateComponent OnChangedCallback="FetchReport"/>
|
||||
|
|
@ -36,22 +36,22 @@
|
|||
</div>
|
||||
|
||||
<div class="report-main d-print-table">
|
||||
@if (!string.IsNullOrWhiteSpace(Report.ReportDataView.DayTypeEnum))
|
||||
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum))
|
||||
{
|
||||
<PageTitle>@Report.ReportDataView.Name</PageTitle>
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="alert bg-light text-dark text-center align-content-center">
|
||||
<h2>@Report.ReportDataView.Name</h2>
|
||||
<h2>@Report.ReportData.Name</h2>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="w-75">
|
||||
<ReportSummaryComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
<div class="w-25">
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
</div>
|
||||
<AdvisorActivityListComponent ActivityList="Report.ReportItems"/>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public partial class AdvisorReportViewPage : IDisposable
|
|||
private ReportView Report { get; set; } = new();
|
||||
private List<ReportItemView> Activities { get; set; } = new ();
|
||||
private bool Working { get; set; }
|
||||
private UserAdminEditView XUserInfo { get; set; } = new();
|
||||
private UserManagerEditView XUserInfo { get; set; } = new();
|
||||
private string ReturnUrl { get; set; } = "";
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
|
|
@ -83,7 +83,7 @@ public partial class AdvisorReportViewPage : IDisposable
|
|||
{
|
||||
|
||||
// remove busy signal if report is empty
|
||||
if (string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate))
|
||||
if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate))
|
||||
{
|
||||
Working = false;
|
||||
}
|
||||
|
|
@ -111,9 +111,9 @@ public partial class AdvisorReportViewPage : IDisposable
|
|||
Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList();
|
||||
|
||||
// store the report locally
|
||||
if (!string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate))
|
||||
if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate))
|
||||
{
|
||||
await Storage.SetItemAsync($"{XUserInfo.UserId}-{Report.ReportDataView.ReportDate}", Report);
|
||||
await Storage.SetItemAsync($"{XUserInfo.UserId}-{Report.ReportData.ReportDate}", Report);
|
||||
}
|
||||
|
||||
// remove busy signal
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable
|
|||
private UserProfile Profile { get; set; } = new();
|
||||
private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}";
|
||||
|
||||
private List<TaskItemModel> TaskItems { get; set; } = new();
|
||||
private List<TaskItemDto> TaskItems { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public partial class AdvisorTaskItemViewCrmPage : IDisposable
|
|||
[Parameter] public string TaskItemId { get; set; }
|
||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||
[Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; }
|
||||
private TaskItemModel TaskItem { get; set; } = new ();
|
||||
private TaskItemDto TaskItem { get; set; } = new ();
|
||||
private EditContext TaskContext { get; set; }
|
||||
private bool Working { get; set; } = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public partial class AdvisorWorkplaceListPage : IDisposable
|
|||
[Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; }
|
||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||
private List<WorkplaceListView> WorkplaceList { get; set; } = new();
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
|
||||
protected override async Task OnParametersSetAsync()
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public partial class AdvisorWorkplaceViewPage : IDisposable
|
|||
[Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; }
|
||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
private WorkplaceModel Workplace { get; set; } = new();
|
||||
private WorkplaceDto Workplace { get; set; } = new();
|
||||
private EditContext WorkplaceContext { get; set; }
|
||||
private bool Working { get; set; } = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public partial class CatalogCountryPagedListPage : IDisposable
|
|||
private MetaData PageData { get; set; } = new();
|
||||
private CatalogPager Paging { get; set; } = new();
|
||||
private UserProfile Profiles { get; set; } = new();
|
||||
private UserAdminEditView XUserInfo { get; set; } = new();
|
||||
private UserManagerEditView XUserInfo { get; set; } = new();
|
||||
private bool Working { get; set; }
|
||||
private string CountryName { get; set; } = "";
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public partial class CommonReportPrintOrderPage
|
|||
foreach (var item in orders)
|
||||
{
|
||||
Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst");
|
||||
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessStateModel
|
||||
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
|
||||
{
|
||||
OrderId = item.ActivityId,
|
||||
ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed)
|
||||
|
|
|
|||
|
|
@ -29,22 +29,22 @@
|
|||
</div>
|
||||
|
||||
<div class="report-main d-print-table">
|
||||
<PageTitle>@Report.ReportDataView.Name</PageTitle>
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="alert border border-2 border-dark text-center align-content-center">
|
||||
<h3>@Report.ReportDataView.Name</h3>
|
||||
<h3>@Report.ReportData.Name</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="w-75">
|
||||
<ReportSummaryComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
<div class="w-25">
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
</div>
|
||||
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
</div>
|
||||
<div class="col-lg-8">
|
||||
<div class="card-body py-5 px-md-5">
|
||||
<EditForm Model="CredentialModel" OnValidSubmit="ExecuteLogin" class="form">
|
||||
<EditForm Model="CredentialDto" OnValidSubmit="ExecuteLogin" class="form">
|
||||
<DataAnnotationsValidator/>
|
||||
@* username *@
|
||||
<div class="input-group mb-4">
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
<i class="bi-at"></i>
|
||||
</span>
|
||||
<InputText type="email" class="form-control" aria-described-by="at"
|
||||
@bind-Value="CredentialModel.Email" autocomplete="username"/>
|
||||
<ValidationMessage For="@(() => CredentialModel.Email)"/>
|
||||
@bind-Value="CredentialDto.Email" autocomplete="username"/>
|
||||
<ValidationMessage For="@(() => CredentialDto.Email)"/>
|
||||
</div>
|
||||
@* current-password *@
|
||||
<div class="input-group mb-4">
|
||||
|
|
@ -53,8 +53,8 @@
|
|||
<i class="oi oi-key"></i>
|
||||
</span>
|
||||
<InputText type="password" class="form-control" aria-described-by="key"
|
||||
@bind-Value="CredentialModel.Password" autocomplete="current-password"/>
|
||||
<ValidationMessage For="@(() => CredentialModel.Password)"/>
|
||||
@bind-Value="CredentialDto.Password" autocomplete="current-password"/>
|
||||
<ValidationMessage For="@(() => CredentialDto.Password)"/>
|
||||
</div>
|
||||
@* submit button *@
|
||||
<div class="d-grid">
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public partial class Login
|
|||
[Inject] public IAuthenticationService AuthenticationService { get; set; }
|
||||
[Inject] public ILogger<Login> Logger { get; set; }
|
||||
[Parameter] public string ReturnUrl { get; set; } = "";
|
||||
private CredentialModel CredentialModel { get; set; } = new ();
|
||||
private CredentialDto CredentialDto { get; set; } = new ();
|
||||
private bool ShowAuthError { get; set; }
|
||||
private string? Error { get; set; }
|
||||
private bool execLogin = false;
|
||||
|
|
@ -37,7 +37,7 @@ public partial class Login
|
|||
ShowAuthError = false;
|
||||
execLogin = true;
|
||||
|
||||
var result = await AuthenticationService.Login(CredentialModel);
|
||||
var result = await AuthenticationService.Login(CredentialDto);
|
||||
if (!result.IsSuccess)
|
||||
{
|
||||
Error = result.ErrorMessage;
|
||||
|
|
|
|||
|
|
@ -35,24 +35,24 @@
|
|||
</div>
|
||||
|
||||
<div class="report-main d-print-print">
|
||||
@if (!string.IsNullOrWhiteSpace(Report.ReportDataView.DayTypeEnum))
|
||||
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum))
|
||||
{
|
||||
<PageTitle>@Report.ReportDataView.Name</PageTitle>
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="alert border border-1 border-dark text-center align-content-center">
|
||||
<h3>@Report.ReportDataView.Name</h3>
|
||||
<h3>@Report.ReportData.Name</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="w-75">
|
||||
<ReportSummaryComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportSummaryComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
<div class="w-25">
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
|
||||
</div>
|
||||
</div>
|
||||
<OfficeReportActivityListComponent ActivityList="Report.ReportItems"/>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportDataView"/>
|
||||
<ReportActivityLedgerComponent ReportData="Report.ReportData"/>
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
//
|
||||
|
||||
|
||||
using System.Text.Json;
|
||||
using Blazored.LocalStorage;
|
||||
using Blazored.Toast.Services;
|
||||
using Microsoft.AspNetCore.Components;
|
||||
|
|
@ -31,9 +32,6 @@ namespace Wonky.Client.Pages;
|
|||
|
||||
public partial class OfficeAdvisorReportViewPage : IDisposable
|
||||
{
|
||||
[Parameter] public string CountryCode { get; set; } = "";
|
||||
[Parameter] public string UserId { get; set; } = "";
|
||||
[Parameter] public string ReportDate { get; set; } = "";
|
||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||
[Inject] public ICountryReportRepository ReportRepo { get; set; }
|
||||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
|
|
@ -43,6 +41,11 @@ public partial class OfficeAdvisorReportViewPage : IDisposable
|
|||
[Inject] public IJSRuntime JsRuntime { get; set; }
|
||||
[Inject] public IToastService Toaster { get; set; }
|
||||
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
|
||||
|
||||
[Parameter] public string CountryCode { get; set; } = "";
|
||||
[Parameter] public string UserId { get; set; } = "";
|
||||
[Parameter] public string ReportDate { get; set; } = "";
|
||||
|
||||
private IJSObjectReference JsModule { get; set; }
|
||||
private ReportView Report { get; set; } = new();
|
||||
private List<ReportItemView> Activities { get; set; } = new();
|
||||
|
|
@ -56,6 +59,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable
|
|||
Interceptor.RegisterBeforeSendEvent();
|
||||
|
||||
ProfileService.OnChange += ProfileServiceOnOnChange;
|
||||
|
||||
await ProfileService.SetWorkDate(DateTime.Parse(ReportDate));
|
||||
|
||||
await FetchUserReport(ReportDate);
|
||||
|
|
@ -98,7 +102,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable
|
|||
foreach (var item in orders)
|
||||
{
|
||||
Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst");
|
||||
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessStateModel
|
||||
await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState
|
||||
{
|
||||
OrderId = item.ActivityId,
|
||||
ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed)
|
||||
|
|
@ -115,7 +119,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable
|
|||
private async Task FetchUserReport(string workDate)
|
||||
{
|
||||
// remove busy signal if report is empty
|
||||
if (string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate))
|
||||
if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate))
|
||||
{
|
||||
Working = false;
|
||||
}
|
||||
|
|
@ -138,14 +142,16 @@ public partial class OfficeAdvisorReportViewPage : IDisposable
|
|||
// set busy signal
|
||||
Working = true;
|
||||
|
||||
Logger.LogDebug("UserId => {}", UserId);
|
||||
// fetch report
|
||||
Report = await ReportRepo.GetCountryReport(UserId, workDate);
|
||||
|
||||
Logger.LogDebug("Report => {}", JsonSerializer.Serialize(Report, new JsonSerializerOptions(JsonSerializerDefaults.Web)));
|
||||
|
||||
// extract activities
|
||||
Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList();
|
||||
|
||||
// store locally
|
||||
if (!string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate))
|
||||
if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate))
|
||||
{
|
||||
await Storage.SetItemAsync($"{UserId}-{workDate}", Report);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable
|
|||
[Parameter] public string UserId { get; set; } = "";
|
||||
[Parameter] public string CountryCode { get; set; } = "dk";
|
||||
|
||||
private List<CompanyModel> CompanyList { get; set; } = new();
|
||||
private List<CompanyDto> CompanyList { get; set; } = new();
|
||||
private MetaData PageData { get; set; } = new();
|
||||
private CustomerPaging Paging { get; set; } = new();
|
||||
private UserProfile UserProfile { get; set; } = new();
|
||||
|
|
@ -73,7 +73,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable
|
|||
Working = true;
|
||||
ShowFolded = !ShowFolded;
|
||||
ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.HasFolded = ShowFolded ? 1 : 0;
|
||||
await FetchCompanies();
|
||||
|
|
@ -81,14 +81,14 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable
|
|||
|
||||
private async Task SetSelectedPage(int page)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = page;
|
||||
await FetchCompanies();
|
||||
}
|
||||
|
||||
private async Task SetSearchCol(string searchColumn)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.SearchColumn = searchColumn;
|
||||
Paging.PageNumber = 1;
|
||||
await FetchCompanies();
|
||||
|
|
@ -96,7 +96,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable
|
|||
|
||||
private async Task SetPageSize(string pageSize)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageSize = Convert.ToInt32(pageSize);
|
||||
Paging.PageNumber = 1;
|
||||
await FetchCompanies();
|
||||
|
|
@ -106,7 +106,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable
|
|||
{
|
||||
// if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.Length < 3) return;
|
||||
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.SearchTerm = searchTerm;
|
||||
await FetchCompanies();
|
||||
|
|
@ -119,7 +119,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable
|
|||
|
||||
private async Task SetSortCol(string orderBy)
|
||||
{
|
||||
CompanyList = new List<CompanyModel>();
|
||||
CompanyList = new List<CompanyDto>();
|
||||
Paging.OrderBy = orderBy;
|
||||
await FetchCompanies();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
[Inject] public IUserInfoService UserInfoService { get; set; }
|
||||
|
||||
private List<CompanyModel> Companies { get; set; } = new();
|
||||
private List<CompanyDto> Companies { get; set; } = new();
|
||||
private UserProfile Profiles { get; set; } = new();
|
||||
private UserAdminEditView UserInfo { get; set; } = new();
|
||||
private UserManagerEditView UserInfo { get; set; } = new();
|
||||
private string SavedSearch { get; set; } = "";
|
||||
private bool ShowFolded { get; set; }
|
||||
private bool Working { get; set; } = true;
|
||||
|
|
@ -74,7 +74,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
Working = true;
|
||||
ShowFolded = !ShowFolded;
|
||||
ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.HasFolded = ShowFolded ? 1 : 0;
|
||||
await FetchCustomers();
|
||||
|
|
@ -83,7 +83,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
private async Task SetSelectedPage(int page)
|
||||
{
|
||||
Working = true;
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
Paging.PageNumber = page;
|
||||
await FetchCustomers();
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
private async Task SetSearchCol(string searchColumn)
|
||||
{
|
||||
Working = true;
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
Paging.SearchColumn = searchColumn;
|
||||
Paging.PageNumber = 1;
|
||||
await FetchCustomers();
|
||||
|
|
@ -99,7 +99,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
private async Task SetPageSize(string pageSize)
|
||||
{
|
||||
Working = true;
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
Paging.PageSize = Convert.ToInt32(pageSize);
|
||||
Paging.PageNumber = 1;
|
||||
await FetchCustomers();
|
||||
|
|
@ -108,7 +108,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
private async Task SetSearchPhrase(string searchTerm)
|
||||
{
|
||||
Working = true;
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
Paging.PageNumber = 1;
|
||||
Paging.SearchTerm = searchTerm;
|
||||
await FetchCustomers();
|
||||
|
|
@ -117,7 +117,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
private async Task SetSortCol(string orderBy)
|
||||
{
|
||||
Working = true;
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
Paging.OrderBy = orderBy;
|
||||
await FetchCustomers();
|
||||
}
|
||||
|
|
@ -134,7 +134,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
|||
}
|
||||
else
|
||||
{
|
||||
Companies = new List<CompanyModel>();
|
||||
Companies = new List<CompanyDto>();
|
||||
PageData = new MetaData();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@ public partial class OfficeOrderCreatePage : IDisposable
|
|||
// private variables
|
||||
private readonly JsonSerializerOptions _options = new() {PropertyNameCaseInsensitive = true};
|
||||
// class objects
|
||||
private CompanyModel Company { get; set; } = new();
|
||||
private UserAdminEditView UserInfo { get; set; } = new();
|
||||
private CompanyDto Company { get; set; } = new();
|
||||
private UserManagerEditView UserInfo { get; set; } = new();
|
||||
private SalesItemView SelectedItem { get; set; } = new();
|
||||
private ActivityModel Activity { get; set; } = new();
|
||||
private UserAdminEditView SalesRep { get; set; } = new();
|
||||
private ActivityDto Activity { get; set; } = new();
|
||||
private UserManagerEditView SalesRep { get; set; } = new();
|
||||
// edit context
|
||||
private EditContext ActivityContext { get; set; }
|
||||
// variables
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public partial class OfficeOrderViewPage : IDisposable
|
|||
body.AppendLine($"{user.FirstName} {user.LastName}");
|
||||
body.AppendLine($"{user.PhoneNumber}");
|
||||
// create a list of mail addresses
|
||||
var sendTo = new List<EmailContactModel>
|
||||
var sendTo = new List<EmailContact>
|
||||
{
|
||||
new()
|
||||
{
|
||||
|
|
@ -99,7 +99,7 @@ public partial class OfficeOrderViewPage : IDisposable
|
|||
}
|
||||
};
|
||||
// create an email
|
||||
var msg = new EmailMessageModel
|
||||
var msg = new EmailMessage
|
||||
{
|
||||
Body = body.ToString(),
|
||||
Subject = $"Haste ordre til {ReportItem.Company.Name} er modtaget.",
|
||||
|
|
|
|||
|
|
@ -28,7 +28,9 @@ public partial class OfficeUserAdvisorListPage :IDisposable
|
|||
{
|
||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||
[Inject] public IOfficeUserInfoRepository UserRepo { get; set; }
|
||||
|
||||
[Parameter] public string CountryCode { get; set; } = "";
|
||||
|
||||
private List<UserInfoListView> SalesReps { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
private string CountryName { get; set; } = "";
|
||||
|
|
@ -40,6 +42,7 @@ public partial class OfficeUserAdvisorListPage :IDisposable
|
|||
CountryName = Utils.CountryName(CountryCode);
|
||||
var AdvisorList = await UserRepo.GetUsers("Advisor");
|
||||
SalesReps = AdvisorList
|
||||
.Where(x => string.Equals(x.CountryCode, CountryCode, StringComparison.InvariantCultureIgnoreCase))
|
||||
.OrderBy(x => x.FullName)
|
||||
.ToList();
|
||||
Working = false;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<div class="row mb-5">
|
||||
<div class="col-sm-12 d-grid mx-auto">
|
||||
<textarea id="message" cols="50" rows="5" @bind-Value:event="oninput" @bind-Value="MessageModel.Body"></textarea>
|
||||
<textarea id="message" cols="50" rows="5" @bind-Value:event="oninput" @bind-Value="Message.Body"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row ms-2">
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ public partial class SystemMaintenanceMessagePage : IDisposable
|
|||
[Inject] public IToastService Toaster { get; set; }
|
||||
|
||||
private List<UserInfoListView> Users { get; set; } = new();
|
||||
private ShortMessageModel MessageModel { get; set; } = new();
|
||||
private ShortMessage Message { get; set; } = new();
|
||||
private List<Recipient> Recipients { get; set; } = new();
|
||||
private ApiResponseView SmsResponse { get; set; } = new();
|
||||
private ClxMessageView? ClxMsg { get; set; } = new();
|
||||
private ClxMessage? ClxMsg { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
private bool MsgSent { get; set; }
|
||||
|
||||
|
|
@ -58,20 +58,20 @@ public partial class SystemMaintenanceMessagePage : IDisposable
|
|||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(MessageModel.Body))
|
||||
if (string.IsNullOrWhiteSpace(Message.Body))
|
||||
{
|
||||
Toaster.ShowError("Meddelelsesfeltet er tomt!");
|
||||
return;
|
||||
}
|
||||
MessageModel.From = "Innotec IT";
|
||||
MessageModel.To = string.Join(",", recipients);
|
||||
Message.From = "Innotec IT";
|
||||
Message.To = string.Join(",", recipients);
|
||||
|
||||
Logger.LogDebug("{}", JsonSerializer.Serialize(MessageModel, _options));
|
||||
Logger.LogDebug("{}", JsonSerializer.Serialize(Message, _options));
|
||||
|
||||
SmsResponse = await SmsService.SendSms(MessageModel);
|
||||
SmsResponse = await SmsService.SendSms(Message);
|
||||
if (SmsResponse.Code == 201)
|
||||
{
|
||||
ClxMsg = JsonSerializer.Deserialize<ClxMessageView>(SmsResponse.Message);
|
||||
ClxMsg = JsonSerializer.Deserialize<ClxMessage>(SmsResponse.Message);
|
||||
MsgSent = true;
|
||||
}
|
||||
Working = false;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public partial class SystemSupervisorViewEditPage : IDisposable
|
|||
PropertyNameCaseInsensitive = true
|
||||
};
|
||||
[Parameter] public string UserId { get; set; } = "";
|
||||
private UserAdminEditView UserData { get; set; } = new();
|
||||
private UserManagerEditView UserData { get; set; } = new();
|
||||
private bool Working { get; set; } = true;
|
||||
private EditContext UserAssignmentContext { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public partial class SystemUserCreatePage : IDisposable
|
|||
[Inject] public ISystemUserRepository UserRepo { get; set; }
|
||||
[Inject] public ILogger<SystemUserCreatePage> Logger { get; set; }
|
||||
[Inject] public IToastService Toaster { get; set; }
|
||||
private UserAdminCreateModel NewUserInfo { get; set; } = new();
|
||||
private UserManagerCreate NewUserInfo { get; set; } = new();
|
||||
private EditContext NewUserContext { get; set; }
|
||||
private bool ContextInvalid { get; set; } = true;
|
||||
private bool Working { get; set; } = true;
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@ public partial class SystemUserViewEditPage : IDisposable
|
|||
[Inject] public ISystemUserRepository UserRepo { get; set; }
|
||||
[Inject] public ILogger<SystemUserViewEditPage> Logger { get; set; }
|
||||
[Inject] public IToastService Toaster { get; set; }
|
||||
private UserAdminEditView UserData { get; set; } = new();
|
||||
private UserManagerEditView UserData { get; set; } = new();
|
||||
private EditContext UserEditContext { get; set; }
|
||||
private ResetPasswordModel Passwords { get; set; } = new();
|
||||
private ResetPasswordDto Passwords { get; set; } = new();
|
||||
private EditContext PasswdContext { get; set; }
|
||||
private bool PwInvalid { get; set; } = true;
|
||||
private bool Working { get; set; } = true;
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public partial class WarehouseOrderListPage : IDisposable
|
|||
Working = true;
|
||||
var order = OrderList.First(x => x.OrderId == orderId);
|
||||
order.ProcessStatusEnum = "packed";
|
||||
var process = new OrderProcessStateModel
|
||||
var process = new OrderProcessState
|
||||
{
|
||||
OrderId = order.OrderId,
|
||||
ProcessStatusEnum = "packed"
|
||||
|
|
@ -103,7 +103,7 @@ public partial class WarehouseOrderListPage : IDisposable
|
|||
foreach (var order in OrderList.Where(order => order.ProcessStatusEnum.ToLower() == "packed"))
|
||||
{
|
||||
order.ProcessStatusEnum = "shipped";
|
||||
var process = new OrderProcessStateModel
|
||||
var process = new OrderProcessState
|
||||
{
|
||||
OrderId = order.OrderId,
|
||||
ProcessStatusEnum = "shipped"
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public partial class WarehouseOrderViewPage : IDisposable
|
|||
return;
|
||||
|
||||
Working = true;
|
||||
var process = new OrderProcessStateModel
|
||||
var process = new OrderProcessState
|
||||
{
|
||||
OrderId = Order.OrderId,
|
||||
ProcessStatusEnum = "picked"
|
||||
|
|
@ -68,7 +68,7 @@ public partial class WarehouseOrderViewPage : IDisposable
|
|||
if (Working)
|
||||
return;
|
||||
Working = true;
|
||||
var process = new OrderProcessStateModel
|
||||
var process = new OrderProcessState
|
||||
{
|
||||
OrderId = Order.OrderId,
|
||||
ProcessStatusEnum = "packed"
|
||||
|
|
@ -82,7 +82,7 @@ public partial class WarehouseOrderViewPage : IDisposable
|
|||
if (Working)
|
||||
return;
|
||||
Working = true;
|
||||
var process = new OrderProcessStateModel
|
||||
var process = new OrderProcessState
|
||||
{
|
||||
OrderId = Order.OrderId,
|
||||
ProcessStatusEnum = "shipped"
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public class AuthenticationService : IAuthenticationService
|
|||
_localStorage = localStorage;
|
||||
}
|
||||
|
||||
public async Task<AuthResponseView> Login(CredentialModel credentials)
|
||||
public async Task<AuthResponseView> Login(CredentialDto credentials)
|
||||
{
|
||||
var credForm = new Dictionary<string, string>
|
||||
{
|
||||
|
|
@ -133,13 +133,13 @@ public class AuthenticationService : IAuthenticationService
|
|||
((AuthStateProvider)_authStateProvider).NotifyUserLogout();
|
||||
}
|
||||
|
||||
public async Task<UserAdminEditView> UserInfo(bool write = false)
|
||||
public async Task<UserManagerEditView> UserInfo(bool write = false)
|
||||
{
|
||||
var response = await _client.GetAsync(_apiConfig.Value.UserInfo).ConfigureAwait(true);
|
||||
var content = await response.Content.ReadAsStringAsync();
|
||||
var userInfo = JsonSerializer.Deserialize<UserAdminEditView>(content, _options);
|
||||
var userInfo = JsonSerializer.Deserialize<UserManagerEditView>(content, _options);
|
||||
if(write)
|
||||
await _infoService.SetUserInfo(userInfo);
|
||||
return userInfo ?? new UserAdminEditView();
|
||||
return userInfo ?? new UserManagerEditView();
|
||||
}
|
||||
}
|
||||
|
|
@ -21,8 +21,8 @@ namespace Wonky.Client.Services;
|
|||
|
||||
public interface IAuthenticationService
|
||||
{
|
||||
Task<AuthResponseView> Login(CredentialModel credentials);
|
||||
Task<AuthResponseView> Login(CredentialDto credentials);
|
||||
Task Logout();
|
||||
Task<string> RefreshToken();
|
||||
Task<UserAdminEditView> UserInfo(bool write = false);
|
||||
Task<UserManagerEditView> UserInfo(bool write = false);
|
||||
}
|
||||
|
|
@ -20,8 +20,8 @@ namespace Wonky.Client.Services;
|
|||
|
||||
public interface IUserInfoService
|
||||
{
|
||||
Task<UserAdminEditView> GetUserInfo();
|
||||
Task SetUserInfo(UserAdminEditView userInfo);
|
||||
Task<UserManagerEditView> GetUserInfo();
|
||||
Task SetUserInfo(UserManagerEditView userInfo);
|
||||
Task<string> GetRefreshToken();
|
||||
Task SetRefreshToken(string token);
|
||||
Task<string> GetAccessToken();
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@ public class UserInfoService : IUserInfoService
|
|||
_localStorageService = localStorageService;
|
||||
}
|
||||
|
||||
public async Task<UserAdminEditView> GetUserInfo()
|
||||
public async Task<UserManagerEditView> GetUserInfo()
|
||||
{
|
||||
return await _localStorageService.GetItemAsync<UserAdminEditView>(_infoKey);
|
||||
return await _localStorageService.GetItemAsync<UserManagerEditView>(_infoKey);
|
||||
}
|
||||
|
||||
public async Task SetUserInfo(UserAdminEditView userInfo)
|
||||
public async Task SetUserInfo(UserManagerEditView userInfo)
|
||||
{
|
||||
await _localStorageService.SetItemAsync(_infoKey, userInfo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@ namespace Wonky.Client.Shared;
|
|||
|
||||
public partial class ContactModal
|
||||
{
|
||||
[Parameter] public ContactModel ParamContact { get; set; } = new();
|
||||
[Parameter] public ContactDto ParamContact { get; set; } = new();
|
||||
[Parameter] public string CompanyName { get; set; } = "";
|
||||
[Parameter] public IAdvisorContactRepository ContactRepo { get; set; }
|
||||
[Parameter] public HttpInterceptorService Interceptor { get; set; }
|
||||
[Parameter] public EventCallback<ContactModel> OnSaveClicked { get; set; }
|
||||
[Parameter] public EventCallback<ContactDto> OnSaveClicked { get; set; }
|
||||
[Parameter] public EventCallback<string> OnDeleteClicked { get; set; }
|
||||
private ContactModel Contact { get; set; } = new();
|
||||
private ContactDto Contact { get; set; } = new();
|
||||
private string _modalDisplay = "";
|
||||
private bool _showBackdrop;
|
||||
private bool DisableDelete { get; set; }
|
||||
|
|
@ -44,7 +44,7 @@ public partial class ContactModal
|
|||
|
||||
protected override void OnParametersSet()
|
||||
{
|
||||
Contact = new ContactModel
|
||||
Contact = new ContactDto
|
||||
{
|
||||
CompanyId = ParamContact.CompanyId,
|
||||
ContactId = ParamContact.ContactId,
|
||||
|
|
@ -84,7 +84,7 @@ public partial class ContactModal
|
|||
{
|
||||
_modalDisplay = "none;";
|
||||
_showBackdrop = false;
|
||||
Contact = new ContactModel();
|
||||
Contact = new ContactDto();
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ActivityModel
|
||||
public class ActivityDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Activity entity id
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ActivityOfficeNoteModel
|
||||
public class ActivityOfficeNote
|
||||
{
|
||||
public string ActivityId { get; set; } = "";
|
||||
public string OfficeNote { get; set; } = "";
|
||||
|
|
@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class CompanyModel
|
||||
public class CompanyDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Account number
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ContactModel
|
||||
public class ContactDto
|
||||
{
|
||||
public string CompanyId { get; set; } = "";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class CredentialModel
|
||||
public class CredentialDto
|
||||
{
|
||||
/// <summary>
|
||||
/// User identification
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class EmailContactModel
|
||||
public class EmailContact
|
||||
{
|
||||
public string Name { get; set; } = "";
|
||||
public string Email { get; set; } = "";
|
||||
|
|
@ -16,9 +16,9 @@
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class EmailMessageModel
|
||||
public class EmailMessage
|
||||
{
|
||||
public List<EmailContactModel> To { get; set; } = new();
|
||||
public List<EmailContact> To { get; set; } = new();
|
||||
public string Subject { get; set; } = "";
|
||||
public string Body { get; set; } = "";
|
||||
public bool IsBodyHtml { get; set; }
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class KrvProductModel
|
||||
public class KrvProductDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Product entity Id
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class KrvVariantModel
|
||||
public class KrvVariantDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Variant entity id
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class OrderProcessStateModel
|
||||
public class OrderProcessState
|
||||
{
|
||||
/// <summary>
|
||||
/// Entity id
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ReportModel
|
||||
public class ReportDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Report name
|
||||
|
|
@ -62,5 +62,5 @@ public class ReportModel
|
|||
/// <summary>
|
||||
/// Report figures
|
||||
/// </summary>
|
||||
public ReportFiguresModel Figures { get; set; } = new();
|
||||
public ReportFiguresDto Figures { get; set; } = new();
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ReportFiguresModel
|
||||
public class ReportFiguresDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Sales day number
|
||||
|
|
@ -18,7 +18,7 @@ using Wonky.Entity.Views;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ReportInitModel
|
||||
public class ReportInitDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Flag to prevent activity to be added to report
|
||||
|
|
@ -28,7 +28,7 @@ public class ReportInitModel
|
|||
/// <summary>
|
||||
/// Report figures
|
||||
/// </summary>
|
||||
public ReportFiguresModel ReportData { get; set; } = new();
|
||||
public ReportFiguresDto ReportData { get; set; } = new();
|
||||
|
||||
/// <summary>
|
||||
/// List of activities for report
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ResetPasswordModel
|
||||
public class ResetPasswordDto
|
||||
{
|
||||
/// <summary>
|
||||
/// New password
|
||||
|
|
@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class ShortMessageModel
|
||||
public class ShortMessage
|
||||
{
|
||||
[Required] [MaxLength(11)] public string From { get; set; } = "";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class TaskItemModel
|
||||
public class TaskItemDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Task item entity id
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class UpdateCrmModel
|
||||
public class UpdateCrmDto
|
||||
{
|
||||
public string CrmNotes { get; set; } = "";
|
||||
public int Interval { get; set; }
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class UpdateErpModel
|
||||
public class UpdateErpDto
|
||||
{
|
||||
[MaxLength(100)] public string Address1 { get; set; } = "";
|
||||
[MaxLength(50)] public string Address2 { get; set; } = "";
|
||||
|
|
@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
|
||||
namespace Wonky.Entity.DTO;
|
||||
|
||||
public class UserAdminCreateModel
|
||||
public class UserManagerCreate
|
||||
{
|
||||
[MaxLength(128)] public string CompanyId { get; set; } = "";
|
||||
[MaxLength(128)] public string ContactId { get; set; } = "";
|
||||
|
|
@ -34,6 +34,6 @@ public class UserAdminCreateModel
|
|||
[Required(ErrorMessage = "Telefon nummer skal udfyldes")][MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til telefon nummber")] public string PhoneNumber { get; set; } = "";
|
||||
[Required(ErrorMessage = "Medarbejder ID skal udfyldes")][MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til medarbejder ID")] public string SalesRep { get; set; } = "";
|
||||
public string UserId { get; set; } = "";
|
||||
public List<UserAdminRoleAssignmentView> AssignedRoles { get; set; } = new();
|
||||
public List<UserAssignmentView> AssignedSubjects { get; set; } = new();
|
||||
public List<UserRoleAssignment> AssignedRoles { get; set; } = new();
|
||||
public List<SubjectAssignment> AssignedSubjects { get; set; } = new();
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue