@DtoNgCompany.Name
diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor
index 4e6a72ea..eacb8bc2 100644
--- a/Wonky.Client/Shared/NavMenu.razor
+++ b/Wonky.Client/Shared/NavMenu.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
@@ -21,7 +21,7 @@
| Farvekode | +Betydning | +
|---|---|
+ 
+ |
+ + Ok + | +
|
+
+ |
+ + Planlæg besøg + | +
|
+
+ |
+ + Inteval overskredet + | +
|
+
+ |
+ + Opdatering nødvendig + | +
|
+
+ |
+ + Virksomhed ophørt + | +
-
+
-
- -- Vis --- Konto:@company.AccountBynavn:@company.City -
@company.Name -
+
| + | Navn | +Konto | +Bynavn | ++ |
|---|---|---|---|---|
| @company.Name | +@company.Account | +@company.City | +
+ Vis
+ |
+
@_workDate
++
Dagens aktivitet
+| Kunde | +Demo | +Salg | +Sum | +
|---|---|---|---|
| + @activity.Company.Name + | ++ @activity.Demo + | ++ @activity.SalesResume + | ++ @activity.OrderAmount + | +
-
-
-
- 
-
-
-
-
+*@
+@using System.Security.Claims
+
-
-| Reg.nr. |
- |
|||
|---|---|---|---|---|
| Firmanavn |
- |
|||
| Adresse |
- |
|||
| Conavn |
- |
|||
| Postnr |
- |
|||
| Bynavn |
- |
|||
| Telefon |
- |
|||
| Mobil |
- |
|||
|
- |
||||
| Attention |
- |
|||
| Konto | -@DtoNgCompany.Account | +@CompanyDto.Account | ||
|---|---|---|---|---|
| Conavn | -@DtoNgCompany.Address1 | +@CompanyDto.Address1 | ||
| Adresse | -@DtoNgCompany.Address2 | +@CompanyDto.Address2 | ||
| Postnummer | -@DtoNgCompany.ZipCode | +@CompanyDto.ZipCode | ||
| Bynavn | -@DtoNgCompany.City | +@CompanyDto.City | ||
| CVR | @DtoNgCompany.VatNumber | +@CompanyDto.VatNumber | ||
| Telefon | -@DtoNgCompany.Phone | +@CompanyDto.Phone | ||
| @DtoNgCompany.Email | +@CompanyDto.Email | |||
| Sidste besøg | -@DtoNgCompany.LastVisit | +@CompanyDto.LastVisit | ||
| Næste besøg | -@DtoNgCompany.NextVisit | +@CompanyDto.NextVisit | ||
-
+
-
+
SalesItems { get; set; } = new();
private MetaData MetaData { get; set; } = new();
private Preferences _prefs { get; set; } = new();
- private DtoNgActivity _poDraft { get; set; } = new();
- private DtoNgCompany NgCompany = new();
+ private ActivityDto _poDraft { get; set; } = new();
+ private CompanyDto NgCompany = new();
private CatalogPagingParams _paging = new();
private EditContext DraftContext { get; set; }
private bool _poFormInvalid { get; set; } = true;
@@ -131,10 +132,10 @@ public partial class CrmActivityCreate : IDisposable
var ln = 0;
// post to create activity endpoint
- var lines = new List();
+ var lines = new List();
foreach (var item in DraftStateProvider.Draft.Items)
{
- var line = new DtoNgActivityLine{
+ var line = new ActivityLineDto{
Price = item.Price,
Discount = item.Discount,
Qty = item.Quantity,
diff --git a/Wonky.Client/Pages/Index.razor b/Wonky.Client/Pages/Index.razor
index dd13f3c3..34abf06d 100644
--- a/Wonky.Client/Pages/Index.razor
+++ b/Wonky.Client/Pages/Index.razor
@@ -1,26 +1,28 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
@page "/"
@page "/index"
-@inject IWebAssemblyHostEnvironment _hostEnvironment
+@page "/home"
@using Wonky.Client.Components;
+
+
+
+
diff --git a/Wonky.Client/Pages/Info.razor.css b/Wonky.Client/Pages/Info.razor.css
new file mode 100644
index 00000000..de0c190c
--- /dev/null
+++ b/Wonky.Client/Pages/Info.razor.css
@@ -0,0 +1,4 @@
+.grumpy-coder {
+ width: 100px;
+ height: 100px;
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/Login.razor b/Wonky.Client/Pages/Login.razor
index bdef3527..0d210d73 100644
--- a/Wonky.Client/Pages/Login.razor
+++ b/Wonky.Client/Pages/Login.razor
@@ -1,58 +1,74 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
@using Wonky.Client.Components
@page "/login/{returnUrl?}"
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ App version
+
+
+
+ App version
+
+ Login
-@if - (ShowAuthError) -{ -
- @if (Error != null)
- {
+
+ @if (ShowAuthError)
+ {
+
-
+ @if (Error != null)
+ {
@Error
- }
-
-}
-
-
- Logger { get; set; }
+ [Parameter] public string ReturnUrl { get; set; }
+ private UserAuthenticationDto _userAuthenticationDto = new ();
private bool ShowAuthError { get; set; }
private string? Error { get; set; }
private bool execLogin = false;
@@ -35,7 +36,7 @@ public partial class Login
ShowAuthError = false;
execLogin = true;
- var result = await AuthenticationService.Login(_dtoUserAuthentication);
+ var result = await AuthenticationService.Login(_userAuthenticationDto);
if (!result.IsSuccess)
{
Error = result.ErrorMessage;
@@ -44,7 +45,8 @@ public partial class Login
}
else
{
- var returnUrl = string.IsNullOrEmpty(ReturnUrl) ? "/companies" : ReturnUrl;
+ Logger.LogInformation($"returnUrl={ReturnUrl}");
+ var returnUrl = string.IsNullOrWhiteSpace(ReturnUrl) ? "/companies" : ReturnUrl;
NavigationManager.NavigateTo(returnUrl);
}
}
diff --git a/Wonky.Client/Pages/Login.razor.css b/Wonky.Client/Pages/Login.razor.css
new file mode 100644
index 00000000..1c2257ea
--- /dev/null
+++ b/Wonky.Client/Pages/Login.razor.css
@@ -0,0 +1,14 @@
+.rounded-t-5 {
+ border-top-left-radius: 0.5rem;
+ border-top-right-radius: 0.5rem;
+}
+
+@media (min-width: 992px) {
+ .rounded-tr-lg-0 {
+ border-top-right-radius: 0;
+ }
+
+ .rounded-bl-lg-5 {
+ border-bottom-left-radius: 0.5rem;
+ }
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/Logout.razor b/Wonky.Client/Pages/Logout.razor
index 0206b6f8..d3ea2042 100644
--- a/Wonky.Client/Pages/Logout.razor
+++ b/Wonky.Client/Pages/Logout.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/Logout.razor.cs b/Wonky.Client/Pages/Logout.razor.cs
index 91182c12..17772098 100644
--- a/Wonky.Client/Pages/Logout.razor.cs
+++ b/Wonky.Client/Pages/Logout.razor.cs
@@ -1,19 +1,20 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
using System.Threading.Tasks;
+using Blazored.LocalStorage;
using Wonky.Client.Services;
using Microsoft.AspNetCore.Components;
@@ -21,15 +22,14 @@ namespace Wonky.Client.Pages;
public partial class Logout
{
- [Inject]
- public IAuthenticationService AuthenticationService { get; set; }
-
- [Inject]
- public NavigationManager NavigationManager { get; set; }
+ [Inject] public IAuthenticationService AuthenticationService { get; set; }
+ [Inject] public NavigationManager NavigationManager { get; set; }
+ [Inject] public ILocalStorageService LocalStorage { get; set; }
protected override async Task OnInitializedAsync()
{
- await AuthenticationService.Logout();
+ await AuthenticationService.Logout().ConfigureAwait(true);
+
NavigationManager.NavigateTo("/");
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/Page401.razor b/Wonky.Client/Pages/Page401.razor
index 3859f371..43746e5e 100644
--- a/Wonky.Client/Pages/Page401.razor
+++ b/Wonky.Client/Pages/Page401.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/Page404.razor b/Wonky.Client/Pages/Page404.razor
index d665f009..fec60876 100644
--- a/Wonky.Client/Pages/Page404.razor
+++ b/Wonky.Client/Pages/Page404.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/Page404.razor.cs b/Wonky.Client/Pages/Page404.razor.cs
index 396a6a03..5327505f 100644
--- a/Wonky.Client/Pages/Page404.razor.cs
+++ b/Wonky.Client/Pages/Page404.razor.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
diff --git a/Wonky.Client/Pages/Page500.razor b/Wonky.Client/Pages/Page500.razor
index 84e7d278..9a30c1f3 100644
--- a/Wonky.Client/Pages/Page500.razor
+++ b/Wonky.Client/Pages/Page500.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/ReportError.razor b/Wonky.Client/Pages/ReportError.razor
index 873c2d64..da38f683 100644
--- a/Wonky.Client/Pages/ReportError.razor
+++ b/Wonky.Client/Pages/ReportError.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/ReportError.razor.cs b/Wonky.Client/Pages/ReportError.razor.cs
index c89464c7..e41b4027 100644
--- a/Wonky.Client/Pages/ReportError.razor.cs
+++ b/Wonky.Client/Pages/ReportError.razor.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
diff --git a/Wonky.Client/Pages/SalesItemCatalog.razor b/Wonky.Client/Pages/SalesItemCatalog.razor
index e5bf5c4f..995ea55e 100644
--- a/Wonky.Client/Pages/SalesItemCatalog.razor
+++ b/Wonky.Client/Pages/SalesItemCatalog.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/SalesItemCatalog.razor.cs b/Wonky.Client/Pages/SalesItemCatalog.razor.cs
index 7ca52cf9..26879b35 100644
--- a/Wonky.Client/Pages/SalesItemCatalog.razor.cs
+++ b/Wonky.Client/Pages/SalesItemCatalog.razor.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
@@ -24,6 +24,7 @@ using Wonky.Client.Components;
using Wonky.Client.Services;
using Wonky.Entity.DTO;
using Wonky.Entity.Requests;
+using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
diff --git a/Wonky.Client/Pages/SalesItemView.razor b/Wonky.Client/Pages/SalesItemView.razor
index 637ea649..285bc5ad 100644
--- a/Wonky.Client/Pages/SalesItemView.razor
+++ b/Wonky.Client/Pages/SalesItemView.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Pages/SalesItemView.razor.cs b/Wonky.Client/Pages/SalesItemView.razor.cs
index ddedd616..62c06576 100644
--- a/Wonky.Client/Pages/SalesItemView.razor.cs
+++ b/Wonky.Client/Pages/SalesItemView.razor.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
@@ -19,6 +19,7 @@ using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
using Microsoft.AspNetCore.Components;
using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
diff --git a/Wonky.Client/Pages/SalesReport.razor b/Wonky.Client/Pages/SalesReport.razor
index 7028954c..39378dc1 100644
--- a/Wonky.Client/Pages/SalesReport.razor
+++ b/Wonky.Client/Pages/SalesReport.razor
@@ -1,20 +1,21 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
@using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Helpers
@attribute [Authorize(Roles = "Adviser")]
@page "/sales-report"
@@ -23,7 +24,7 @@
RegisterUser(DtoNgUserRegistration dtoNgUserRegistration)
- {
-
- var response = await _client
- .PostAsJsonAsync(_apiConfig.Value.UserRegistration, dtoNgUserRegistration);
-
- if (response.IsSuccessStatusCode)
- return new ApiResponseView {IsSuccess = true};
-
- var content = await response.Content
- .ReadAsStringAsync()
- ;
- var result = JsonSerializer.Deserialize(content, _options);
- return result ?? new ApiResponseView();
- }
-
- public async Task Login(DtoUserAuthentication dtoUserAuth)
+
+ public async Task Login(UserAuthenticationDto userAuthenticationDtoUserAuth)
{
var credentials = new Dictionary
{
["grant_type"] = "password",
- ["username"] = dtoUserAuth.Email,
- ["password"] = dtoUserAuth.Password
+ ["username"] = userAuthenticationDtoUserAuth.Email,
+ ["password"] = userAuthenticationDtoUserAuth.Password
};
+
var response = await _client
- .PostAsync(_apiConfig.Value.TokenPath, new FormUrlEncodedContent(credentials));
+ .PostAsync(_apiConfig.Value.TokenPath, new FormUrlEncodedContent(credentials))
+ .ConfigureAwait(true);
- var resContent = await response.Content.ReadAsStringAsync();
+ var resContent = await response.Content.ReadAsStringAsync()
+ .ConfigureAwait(true);
// if not success - return error status
if (!response.IsSuccessStatusCode)
- return new AuthResponseView {IsSuccess = false, ErrorMessage = $"Kontroller indtastning"};
+ return new AuthResponseView
+ {
+ IsSuccess = false, ErrorMessage = $"Kontroller indtastning"
+ };
// process response content
var data = JsonSerializer.Deserialize(resContent, _options);
- await _localStorage.SetItemAsync("_xa", data.AccessToken);
- await _localStorage.SetItemAsync("_xr", data.RefreshToken);
- await _localStorage.SetItemAsync("_xe",
- (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60);
+ await _localStorage.SetItemAsync("_xa", data.AccessToken)
+ .ConfigureAwait(true);
+
+ await _localStorage.SetItemAsync("_xr", data.RefreshToken)
+ .ConfigureAwait(true);
+
+ await _localStorage.SetItemAsync("_xe",
+ (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60)
+ .ConfigureAwait(true);
// set default request headers using access_token
_client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken);
var userInfo = await UserInfo();
- await _localStorage.SetItemAsync("_xu", userInfo);
+ await _localStorage.SetItemAsync("_xu", userInfo)
+ .ConfigureAwait(true);
// notify system on state change
((AuthStateProvider)_authStateProvider).NotifyUserAuthenticationAsync(data.AccessToken);
@@ -100,50 +97,62 @@ namespace Wonky.Client.Services
public async Task RefreshToken()
{
- var refreshToken = await _localStorage.GetItemAsync("_xr");
+ var refreshToken = await _localStorage.GetItemAsync("_xr")
+ .ConfigureAwait(true);
+
var credentials = new Dictionary
{
["grant_type"] = "refresh_token",
["refresh_token"] = refreshToken
};
- var response = await _client.PostAsync(_apiConfig.Value.TokenPath, new FormUrlEncodedContent(credentials));
+ var response = await _client.PostAsync(_apiConfig.Value.TokenPath, new FormUrlEncodedContent(credentials))
+ .ConfigureAwait(true);
if (!response.IsSuccessStatusCode) return string.Empty;
- var resContent = await response.Content.ReadAsStringAsync();
+ var resContent = await response.Content.ReadAsStringAsync()
+ .ConfigureAwait(true);
+
var data = JsonSerializer.Deserialize(resContent, _options);
// set default request headers using access_token
_client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken);
-
- await _localStorage.SetItemAsync("_xa", data.AccessToken);
- await _localStorage.SetItemAsync("_xr", data.RefreshToken);
+
+ await _localStorage.SetItemAsync("_xa", data.AccessToken)
+ .ConfigureAwait(true);
+
+ await _localStorage.SetItemAsync("_xr", data.RefreshToken)
+ .ConfigureAwait(true);
+
await _localStorage.SetItemAsync("_xe",
- (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60);
+ (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60)
+ .ConfigureAwait(true);
return data.AccessToken;
}
public async Task Logout()
{
- // clear localStorage
- await _localStorage.RemoveItemAsync("_xa");
- await _localStorage.RemoveItemAsync("_xr");
- await _localStorage.RemoveItemAsync("_xu");
- await _localStorage.RemoveItemAsync("_xe");
- // notify system on user logout
+ await _localStorage.ClearAsync()
+ .ConfigureAwait(true);
+
((AuthStateProvider)_authStateProvider).NotifyUserLogout();
- // remove request headers
+
_client.DefaultRequestHeaders.Authorization = null;
}
public async Task UserInfo(bool write = false)
{
- var infoResponse = await _client.GetAsync(_apiConfig.Value.UserInfo);
- var infoContent = await infoResponse.Content.ReadAsStringAsync();
+ var infoResponse = await _client.GetAsync(_apiConfig.Value.UserInfo)
+ .ConfigureAwait(true);
+
+ var infoContent = await infoResponse.Content.ReadAsStringAsync()
+ .ConfigureAwait(true);
+
var userInfo = JsonSerializer.Deserialize(infoContent, _options);
if(write)
- await _localStorage.SetItemAsync("_xu", userInfo);
+ await _localStorage.SetItemAsync("_xu", userInfo).ConfigureAwait(true);
+
return userInfo ?? new UserInfoView();
}
diff --git a/Wonky.Client/Services/IAuthenticationService.cs b/Wonky.Client/Services/IAuthenticationService.cs
index b9167bc1..034af31c 100644
--- a/Wonky.Client/Services/IAuthenticationService.cs
+++ b/Wonky.Client/Services/IAuthenticationService.cs
@@ -1,27 +1,27 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
using System.Threading.Tasks;
using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
namespace Wonky.Client.Services
{
public interface IAuthenticationService
{
- Task RegisterUser(DtoNgUserRegistration dtoNgUserRegistration);
- Task Login(DtoUserAuthentication dtoUserAuth);
+ Task Login(UserAuthenticationDto userAuthenticationDtoUserAuth);
Task Logout();
Task RefreshToken();
Task UserInfo(bool write = false);
diff --git a/Wonky.Client/Services/RefreshTokenService.cs b/Wonky.Client/Services/RefreshTokenService.cs
index c8a3a4e0..e02fa6aa 100644
--- a/Wonky.Client/Services/RefreshTokenService.cs
+++ b/Wonky.Client/Services/RefreshTokenService.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
@@ -36,7 +36,8 @@ public class RefreshTokenService
public async Task TryRefreshToken()
{
- var authState = await _authStateProvider.GetAuthenticationStateAsync();
+ var authState = await _authStateProvider.GetAuthenticationStateAsync()
+ .ConfigureAwait(true);
var user = authState.User;
diff --git a/Wonky.Client/Services/UserPreferenceService.cs b/Wonky.Client/Services/UserPreferenceService.cs
index ff40ff74..7a2d8c3c 100644
--- a/Wonky.Client/Services/UserPreferenceService.cs
+++ b/Wonky.Client/Services/UserPreferenceService.cs
@@ -28,7 +28,10 @@ public class UserPreferenceService
{
WorkDate = $"{workDate:yyyy-MM-dd}"
};
- await _localStorageService.SetItemAsync("preferences", newPreferences);
+
+ await _localStorageService.SetItemAsync("preferences", newPreferences)
+ .ConfigureAwait(true);
+
OnChange?.Invoke(newPreferences);
}
public async Task SetCompanySearch(string companySearch)
@@ -36,47 +39,70 @@ public class UserPreferenceService
var preferences = await GetPreferences();
var newPreferences = preferences
with { CompanySearch = companySearch };
- await _localStorageService.SetItemAsync("preferences", newPreferences);
+
+ await _localStorageService.SetItemAsync("preferences", newPreferences)
+ .ConfigureAwait(true);
+
OnChange?.Invoke(newPreferences);
}
public async Task SetCompanySort(string companySort)
{
- var preferences = await GetPreferences();
+ var preferences = await GetPreferences()
+ .ConfigureAwait(true);
+
var newPreferences = preferences
with { CompanySort = companySort };
- await _localStorageService.SetItemAsync("preferences", newPreferences);
+
+ await _localStorageService.SetItemAsync("preferences", newPreferences)
+ .ConfigureAwait(true);
+
OnChange?.Invoke(newPreferences);
}
public async Task SetItemSearch(string itemSearch)
{
- var preferences = await GetPreferences();
+ var preferences = await GetPreferences()
+ .ConfigureAwait(true);
+
var newPreferences = preferences
with { ItemSearch = itemSearch };
- await _localStorageService.SetItemAsync("preferences", newPreferences);
+
+ await _localStorageService.SetItemAsync("preferences", newPreferences)
+ .ConfigureAwait(true);
+
OnChange?.Invoke(newPreferences);
}
public async Task SetItemSort(string itemSort)
{
- var preferences = await GetPreferences();
+ var preferences = await GetPreferences()
+ .ConfigureAwait(true);
+
var newPreferences = preferences
with { ItemSort = itemSort };
- await _localStorageService.SetItemAsync("preferences", newPreferences);
+
+ await _localStorageService.SetItemAsync("preferences", newPreferences)
+ .ConfigureAwait(true);
+
OnChange?.Invoke(newPreferences);
}
public async Task SetPageSize(string pageSize)
{
- var preferences = await GetPreferences();
+ var preferences = await GetPreferences()
+ .ConfigureAwait(true);
+
var newPreferences = preferences
with { PageSize = pageSize };
- await _localStorageService.SetItemAsync("preferences", newPreferences);
+
+ await _localStorageService.SetItemAsync("preferences", newPreferences)
+ .ConfigureAwait(true);
+
OnChange?.Invoke(newPreferences);
}
public async Task GetPreferences()
{
- return await _localStorageService.GetItemAsync("preferences")
+ return await _localStorageService.GetItemAsync("preferences").ConfigureAwait(true)
?? new Preferences();
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Services/VatInfoLookupService.cs b/Wonky.Client/Services/VatInfoLookupService.cs
index 32db088a..5fad17bf 100644
--- a/Wonky.Client/Services/VatInfoLookupService.cs
+++ b/Wonky.Client/Services/VatInfoLookupService.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
@@ -50,8 +50,11 @@ public class VatInfoLookupService
["zipCode"] = $"{query.ZipCode}"
};
var endpoint = QueryHelpers.AddQueryString(_apiConfig.Value.CvrLookup, queryString);
- var response = await _client.GetAsync(endpoint);
- var content = await response.Content.ReadAsStringAsync();
+ var response = await _client.GetAsync(endpoint)
+ .ConfigureAwait(true);
+
+ var content = await response.Content.ReadAsStringAsync()
+ .ConfigureAwait(true);
var jsonResult = JsonSerializer.Deserialize>(content, _options);
@@ -70,6 +73,7 @@ public class VatInfoLookupService
{
if (!string.IsNullOrWhiteSpace(query.VatNumber))
return true;
+
return !string.IsNullOrWhiteSpace(query.HouseNumber) && !string.IsNullOrWhiteSpace(query.StreetName) &&
!string.IsNullOrWhiteSpace(query.ZipCode);
}
diff --git a/Wonky.Client/Shared/AuthStateProvider.cs b/Wonky.Client/Shared/AuthStateProvider.cs
index 94b16d9d..6765542f 100644
--- a/Wonky.Client/Shared/AuthStateProvider.cs
+++ b/Wonky.Client/Shared/AuthStateProvider.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
@@ -18,6 +18,7 @@ using System.Security.Claims;
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Components.Authorization;
using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
namespace Wonky.Client.Shared
{
@@ -37,21 +38,25 @@ namespace Wonky.Client.Shared
public override async Task GetAuthenticationStateAsync()
{
// fetch token from localStorage
- var token = await _storage.GetItemAsync("_xa");
+ var token = await _storage.GetItemAsync("_xa")
+ .ConfigureAwait(true);
if (string.IsNullOrEmpty(token))
// return anonymous if empty
return _anonymous;
// create an authorized user
- var userInfo = await _storage.GetItemAsync("_xu");
+ var userInfo = await _storage.GetItemAsync("_xu")
+ .ConfigureAwait(true);
+
if (userInfo == null)
return _anonymous;
// set client authorization header
_client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", token);
- var exp = await _storage.GetItemAsync("_xe");
+ var exp = await _storage.GetItemAsync("_xe")
+ .ConfigureAwait(true);
var roles = ExtractRoles(userInfo);
var claims = new List
@@ -79,8 +84,12 @@ namespace Wonky.Client.Shared
_client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", token);
// create an authorized user
- var userInfo = await _storage.GetItemAsync("_xu");
- var exp = await _storage.GetItemAsync("_xe");
+ var userInfo = await _storage.GetItemAsync("_xu")
+ .ConfigureAwait(true);
+
+ var exp = await _storage.GetItemAsync("_xe")
+ .ConfigureAwait(true);
+
var roles = ExtractRoles(userInfo);
var claims = new List
{
@@ -102,6 +111,7 @@ namespace Wonky.Client.Shared
public void NotifyUserLogout()
{
var authState = Task.FromResult(_anonymous);
+
NotifyAuthenticationStateChanged(authState);
}
diff --git a/Wonky.Client/Shared/Confirmation.razor b/Wonky.Client/Shared/Confirmation.razor
index 0b92db87..cf53bcb0 100644
--- a/Wonky.Client/Shared/Confirmation.razor
+++ b/Wonky.Client/Shared/Confirmation.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Shared/Confirmation.razor.cs b/Wonky.Client/Shared/Confirmation.razor.cs
index 7cf59013..d4e60393 100644
--- a/Wonky.Client/Shared/Confirmation.razor.cs
+++ b/Wonky.Client/Shared/Confirmation.razor.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
diff --git a/Wonky.Client/Shared/DraftStateProvider.razor b/Wonky.Client/Shared/DraftStateProvider.razor
index ef013766..df86081c 100644
--- a/Wonky.Client/Shared/DraftStateProvider.razor
+++ b/Wonky.Client/Shared/DraftStateProvider.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
diff --git a/Wonky.Client/Shared/DraftStateProvider.razor.cs b/Wonky.Client/Shared/DraftStateProvider.razor.cs
index 4c186821..faaacd8f 100644
--- a/Wonky.Client/Shared/DraftStateProvider.razor.cs
+++ b/Wonky.Client/Shared/DraftStateProvider.razor.cs
@@ -1,15 +1,15 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
@@ -30,7 +30,8 @@ public partial class DraftStateProvider
protected override async Task OnParametersSetAsync()
{
- Draft = await LocalStorageService.GetItemAsync(Account);
+ Draft = await LocalStorageService.GetItemAsync(Account)
+ .ConfigureAwait(true);
if (Draft == null || Draft.Items.Count == 0)
{
@@ -49,12 +50,14 @@ public partial class DraftStateProvider
public async Task SaveChangesAsync()
{
- await LocalStorageService.SetItemAsync(Account, Draft);
+ await LocalStorageService.SetItemAsync(Account, Draft)
+ .ConfigureAwait(true);
}
public async Task DeleteDraftAsync()
{
Draft.Items.Clear();
- await LocalStorageService.SetItemAsync(Account, Draft);
+ await LocalStorageService.SetItemAsync(Account, Draft)
+ .ConfigureAwait(true);
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Shared/MainLayout.razor b/Wonky.Client/Shared/MainLayout.razor
index b68ccc79..f48baa85 100644
--- a/Wonky.Client/Shared/MainLayout.razor
+++ b/Wonky.Client/Shared/MainLayout.razor
@@ -1,16 +1,16 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
+// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
+// GNU Affero General Public License for more details.
//
-// You should have received a copy of the Affero GNU General Public License
+// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
@@ -24,7 +24,7 @@
-
+ }
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (execLogin)
+ {
+
+
-
-
-
-
-
-
-
-@if (execLogin)
-{
-
-
-
-
-
-
+
-
+ @if (_reportDto.DayTypeEnum == "sales")
+ {
+
+
+
+
+
+
+ }
+ @if (_reportDto.DayTypeEnum.Contains("leave"))
+ {
+
+
+
+
+
+
+ }
+