+
-
-
-
diff --git a/Wonky.Client/Pages/ItemCatalog.razor b/Wonky.Client/Pages/ItemCatalog.razor
index 72281426..1594139b 100644
--- a/Wonky.Client/Pages/ItemCatalog.razor
+++ b/Wonky.Client/Pages/ItemCatalog.razor
@@ -21,7 +21,7 @@
@attribute [Authorize(Roles = "Adviser,Admin")]
-
+
-
diff --git a/Wonky.Client/Pages/SalesReportNew.razor b/Wonky.Client/Pages/SalesReportNew.razor
index f47e7b44..fe5b5d86 100644
--- a/Wonky.Client/Pages/SalesReportNew.razor
+++ b/Wonky.Client/Pages/SalesReportNew.razor
@@ -39,66 +39,68 @@
-
-
-
- Dagen
- Begyndt
- Afsluttet
-
-
-
-
-
-
-
-
- → TAG MIG ←
- Salgsdag
- Salgsmøde
- Kontordag
- Supervisor
- Sygdom
- Ferie
-
-
-
- @if (_report.DayTypeEnum.ToLower().Contains("leave"))
- {
+
+
+
+
@if (!_report.DayTypeEnum.ToLower().Contains("leave"))
{
+
+
+
+
+ Dagens Demo @(_report.Figures.NewDemoCount + _report.Figures.RecallDemoCount)
+ Dagens Resultat
+ Måneds Resultat
+
+
+
+
+
+ Besøg
+ Demo
+ Salg
+ Beløb
+ Besøg
+ Demo
+ Salg
+ Beløb
+
+
+ N
+ @_report.Figures.NewVisitCount
+ @_report.Figures.NewDemoCount
+ @_report.Figures.NewSaleCount
+ @_report.Figures.NewTurnover
+ @_report.Figures.NewVisitCountMonth
+ @_report.Figures.NewDemoCountMonth
+ @_report.Figures.NewSaleCountMonth
+ @_report.Figures.NewTurnoverMonth
+
+
+ R
+ @_report.Figures.RecallVisitCount
+ @_report.Figures.RecallDemoCount
+ @_report.Figures.RecallSaleCount
+ @_report.Figures.RecallTurnover
+ @_report.Figures.RecallVisitCountMonth
+ @_report.Figures.RecallDemoCountMonth
+ @_report.Figures.RecallSaleCountMonth
+ @_report.Figures.RecallTurnoverMonth
+
+
+ SAS
+
+
+ @_report.Figures.SasCount
+ @_report.Figures.SasTurnover
+
+
+ @_report.Figures.SasCountMonth
+ @_report.Figures.SasTurnoverMonth
+
+
+ TOTAL
+ @_report.Figures.TotalVisitCount
+ @_report.Figures.TotalDemoCount
+ @_report.Figures.TotalSaleCount
+ @_report.Figures.TotalTurnover
+ @_report.Figures.TotalVisitCountMonth
+ @_report.Figures.TotalDemoCountMonth
+ @_report.Figures.TotalSaleCountMonth
+ @_report.Figures.TotalTurnoverMonth
+
+
+
@if (_activities != null)
{
-
+
Besøg
Demo
Salg
- Beløb
+
+ Beløb
@@ -178,75 +248,6 @@
}
-
-
-
-
- Demo @(_report.Figures.NewDemoCount + _report.Figures.RecallDemoCount)
- Resultat
- Resultat Måned
-
-
-
-
-
- Besøg
- Demo
- Salg
- Beløb
- Besøg
- Demo
- Salg
- Beløb
-
-
- N
- @_report.Figures.NewVisitCount
- @_report.Figures.NewDemoCount
- @_report.Figures.NewSaleCount
- @_report.Figures.NewTurnover
- @_report.Figures.NewVisitCountMonth
- @_report.Figures.NewDemoCountMonth
- @_report.Figures.NewSaleCountMonth
- @_report.Figures.NewTurnoverMonth
-
-
- R
- @_report.Figures.RecallVisitCount
- @_report.Figures.RecallDemoCount
- @_report.Figures.RecallSaleCount
- @_report.Figures.RecallTurnover
- @_report.Figures.RecallVisitCountMonth
- @_report.Figures.RecallDemoCountMonth
- @_report.Figures.RecallSaleCountMonth
- @_report.Figures.RecallTurnoverMonth
-
-
- SAS
-
-
- @_report.Figures.SasCount
- @_report.Figures.SasTurnover
-
-
- @_report.Figures.SasCountMonth
- @_report.Figures.SasTurnoverMonth
-
-
- TOTAL
- @(_report.Figures.TotalVisitCount)
- @(_report.Figures.TotalDemoCount)
- @(_report.Figures.TotalSaleCount)
- @(_report.Figures.TotalTurnover)
- @(_report.Figures.TotalVisitCountMonth)
- @(_report.Figures.TotalDemoCountMonth)
- @(_report.Figures.TotalSaleCountMonth)
- @(_report.Figures.TotalTurnoverMonth)
-
-
-
-
-
}
diff --git a/Wonky.Client/Pages/SalesReportNew.razor.cs b/Wonky.Client/Pages/SalesReportNew.razor.cs
index 2834554c..adb8b21b 100644
--- a/Wonky.Client/Pages/SalesReportNew.razor.cs
+++ b/Wonky.Client/Pages/SalesReportNew.razor.cs
@@ -62,6 +62,9 @@ public partial class SalesReportNew : IDisposable
_prefs = await _userPrefs.GetPreferences();
if (!string.IsNullOrWhiteSpace(_prefs.WorkDate))
_workDate = DateTime.Parse(_prefs.WorkDate);
+ if(await _reportRepo.ReportExist(_prefs.WorkDate))
+ _navigator.NavigateTo($"/sales-reports/view/{_prefs.WorkDate}");
+
_leaveBegin = _workDate;
_leaveEnd = _workDate;
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 16dd5cd7..d098a966 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,12 +1,12 @@
{
"appInfo": {
"name": "Wonky Client",
- "version": "0.8.38",
+ "version": "0.8.40",
"isBeta": true,
"image": "grumpy-coder.png"
},
"apiConfig": {
- "innoBaseUrl": "https://dev.innotec.dk",
+ "innoBaseUrl": "https://staging.innotec.dk",
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
"glsId": "",
"virkUrl": "api/v2/services/virk",
diff --git a/Wonky.Entity/DTO/AdviserInfoView.cs b/Wonky.Entity/DTO/AdviserInfoView.cs
index 19044fd8..f4e6dbde 100644
--- a/Wonky.Entity/DTO/AdviserInfoView.cs
+++ b/Wonky.Entity/DTO/AdviserInfoView.cs
@@ -31,4 +31,5 @@ public class AdviserInfoView
public bool EmailConfirmed { get; set; }
public bool IsAdviser { get; set; }
public bool IsAdmin { get; set; }
+ public string UserId { get; set; } = "";
}
\ No newline at end of file
diff --git a/Wonky.Entity/Views/NgReportActivityView.cs b/Wonky.Entity/Views/NgReportActivityView.cs
index a755db23..dd683759 100644
--- a/Wonky.Entity/Views/NgReportActivityView.cs
+++ b/Wonky.Entity/Views/NgReportActivityView.cs
@@ -4,6 +4,7 @@ public class NgReportActivityView
{
public ActivityCompanyView Company { get; set; } = new();
public string SalesHeadId { get; set; } = "";
+ public string StatusTypeEnum { get; set; } = "";
public bool Closed { get; set; }
public string OrderDate { get; set; } = "";
public string ReferenceNumber { get; set; } = "";
diff --git a/Wonky.Entity/Views/NgSalesReportListView.cs b/Wonky.Entity/Views/NgSalesReportListView.cs
index c5aabce4..5670ed88 100644
--- a/Wonky.Entity/Views/NgSalesReportListView.cs
+++ b/Wonky.Entity/Views/NgSalesReportListView.cs
@@ -3,6 +3,7 @@ namespace Wonky.Entity.Views;
public class NgSalesReportListView
{
public string ReportId { get; set; } = "";
+ public string UserId { get; set; } = "";
public string Name { get; set; } = "";
public string Description { get; set; } = "";
public string ReportDate { get; set; } = "";