+
diff --git a/Wonky.Client/Pages/ReportViewPageOffice.razor b/Wonky.Client/Pages/ReportViewPageOffice.razor
index 361bbd05..2997e64f 100644
--- a/Wonky.Client/Pages/ReportViewPageOffice.razor
+++ b/Wonky.Client/Pages/ReportViewPageOffice.razor
@@ -20,8 +20,7 @@
@page "/admin/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"
@attribute [Authorize(Roles = "Admin")]
-
-
+
@DateTime.Parse(ReportDate).ToLongDateString()
@@ -33,7 +32,6 @@
-
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum))
{
@Report.ReportData.Name
@@ -59,11 +57,6 @@
Ingen data
}
-
-
-
-
-
@if (_items.Any())
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 10a2955a..5571733d 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,13 +1,13 @@
{
"appInfo": {
"name": "Wonky Client",
- "version": "0.11.122",
+ "version": "0.12.1",
"rc": false,
"sandBox": false,
"image": "grumpy-coder.png"
},
"apiConfig": {
- "innoBaseUrl": "https://eta.innotec.dk",
+ "innoBaseUrl": "https://dev.innotec.dk",
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
"glsId": "",
"serviceVirk": "api/v2/services/virk",
diff --git a/Wonky.Client/wwwroot/css/app-v0.10.101.css b/Wonky.Client/wwwroot/css/app-v0.12.0.css
similarity index 94%
rename from Wonky.Client/wwwroot/css/app-v0.10.101.css
rename to Wonky.Client/wwwroot/css/app-v0.12.0.css
index ccf96ea8..1e951d5b 100644
--- a/Wonky.Client/wwwroot/css/app-v0.10.101.css
+++ b/Wonky.Client/wwwroot/css/app-v0.12.0.css
@@ -148,12 +148,10 @@ footer.version {
-webkit-print-color-adjust: exact;
color-adjust: exact;
}
- .report-page {
+ .report-main {
+ font-size: 10px;
break-after: page;
- /*break-before: page;*/
-
height: initial;
-
border: initial;
border-radius: initial;
box-shadow: initial;
@@ -162,10 +160,9 @@ footer.version {
-webkit-print-color-adjust: exact;
color-adjust: exact;
}
- .report-page-item {
- break-after: page;
+ .report-visit {
+ break-before: page;
break-inside: avoid-page;
-
height: initial;
border: initial;
border-radius: initial;
diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html
index a64538c1..38df0c92 100644
--- a/Wonky.Client/wwwroot/index.html
+++ b/Wonky.Client/wwwroot/index.html
@@ -17,7 +17,7 @@
-
+
diff --git a/Wonky.Entity/DTO/CompanyDto.cs b/Wonky.Entity/DTO/CompanyDto.cs
index 33141bbe..c867c406 100644
--- a/Wonky.Entity/DTO/CompanyDto.cs
+++ b/Wonky.Entity/DTO/CompanyDto.cs
@@ -154,6 +154,8 @@ public class CompanyDto
/// Date for last sync of product history
///
public string HistorySync { get; set; } = "";
+
+ public int IsDirty { get; set; } = 0;
///
/// Virtual property indicating if timespan is within the defined interval
diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs
index 6bde41c2..b769b4b9 100644
--- a/Wonky.Entity/Views/ReportItemView.cs
+++ b/Wonky.Entity/Views/ReportItemView.cs
@@ -30,6 +30,10 @@ public class ReportItemView
///
public bool Closed { get; set; }
///
+ /// ProcessStatus as string
+ ///
+ public string ProcessStatusEnum { get; set; } = "";
+ ///
/// express flag
///
public bool Express { get; set; }