diff --git a/Wonky.Client/Components/ActivityTableComponent.razor b/Wonky.Client/Components/ActivityTableComponent.razor index 396a8422..05be2332 100644 --- a/Wonky.Client/Components/ActivityTableComponent.razor +++ b/Wonky.Client/Components/ActivityTableComponent.razor @@ -23,6 +23,7 @@ Besøg Demo Salg + Beløb @@ -33,7 +34,8 @@ @activity.Company.Name, @activity.Company.ZipCity @activity.Demo @activity.SalesResume - @activity.OrderAmount + @(activity.StatusTypeEnum == "Quote" ? "Tilbud" : "Salg") + @(activity.Closed ? @activity.OrderAmount : 0) } diff --git a/Wonky.Client/Components/AdviserTableComponent.razor b/Wonky.Client/Components/AdminAdviserTableComponent.razor similarity index 100% rename from Wonky.Client/Components/AdviserTableComponent.razor rename to Wonky.Client/Components/AdminAdviserTableComponent.razor diff --git a/Wonky.Client/Components/AdviserTableComponent.razor.cs b/Wonky.Client/Components/AdminAdviserTableComponent.razor.cs similarity index 80% rename from Wonky.Client/Components/AdviserTableComponent.razor.cs rename to Wonky.Client/Components/AdminAdviserTableComponent.razor.cs index dd9a4f92..2b321eec 100644 --- a/Wonky.Client/Components/AdviserTableComponent.razor.cs +++ b/Wonky.Client/Components/AdminAdviserTableComponent.razor.cs @@ -4,7 +4,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class AdviserTableComponent +public partial class AdminAdviserTableComponent { [Parameter] public List UserList { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/Components/AdminReportTableComponent.razor b/Wonky.Client/Components/AdminReportTableComponent.razor index bb848dde..42aaef96 100644 --- a/Wonky.Client/Components/AdminReportTableComponent.razor +++ b/Wonky.Client/Components/AdminReportTableComponent.razor @@ -22,7 +22,7 @@ @foreach (var report in ReportList) { - +
@report.ReportDate diff --git a/Wonky.Client/Components/AdminReportTableComponent.razor.cs b/Wonky.Client/Components/AdminReportTableComponent.razor.cs index 73080e71..6ff9ea99 100644 --- a/Wonky.Client/Components/AdminReportTableComponent.razor.cs +++ b/Wonky.Client/Components/AdminReportTableComponent.razor.cs @@ -6,5 +6,5 @@ namespace Wonky.Client.Components; public partial class AdminReportTableComponent { [Parameter] public List ReportList { get; set; } = new(); - [Parameter] public string ErpUserId { get; set; } = ""; + [Parameter] public string UserId { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Client/Components/CompanyTableComponent.razor b/Wonky.Client/Components/CompanyTableComponent.razor index b1b40627..8c4bce6d 100644 --- a/Wonky.Client/Components/CompanyTableComponent.razor +++ b/Wonky.Client/Components/CompanyTableComponent.razor @@ -63,9 +63,9 @@
@company.City
-
+
diff --git a/Wonky.Client/Pages/ActivityVisitNew.razor.cs b/Wonky.Client/Pages/ActivityVisitNew.razor.cs index 0ed74c12..036dbbb0 100644 --- a/Wonky.Client/Pages/ActivityVisitNew.razor.cs +++ b/Wonky.Client/Pages/ActivityVisitNew.razor.cs @@ -32,9 +32,10 @@ namespace Wonky.Client.Pages; public partial class ActivityVisitNew : IDisposable { + // Parameters [CascadingParameter] DraftStateProvider DraftStateProvider { get; set; } [Parameter] public string CompanyId { get; set; } - // todo: prevent creating activity for workDate with closed report + // Services [Inject] private ILogger _logger { get; set; } [Inject] private IToastService _toast { get; set; } [Inject] private NavigationManager _navigator { get; set; } @@ -45,10 +46,8 @@ public partial class ActivityVisitNew : IDisposable [Inject] private UserPreferenceService _userPrefs { get; set; } [Inject] private IActivityHttpRepository _activityRepo { get; set; } [Inject] private IReportHttpRepository _reportRepo { get; set; } - private readonly JsonSerializerOptions? _options = new JsonSerializerOptions - { - PropertyNameCaseInsensitive = true - }; + // variables + private readonly JsonSerializerOptions? _options = new JsonSerializerOptions{PropertyNameCaseInsensitive = true}; private NgSalesItemView _selectedItem { get; set; } = new(); private List _caltalog { get; set; } = new(); private MetaData _metaData { get; set; } = new(); @@ -69,7 +68,7 @@ public partial class ActivityVisitNew : IDisposable private bool InvalidActivity = true; private bool InvalidCanvas = true; private bool _reportClosdd { get; set; } = false; - private UserInfoView Ux { get; set; } = new(); + private UserInfoView _ux { get; set; } = new(); private DateTime _workDate { get; set; } = DateTime.Now; protected override async Task OnParametersSetAsync() @@ -103,19 +102,19 @@ public partial class ActivityVisitNew : IDisposable await GetSalesItems(); - Ux = await _storage.GetItemAsync("_xu"); + _ux = await _storage.GetItemAsync("_xu"); _company = await _companyRepo.GetCompanyById(CompanyId); // set up identification _draft.CompanyId = _company.CompanyId; _draft.BcId = _company.BcId; - _draft.SalesRepId = Ux.Id; + _draft.SalesRepId = _ux.Id; _draft.ActivityStatusEnum = "noSale"; _draft.VisitTypeEnum = _company.Account is "" or "NY" ? "new" : "recall"; // permanent identifications - _draft.SalesRep = Ux.Adviser; + _draft.SalesRep = _ux.Adviser; _draft.Account = _company.Account; _draft.VatNumber = _company.VatNumber; _draft.EMail = _company.Email; @@ -138,6 +137,7 @@ public partial class ActivityVisitNew : IDisposable private void SetWorkDate(string workDate) { + Console.WriteLine($"SetWorkDate => {workDate}"); _logger.LogInformation("WorkDateComponent.OnChanged(SetWorkDate(workDate)) => {workDate}", workDate); _workDate = DateTime.Parse(workDate); _draft.ActivityDate = workDate; @@ -154,7 +154,7 @@ public partial class ActivityVisitNew : IDisposable "onSite" => "B:", _ => "" }; - _draft.OurRef = $"{activityType}{Ux.FullName.Split(" ")[0]}"; + _draft.OurRef = $"{activityType}{_ux.FullName.Split(" ")[0]}"; var ln = 0; var lines = DraftStateProvider.Draft.Items.Select(item => new ActivityLineDto { diff --git a/Wonky.Client/Pages/AdminAdviserUserList.razor b/Wonky.Client/Pages/AdminAdviserUserList.razor index 8c2bb96c..eaadc875 100644 --- a/Wonky.Client/Pages/AdminAdviserUserList.razor +++ b/Wonky.Client/Pages/AdminAdviserUserList.razor @@ -8,6 +8,6 @@

Sælgere

- +
\ No newline at end of file diff --git a/Wonky.Client/Pages/AdminSalesReportList.razor b/Wonky.Client/Pages/AdminSalesReportList.razor index b7cb3674..14624fb3 100644 --- a/Wonky.Client/Pages/AdminSalesReportList.razor +++ b/Wonky.Client/Pages/AdminSalesReportList.razor @@ -27,6 +27,6 @@
- +
diff --git a/Wonky.Client/Pages/AdminSalesReportList.razor.cs b/Wonky.Client/Pages/AdminSalesReportList.razor.cs index 702536be..072d8ca8 100644 --- a/Wonky.Client/Pages/AdminSalesReportList.razor.cs +++ b/Wonky.Client/Pages/AdminSalesReportList.razor.cs @@ -9,7 +9,7 @@ namespace Wonky.Client.Pages; public partial class AdminSalesReportList : IDisposable { [Parameter] public string UserId { get; set; } = ""; - [Inject] private IReportHttpRepository _reportRepo { get; set; } + [Inject] private IAdminReportHttpRepository _reportRepo { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } private List _reports { get; set; } @@ -19,7 +19,7 @@ public partial class AdminSalesReportList : IDisposable _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - _reports = await _reportRepo.GetReports(); + _reports = await _reportRepo.GetReports(UserId); } public void Dispose() diff --git a/Wonky.Client/Pages/CompanyList.razor b/Wonky.Client/Pages/CompanyList.razor index 0836ee9d..f33cf3c0 100644 --- a/Wonky.Client/Pages/CompanyList.razor +++ b/Wonky.Client/Pages/CompanyList.razor @@ -21,7 +21,7 @@ @attribute [Authorize(Roles = "Adviser")] -
+
@@ -38,12 +38,10 @@
-
+
-
-
-
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")] -
+
@@ -41,7 +41,7 @@
-
+
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 @@
- - - - - - - - - - - - - - @if (_report.DayTypeEnum.ToLower().Contains("leave")) - { +
+
DagenBegyndtAfsluttet
- - -
+ + + + + + + + + + + + @if (_report.DayTypeEnum.ToLower().Contains("leave")) + { + + + } + else + { + + + } + - } - else - { - - - } - - - - -
DagenBegyndtAfsluttet
- + + + + + + + + + + + + - + - - - - - - - -
+ + + +
@if (!_report.DayTypeEnum.ToLower().Contains("leave")) { @@ -147,16 +149,84 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Dagens Demo @(_report.Figures.NewDemoCount + _report.Figures.RecallDemoCount)Dagens ResultatMåneds Resultat
BesøgDemoSalgBeløbBesøgDemoSalgBelø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) { - + - + + @@ -178,75 +248,6 @@
Besøg Demo SalgBeløbBeløb
} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Demo @(_report.Figures.NewDemoCount + _report.Figures.RecallDemoCount)ResultatResultat Måned
BesøgDemoSalgBeløbBesøgDemoSalgBelø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; } = "";