diff --git a/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs b/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs
index 8cd0a344..3b6be3ef 100644
--- a/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs
+++ b/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs
@@ -31,7 +31,7 @@ namespace Wonky.Client.Components
protected override async Task OnInitializedAsync()
{
Preferences = await PreferenceService.GetPreferences();
- SearchTerm = string.IsNullOrWhiteSpace(Preferences.CompanyFilterPhrase) ? "" : Preferences.CompanyFilterPhrase;
+ SearchTerm = string.IsNullOrWhiteSpace(Preferences.CompanyFilterPhrase) ? "" : Preferences.CompanyFilterPhrase.Trim();
if(!string.IsNullOrWhiteSpace(SearchTerm))
await OnChanged.InvokeAsync(SearchTerm);
@@ -41,17 +41,19 @@ namespace Wonky.Client.Components
{
InputTimer.Dispose();
SearchTerm = "";
+ await PreferenceService.SetCompanyFilterPhrase(SearchTerm.Trim());
await OnChanged.InvokeAsync(SearchTerm);
}
private async Task OnSearchChanged()
{
+ await PreferenceService.SetCompanyFilterPhrase(SearchTerm.Trim());
InputTimer.Dispose();
InputTimer = new Timer(500);
InputTimer.AutoReset = false;
InputTimer.Elapsed += OnTimerElapsed;
InputTimer.Enabled = true;
- await PreferenceService.SetCompanyFilterPhrase(SearchTerm.Trim());
+
}
private void OnTimerElapsed(object? sender, ElapsedEventArgs e)
diff --git a/Wonky.Client/Components/LandingComponentAdmin.razor b/Wonky.Client/Components/LandingComponentAdmin.razor
index d41367c5..fbd0a5a0 100644
--- a/Wonky.Client/Components/LandingComponentAdmin.razor
+++ b/Wonky.Client/Components/LandingComponentAdmin.razor
@@ -20,42 +20,41 @@
Inno Web CRM
-
-
-
-
-
-
-
- danske sælgere
-
-
-
-
-
-
-
- norske sælgere
-
-
-
-
-
-
-
- svenske sælgere
-
-
-
-
-
-
-
- Produkt prisliste
-
-
+
+
+
+
\ No newline at end of file
diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor
index a3baa0e3..4d8de30b 100644
--- a/Wonky.Client/Components/ReportItemComponent.razor
+++ b/Wonky.Client/Components/ReportItemComponent.razor
@@ -18,15 +18,25 @@
@using Wonky.Entity.Views
-
+
-
-
- @if (ReportItem.Express)
- {
- TELEFONORDRE
- }
- @ReportItem.Company.Name
+
+
+
+
@ReportItem.Company.Name
+ @if (ReportItem.StatusTypeEnum.ToLower() is "quote")
+ {
+ TILBUD
+ }
+ @if (ReportItem.VisitTypeEnum.ToLower() == "phone" || ReportItem.OurRef.Contains("T:"))
+ {
+ TELEFONORDRE
+ }
+ @if (ReportItem.Express)
+ {
+ HASTER
+ }
+
@@ -119,5 +129,4 @@
[Parameter]
public ReportItemView ReportItem { get; set; } = new();
-
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor
index 812c5b42..3618745d 100644
--- a/Wonky.Client/Pages/ActivityNewVisitPage.razor
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor
@@ -57,13 +57,6 @@ else
Telefon
- @if (_draft.ActivityTypeEnum == "phone")
- {
-
-
- Express
-
- }
Status
@@ -77,6 +70,13 @@ else
}
+ @if (_draft.ActivityStatusEnum == "order")
+ {
+
+
+ Express
+
+ }
diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs
index e580a24b..a9699296 100644
--- a/Wonky.Client/Program.cs
+++ b/Wonky.Client/Program.cs
@@ -13,6 +13,7 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
+using System.Net.Http.Headers;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.AspNetCore.Components.Authorization;
@@ -40,6 +41,8 @@ builder.Services.AddHttpClient("InnoAPI", (sp, cl) =>
{
var apiConfig = sp.GetRequiredService>();
cl.BaseAddress = new Uri(apiConfig.Value.InnoBaseUrl);
+ cl.DefaultRequestHeaders.CacheControl = CacheControlHeaderValue.Parse("no-cache, no-store, must-revalidate");
+ cl.DefaultRequestHeaders.Add("Pragma", "no-cache");
cl.EnableIntercept(sp);
});
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 1ed6fb89..10a2955a 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,13 +1,13 @@
{
"appInfo": {
"name": "Wonky Client",
- "version": "0.11.103",
- "rc": true,
+ "version": "0.11.122",
+ "rc": false,
"sandBox": false,
"image": "grumpy-coder.png"
},
"apiConfig": {
- "innoBaseUrl": "https://zeta.innotec.dk",
+ "innoBaseUrl": "https://eta.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/flag-icons/flag-icons.css b/Wonky.Client/wwwroot/flag-icons/flag-icons.css
new file mode 100644
index 00000000..39168bed
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flag-icons.css
@@ -0,0 +1,40 @@
+.fib {
+ background-size: contain;
+ background-position: 50%;
+ background-repeat: no-repeat;
+}
+.fi {
+ font-size: 64px;
+ background-size: contain;
+ background-position: 50%;
+ background-repeat: no-repeat;
+ position: relative;
+ display: inline-block;
+ width: 1.33333333em;
+ line-height: 1em;
+}
+.fi:before {
+ content: '\00a0';
+}
+.fi.fis {
+ width: 1em;
+}
+.fi-dk {
+ background-image: url(flags/4x3/dk.svg);
+}
+.fi-dk.fis {
+ background-image: url(flags/1x1/dk.svg);
+}
+.fi-no {
+ background-image: url(flags/4x3/no.svg);
+}
+.fi-no.fis {
+ background-image: url(flags/1x1/no.svg);
+}
+.fi-se {
+ background-image: url(flags/4x3/se.svg);
+}
+.fi-se.fis {
+ background-image: url(flags/1x1/se.svg);
+}
+
diff --git a/Wonky.Client/wwwroot/flag-icons/flags/1x1/dk.svg b/Wonky.Client/wwwroot/flag-icons/flags/1x1/dk.svg
new file mode 100644
index 00000000..5aaaa190
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flags/1x1/dk.svg
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Wonky.Client/wwwroot/flag-icons/flags/1x1/no.svg b/Wonky.Client/wwwroot/flag-icons/flags/1x1/no.svg
new file mode 100644
index 00000000..939920d4
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flags/1x1/no.svg
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Wonky.Client/wwwroot/flag-icons/flags/1x1/se.svg b/Wonky.Client/wwwroot/flag-icons/flags/1x1/se.svg
new file mode 100644
index 00000000..bae316dc
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flags/1x1/se.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/Wonky.Client/wwwroot/flag-icons/flags/4x3/dk.svg b/Wonky.Client/wwwroot/flag-icons/flags/4x3/dk.svg
new file mode 100644
index 00000000..563277f8
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flags/4x3/dk.svg
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Wonky.Client/wwwroot/flag-icons/flags/4x3/no.svg b/Wonky.Client/wwwroot/flag-icons/flags/4x3/no.svg
new file mode 100644
index 00000000..a5f2a152
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flags/4x3/no.svg
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Wonky.Client/wwwroot/flag-icons/flags/4x3/se.svg b/Wonky.Client/wwwroot/flag-icons/flags/4x3/se.svg
new file mode 100644
index 00000000..0e41780e
--- /dev/null
+++ b/Wonky.Client/wwwroot/flag-icons/flags/4x3/se.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html
index 9101c358..a64538c1 100644
--- a/Wonky.Client/wwwroot/index.html
+++ b/Wonky.Client/wwwroot/index.html
@@ -2,8 +2,11 @@
- Inno Web CRM
+ Inno Web CRM
+
+
+
@@ -13,6 +16,7 @@
+