From f05548a07581ed35b06aed998c2af549f4efa082 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Mon, 13 Jun 2022 14:49:37 +0200 Subject: [PATCH] built v.0.7 --- Wonky.Client/Components/ActivityButton.razor | 6 +- Wonky.Client/Components/Home.razor.cs | 1 + ...archComponent.razor => SearchPhrase.razor} | 8 +- ...mponent.razor.cs => SearchPhrase.razor.cs} | 28 +++-- .../Components/WorkDateComponent.razor.cs | 2 +- Wonky.Client/Pages/CompanyList.razor | 20 ++-- Wonky.Client/Pages/CompanyList.razor.cs | 8 +- Wonky.Client/Pages/CompanyUpdate.razor | 9 +- Wonky.Client/Pages/CrmActivityCreate.razor | 8 +- Wonky.Client/Pages/SalesReport.razor | 108 ++++++++++++------ Wonky.Client/wwwroot/appsettings.json | 4 +- Wonky.Client/wwwroot/index.html | 14 +-- Wonky.Client/wwwroot/site.webmanifest | 10 +- 13 files changed, 147 insertions(+), 79 deletions(-) rename Wonky.Client/Components/{SearchComponent.razor => SearchPhrase.razor} (68%) rename Wonky.Client/Components/{SearchComponent.razor.cs => SearchPhrase.razor.cs} (69%) diff --git a/Wonky.Client/Components/ActivityButton.razor b/Wonky.Client/Components/ActivityButton.razor index 886b98ad..4fc2aabb 100644 --- a/Wonky.Client/Components/ActivityButton.razor +++ b/Wonky.Client/Components/ActivityButton.razor @@ -1,15 +1,13 @@ @if (Enabled == 1) { - Opret Besøg + Besøg } else { - Opret Besøg + Besøg } @code { - [Parameter] public string CompanyId { get; set; } = ""; [Parameter]public int Enabled { get; set; } - } \ No newline at end of file diff --git a/Wonky.Client/Components/Home.razor.cs b/Wonky.Client/Components/Home.razor.cs index 26db03a0..2ce37f20 100644 --- a/Wonky.Client/Components/Home.razor.cs +++ b/Wonky.Client/Components/Home.razor.cs @@ -53,6 +53,7 @@ public partial class Home : IDisposable private async Task FetchActivities(string workDate) { + _workDate = workDate; Activities = new List(); Activities = await ActivityRepo.GetActivities(workDate); } diff --git a/Wonky.Client/Components/SearchComponent.razor b/Wonky.Client/Components/SearchPhrase.razor similarity index 68% rename from Wonky.Client/Components/SearchComponent.razor rename to Wonky.Client/Components/SearchPhrase.razor index 9a96f9e8..84a482cd 100644 --- a/Wonky.Client/Components/SearchComponent.razor +++ b/Wonky.Client/Components/SearchPhrase.razor @@ -15,5 +15,9 @@ // *@ - +
+ + +
+ diff --git a/Wonky.Client/Components/SearchComponent.razor.cs b/Wonky.Client/Components/SearchPhrase.razor.cs similarity index 69% rename from Wonky.Client/Components/SearchComponent.razor.cs rename to Wonky.Client/Components/SearchPhrase.razor.cs index e40cc465..a51844ec 100644 --- a/Wonky.Client/Components/SearchComponent.razor.cs +++ b/Wonky.Client/Components/SearchPhrase.razor.cs @@ -19,24 +19,34 @@ using Timer = System.Timers.Timer; namespace Wonky.Client.Components { - public partial class SearchComponent + public partial class SearchPhrase { private Timer _timer = new(); - private string? SearchTerm { get; set; } - [Parameter] public EventCallback OnChanged { get; set; } - [Parameter] public string? SavedSearch { get; set; } + private string SearchTerm { get; set; } = ""; + [Parameter] public EventCallback OnChanged { get; set; } + [Parameter] public string SavedSearch { get; set; } = ""; + + protected override void OnParametersSet() + { + if (!string.IsNullOrWhiteSpace(SavedSearch)) + SearchTerm = SavedSearch; + } protected override void OnInitialized() { - if (string.IsNullOrWhiteSpace(SavedSearch)) return; - SearchTerm = SavedSearch; - OnChanged.InvokeAsync(SearchTerm); - //SearchChanged(); + if(!string.IsNullOrWhiteSpace(SavedSearch)) + OnSearchChanged(); } + private void ClearSearch() + { + SavedSearch = ""; + SearchTerm = ""; + OnChanged.InvokeAsync(SearchTerm); + } private void OnSearchChanged() { - _timer = new Timer(500); + _timer = new Timer(750); _timer.Elapsed += OnTimerElapsed; _timer.AutoReset = false; _timer.Enabled = true; diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index ebb6ac61..f49a620a 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -26,8 +26,8 @@ public partial class WorkDateComponent : IDisposable private async Task OnDateChanged(ChangeEventArgs e) { var val = $"{DateOnly.Parse(e.Value?.ToString()!):yyyy-MM-dd}"; + await UserPrefs.SetWorkDate(DateTime.Parse(val)); await OnChanged.InvokeAsync(val); - await UserPrefs.SetWorkDate(DateTime.Parse(val)); } private void ProfileServiceOnOnChange(Preferences newPreferences) diff --git a/Wonky.Client/Pages/CompanyList.razor b/Wonky.Client/Pages/CompanyList.razor index e84f32de..2d2894b7 100644 --- a/Wonky.Client/Pages/CompanyList.razor +++ b/Wonky.Client/Pages/CompanyList.razor @@ -23,27 +23,29 @@
-
+
-
- +
+
-
+
-
+
-
- Opret kunde -
-
+
+
+
+
+ Opret kunde +
diff --git a/Wonky.Client/Pages/CompanyList.razor.cs b/Wonky.Client/Pages/CompanyList.razor.cs index da2e1783..513ae521 100644 --- a/Wonky.Client/Pages/CompanyList.razor.cs +++ b/Wonky.Client/Pages/CompanyList.razor.cs @@ -36,6 +36,7 @@ namespace Wonky.Client.Pages public MetaData? MetaData { get; set; } = new(); private CompanyPagingParams _paging = new(); private Preferences _preferences { get; set; } = new(); + private string _savedSearch { get; set; } = ""; protected override async Task OnInitializedAsync() { @@ -45,7 +46,10 @@ namespace Wonky.Client.Pages _paging.SearchColumn = _preferences.CompanySearch; _paging.PageSize = Convert.ToInt32(_preferences.PageSize); - // + _savedSearch = string.IsNullOrWhiteSpace(_preferences.CompanyFilterPhrase) + ? "" : _preferences.CompanyFilterPhrase; + _paging.SearchTerm = _savedSearch; + Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // get companies @@ -76,6 +80,8 @@ namespace Wonky.Client.Pages private async Task SetSearchPhrase(string searchTerm) { + if(string.IsNullOrWhiteSpace(searchTerm)) + await UserPrefService.SetCompanyFilterPhrase(""); Companies = new List(); _paging.PageNumber = 1; _paging.SearchTerm = searchTerm; diff --git a/Wonky.Client/Pages/CompanyUpdate.razor b/Wonky.Client/Pages/CompanyUpdate.razor index 156468a7..f405c55b 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor +++ b/Wonky.Client/Pages/CompanyUpdate.razor @@ -162,13 +162,16 @@
- +
- +
- + +
+
+ Til Oversigt
Tilbage diff --git a/Wonky.Client/Pages/CrmActivityCreate.razor b/Wonky.Client/Pages/CrmActivityCreate.razor index 141c81ad..b5f908d6 100644 --- a/Wonky.Client/Pages/CrmActivityCreate.razor +++ b/Wonky.Client/Pages/CrmActivityCreate.razor @@ -139,7 +139,7 @@
- +
@@ -361,13 +361,15 @@
-
+
+ Til Oversigt +
Tilbage
@* *@ - +
diff --git a/Wonky.Client/Pages/SalesReport.razor b/Wonky.Client/Pages/SalesReport.razor index 96bb320c..ccf1dbb6 100644 --- a/Wonky.Client/Pages/SalesReport.razor +++ b/Wonky.Client/Pages/SalesReport.razor @@ -89,44 +89,57 @@ @if (!_reportDto.DayTypeEnum.ToLower().Contains("leave")) { -
- -
- - -
- -
- - -
-
- - - - - + + + + + + + + + + +
Km MorgenKm AftenKm KørtKm PrivatTekstMedkørende Supervisor
+ + + + + + +
+ + + + + + + + + + + @@ -150,14 +163,14 @@ - + } - +
Km morgenKm aftenKm kørtKm privatMd privatMd total
- - - + - + + + +
@activity.Company.Name - @activity.Company.ZipCity @activity.Demo @activity.SalesResume@activity.OrderAmount@activity.OrderAmount
Total@_reportDto.Figures.TotalTurnover@_reportDto.Figures.TotalTurnover
@@ -173,7 +186,7 @@ - * + Besøg Demo Salg @@ -184,7 +197,7 @@ Beløb - + N @_reportDto.Figures.NewVisitCount @_reportDto.Figures.NewDemoCount @_reportDto.Figures.NewSaleCount @@ -192,19 +205,46 @@ @_reportDto.Figures.NewVisitCountMonth @_reportDto.Figures.NewDemoCountMonth @_reportDto.Figures.NewSaleCountMonth - + @_reportDto.Figures.NewTurnoverMonth + + R + @_reportDto.Figures.RecallVisitCount + @_reportDto.Figures.RecallDemoCount + @_reportDto.Figures.RecallSaleCount + @_reportDto.Figures.RecallTurnover + @_reportDto.Figures.RecallVisitCountMonth + @_reportDto.Figures.RecallDemoCountMonth + @_reportDto.Figures.RecallSaleCountMonth + @_reportDto.Figures.RecallTurnoverMonth + + + SAS + + + @_reportDto.Figures.SasCount + @_reportDto.Figures.SasTurnover + + + @_reportDto.Figures.SasCountMonth + @_reportDto.Figures.SasTurnoverMonth + + + TOTAL + @(_reportDto.Figures.NewVisitCount + _reportDto.Figures.RecallVisitCount) + @(_reportDto.Figures.NewDemoCount + _reportDto.Figures.RecallDemoCount) + @(_reportDto.Figures.NewSaleCount + _reportDto.Figures.RecallSaleCount + _reportDto.Figures. SasCount) + @(_reportDto.Figures.NewTurnover + _reportDto.Figures.RecallTurnover + _reportDto.Figures.SasTurnover) + @(_reportDto.Figures.NewVisitCountMonth + _reportDto.Figures.RecallVisitCountMonth) + @(_reportDto.Figures.NewDemoCountMonth + _reportDto.Figures.RecallDemoCountMonth) + @(_reportDto.Figures.NewSaleCountMonth + _reportDto.Figures.RecallSaleCountMonth + _reportDto.Figures. SasCountMonth) + @(_reportDto.Figures.NewTurnoverMonth + _reportDto.Figures.RecallTurnoverMonth + _reportDto.Figures.SasTurnoverMonth) + + + }
- -
workDate: @_workDate
-
tsIn: @_timestampIn
-
tsOut: @_timestampOut
-
checkIn: @_reportDto.CheckIn
-
checkOut: @_reportDto.CheckOut
-
leaveBegin: @_leaveBegin
-
leaveEnd: @_leaveEnd
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index bb7b61f0..775b2dc9 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -18,12 +18,12 @@ }, "appInfo": { "name": "Wonky Client", - "version": "0.6.2", + "version": "0.7", "isBeta": true, "image": "grumpy-coder.png" }, "apiConfig": { - "baseAddress": "https://dev.innotec.dk", + "baseAddress": "https://staging.innotec.dk", "tokenPath": "token", "userInfo": "api/auth/userinfo", "customerEndpoint": "api/v2/crm/companies", diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index d33b7c81..9fd9765b 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -4,13 +4,13 @@ - - - - - - - + + + + + + + Wonky Online diff --git a/Wonky.Client/wwwroot/site.webmanifest b/Wonky.Client/wwwroot/site.webmanifest index de65106f..8c303840 100644 --- a/Wonky.Client/wwwroot/site.webmanifest +++ b/Wonky.Client/wwwroot/site.webmanifest @@ -1,6 +1,8 @@ { - "name": "", - "short_name": "", + "$schema": "https://json.schemastore.org/web-manifest-combined.json", + "name": "Innotec Webapp", + "short_name": "Innotec Webapp", + "description": "Innotec Web CRM", "icons": [ { "src": "/android-chrome-192x192.png", @@ -13,7 +15,7 @@ "type": "image/png" } ], - "theme_color": "#ffffff", - "background_color": "#ffffff", + "theme_color": "#ffaa00", + "background_color": "#000", "display": "standalone" }