+ @* Order lines *@
+
diff --git a/Wonky.Client/Pages/SalesReport.razor b/Wonky.Client/Pages/SalesReport.razor
index b05b980e..c3b6f322 100644
--- a/Wonky.Client/Pages/SalesReport.razor
+++ b/Wonky.Client/Pages/SalesReport.razor
@@ -35,7 +35,8 @@
- |
@@ -59,6 +59,26 @@
+
diff --git a/Wonky.Client/Pages/SalesReport.razor.cs b/Wonky.Client/Pages/SalesReport.razor.cs
index 290ae2c4..90bfb76c 100644
--- a/Wonky.Client/Pages/SalesReport.razor.cs
+++ b/Wonky.Client/Pages/SalesReport.razor.cs
@@ -30,7 +30,7 @@ public partial class SalesReport
[Inject] private UserPreferenceService UserPrefs { get; set; }
[Inject] private IActivityHttpRepository ActivityRepo { get; set; }
private EditContext _editContext { get; set; }
- private ActivityReportDto _reportDto = new();
+ private ReportDto _reportDto = new();
private Preferences _prefs { get; set; } = new();
private bool _formInvalid = true;
private List? Activities { get; set; } = new();
@@ -72,13 +72,13 @@ public partial class SalesReport
{
}
+
private async Task GetActivities()
{
Activities = null;
await UserPrefs.SetWorkDate(_reportDto.CheckIn);
Activities = await ActivityRepo
- .GetActivities($"{_reportDto.CheckIn:yyyy-MM-dd}")
- ;
+ .GetActivities($"{_reportDto.CheckIn:yyyy-MM-dd}");
}
public void Dispose()
diff --git a/Wonky.Client/Services/VatInfoLookupService.cs b/Wonky.Client/Services/VatInfoLookupService.cs
index 42e7f080..9526919a 100644
--- a/Wonky.Client/Services/VatInfoLookupService.cs
+++ b/Wonky.Client/Services/VatInfoLookupService.cs
@@ -51,7 +51,7 @@ public class VatInfoLookupService
["houseNumber"] = $"{query.HouseNumber}",
["zipCode"] = $"{query.ZipCode}"
};
- var endpoint = QueryHelpers.AddQueryString(_config.BrRegEndpoint, queryString);
+ var endpoint = QueryHelpers.AddQueryString(_config.VirkEndpoint, queryString);
var response = await _client.GetAsync(endpoint);
var content = await response.Content.ReadAsStringAsync();
var jsonResult = JsonSerializer.Deserialize>(content, _options);
@@ -64,7 +64,7 @@ public class VatInfoLookupService
return result.Count == 0 ? _noData : result;
}
- public async Task> QueryNoVatRegistry(string vatNumber)
+ public async Task> QueryBrRegistry(string vatNumber)
{
var queryString = new Dictionary
{
@@ -85,7 +85,7 @@ public class VatInfoLookupService
return result.Count == 0 ? _noData : result;
}
- public async Task> QueryViesVatRegistry(string vatNumber)
+ public async Task> QueryViesRegistry(string vatNumber)
{
var queryString = new Dictionary
{
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index c3e0c486..ca5adf05 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -8,7 +8,7 @@
},
"appInfo": {
"name": "Wonky Client",
- "version": "0.3.8",
+ "version": "0.4.3",
"isBeta": true,
"image": "grumpy-coder.png"
},
@@ -18,11 +18,12 @@
"userInfo": "api/auth/userinfo",
"customerEndpoint": "api/v2/crm/companies",
"catalogEndpoint": "api/v2/crm/catalog",
- "dkEndpointVat": "api/v2/services/virk",
- "noEndpointVat": "api/v2/services/brReg",
- "seEndpointVat": "api/v2/services/vies",
+ "virkEndpoint": "api/v2/services/virk",
+ "brRegEndpoint": "api/v2/services/brReg",
+ "viesEndpoint": "api/v2/services/vies",
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
"glsId": "",
- "activityEndpoint": "api/v2/crm/salesReps/sales"
+ "activityEndpoint": "api/v2/crm/salesReps/sales",
+ "reportEndpoint": "api/v2/crm/salesReps/reports"
}
}
\ No newline at end of file
diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs
index 28c84bef..a07c850c 100644
--- a/Wonky.Entity/Configuration/ApiConfig.cs
+++ b/Wonky.Entity/Configuration/ApiConfig.cs
@@ -24,11 +24,12 @@ public class ApiConfig
public string ImageUpload { get; set; } = "";
public string UserRegistration { get; set; } = "";
public string UserInfo { get; set; } = "";
+ public string VirkEndpoint { get; set; } = "";
public string BrRegEndpoint { get; set; } = "";
- public string NoEndpointVat { get; set; } = "";
public string ViesEndpoint { get; set; } = "";
public string TokenPath { get; set; } = "";
public string GlsTrackUrl { get; set; } = "";
public string GlsId { get; set; } = "";
public string ActivityEndpoint { get; set; } = "";
+ public string ReportEndpoint { get; set; } = "";
}
\ No newline at end of file
diff --git a/Wonky.Entity/DTO/ActivityDto.cs b/Wonky.Entity/DTO/ActivityDto.cs
index b388683b..f09a73b6 100644
--- a/Wonky.Entity/DTO/ActivityDto.cs
+++ b/Wonky.Entity/DTO/ActivityDto.cs
@@ -35,6 +35,7 @@ namespace Wonky.Entity.DTO
public string SalesRep { get; set; } = "";
[Required(ErrorMessage = "Vælg aktivitetstype")] public string ActivityTypeEnum { get; set; } = "";
[Required(ErrorMessage = "Vælg status for besøg ")] public string ActivityStatusEnum { get; set; } = "";
+ public string VisitTypeEnum { get; set; } = "recall";
public bool CheckDate { get; set; }
[Required] public string ActivityDate { get; set; } = "";
[MaxLength(50, ErrorMessage = "Du kan højst bruge 50 tegn")] public string Demo { get; set; } = "";
diff --git a/Wonky.Entity/DTO/ActivityReportDto.cs b/Wonky.Entity/DTO/ReportDto.cs
similarity index 92%
rename from Wonky.Entity/DTO/ActivityReportDto.cs
rename to Wonky.Entity/DTO/ReportDto.cs
index f0e8a223..de41f2f1 100644
--- a/Wonky.Entity/DTO/ActivityReportDto.cs
+++ b/Wonky.Entity/DTO/ReportDto.cs
@@ -2,13 +2,12 @@ using System.ComponentModel.DataAnnotations;
namespace Wonky.Entity.DTO;
-public class ActivityReportDto
-{
- [Required(ErrorMessage = "Dato skal angives")] public DateTime ActivityDate { get; set; }
+public class ReportDto
+{
[Required(ErrorMessage = "Dagtype skal angives")] public string DayTypeEnum { get; set; } = "";
- [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] public string SupervisedBy { get; set; } = "";
[MaxLength(1000, ErrorMessage = "Du kan højst bruge 1000 tegn")] public string Description { get; set; } = "";
- //
+ [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] public string SupervisedBy { get; set; } = "";
+ // Date interval (used for leave, sickLeave and work hours
public DateTime CheckIn { get; set; }
public DateTime CheckOut { get; set; }
// workday
diff --git a/Wonky.Entity/Models/ReportActivity.cs b/Wonky.Entity/Models/ReportActivity.cs
index 956ba721..60c5f3ab 100644
--- a/Wonky.Entity/Models/ReportActivity.cs
+++ b/Wonky.Entity/Models/ReportActivity.cs
@@ -2,7 +2,7 @@ namespace Wonky.Entity.Models;
public class ReportActivity
{
- public Visitcompany Company { get; set; }
+ public VisitCompany Company { get; set; }
public string SalesHeadId { get; set; } = "";
public bool Closed { get; set; }
public string OrderDate { get; set; } = "";
@@ -14,7 +14,7 @@ public class ReportActivity
public string SalesResume { get; set; } = "";
}
-public class Visitcompany
+public class VisitCompany
{
public string CompanyId { get; set; } = "";
public string Account { get; set; } = "";