From dd936c75efc8a5f101a38141cfad380b7aa4a99b Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Sat, 18 Jun 2022 08:30:29 +0200
Subject: [PATCH] wip v0.8.6
---
Wonky.Client/Components/Home.razor | 97 +-
Wonky.Client/Components/Home.razor.cs | 8 +-
.../HttpRepository/CompanyHttpRepository.cs | 3 +-
.../HttpRepository/ReportHttpRepository.cs | 4 +-
Wonky.Client/Pages/ActivityCreate.razor | 13 +-
Wonky.Client/Pages/ActivityCreate.razor.cs | 11 +-
Wonky.Client/Pages/CompanyEdit.razor | 2 +
Wonky.Client/Pages/CompanyEdit.razor.cs | 2 +-
Wonky.Client/Pages/CompanyView.razor | 10 +-
...ompanyCreate.razor => CreateCompany.razor} | 48 +-
...Create.razor.cs => CreateCompany.razor.cs} | 92 +-
Wonky.Client/Pages/Index.razor | 2 +
Wonky.Client/Pages/ReportView.razor | 2 +-
Wonky.Client/Pages/ReportView.razor.cs | 8 +-
Wonky.Client/Wonky.Client.csproj | 48 +
Wonky.Client/_Imports.razor | 3 +-
Wonky.Client/wwwroot/appsettings.json | 2 +-
.../wwwroot/bootstrap/css/bootstrap-grid.css | 5069 +++++++
.../bootstrap/css/bootstrap-grid.css.map | 1 +
.../bootstrap/css/bootstrap-grid.min.css | 7 +
.../bootstrap/css/bootstrap-grid.min.css.map | 1 +
.../bootstrap/css/bootstrap-grid.rtl.css | 5068 +++++++
.../bootstrap/css/bootstrap-grid.rtl.css.map | 1 +
.../bootstrap/css/bootstrap-grid.rtl.min.css | 7 +
.../css/bootstrap-grid.rtl.min.css.map | 1 +
.../bootstrap/css/bootstrap-reboot.css | 491 +
.../bootstrap/css/bootstrap-reboot.css.map | 1 +
.../bootstrap/css/bootstrap-reboot.min.css | 8 +
.../css/bootstrap-reboot.min.css.map | 1 +
.../bootstrap/css/bootstrap-reboot.rtl.css | 488 +
.../css/bootstrap-reboot.rtl.css.map | 1 +
.../css/bootstrap-reboot.rtl.min.css | 8 +
.../css/bootstrap-reboot.rtl.min.css.map | 1 +
.../bootstrap/css/bootstrap-utilities.css | 4989 +++++++
.../bootstrap/css/bootstrap-utilities.css.map | 1 +
.../bootstrap/css/bootstrap-utilities.min.css | 7 +
.../css/bootstrap-utilities.min.css.map | 1 +
.../bootstrap/css/bootstrap-utilities.rtl.css | 4980 +++++++
.../css/bootstrap-utilities.rtl.css.map | 1 +
.../css/bootstrap-utilities.rtl.min.css | 7 +
.../css/bootstrap-utilities.rtl.min.css.map | 1 +
.../wwwroot/bootstrap/css/bootstrap.css | 11890 ++++++++++++++++
.../wwwroot/bootstrap/css/bootstrap.css.map | 1 +
.../wwwroot/bootstrap/css/bootstrap.min.css | 7 +
.../bootstrap/css/bootstrap.min.css.map | 1 +
.../wwwroot/bootstrap/css/bootstrap.rtl.css | 11850 +++++++++++++++
.../bootstrap/css/bootstrap.rtl.css.map | 1 +
.../bootstrap/css/bootstrap.rtl.min.css | 7 +
.../bootstrap/css/bootstrap.rtl.min.css.map | 1 +
.../wwwroot/bootstrap/js/bootstrap.bundle.js | 7074 +++++++++
.../bootstrap/js/bootstrap.bundle.js.map | 1 +
.../bootstrap/js/bootstrap.bundle.min.js | 7 +
.../bootstrap/js/bootstrap.bundle.min.js.map | 1 +
.../wwwroot/bootstrap/js/bootstrap.esm.js | 5212 +++++++
.../wwwroot/bootstrap/js/bootstrap.esm.js.map | 1 +
.../wwwroot/bootstrap/js/bootstrap.esm.min.js | 7 +
.../bootstrap/js/bootstrap.esm.min.js.map | 1 +
.../wwwroot/bootstrap/js/bootstrap.js | 5259 +++++++
.../wwwroot/bootstrap/js/bootstrap.js.map | 1 +
.../wwwroot/bootstrap/js/bootstrap.min.js | 7 +
.../wwwroot/bootstrap/js/bootstrap.min.js.map | 1 +
.../wwwroot/css/bootstrap/bootstrap.min.css | 7 -
.../css/bootstrap/bootstrap.min.css.map | 1 -
Wonky.Client/wwwroot/index.html | 9 +-
Wonky.Entity/DTO/CompanyDto.cs | 1 -
Wonky.Entity/Views/ReportClosedView.cs | 6 +
66 files changed, 62699 insertions(+), 151 deletions(-)
rename Wonky.Client/Pages/{CompanyCreate.razor => CreateCompany.razor} (77%)
rename Wonky.Client/Pages/{CompanyCreate.razor.cs => CreateCompany.razor.cs} (62%)
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.rtl.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.rtl.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.rtl.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-grid.rtl.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.rtl.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.rtl.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.rtl.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-reboot.rtl.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.rtl.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.rtl.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.rtl.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap-utilities.rtl.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.rtl.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.rtl.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.rtl.min.css
create mode 100644 Wonky.Client/wwwroot/bootstrap/css/bootstrap.rtl.min.css.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.bundle.js
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.bundle.js.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.bundle.min.js
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.bundle.min.js.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.esm.js
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.esm.js.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.esm.min.js
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.esm.min.js.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.js
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.js.map
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.min.js
create mode 100644 Wonky.Client/wwwroot/bootstrap/js/bootstrap.min.js.map
delete mode 100644 Wonky.Client/wwwroot/css/bootstrap/bootstrap.min.css
delete mode 100644 Wonky.Client/wwwroot/css/bootstrap/bootstrap.min.css.map
create mode 100644 Wonky.Entity/Views/ReportClosedView.cs
diff --git a/Wonky.Client/Components/Home.razor b/Wonky.Client/Components/Home.razor
index bb5a776f..d7713c98 100644
--- a/Wonky.Client/Components/Home.razor
+++ b/Wonky.Client/Components/Home.razor
@@ -16,51 +16,58 @@
//
*@
-Innotec Danmark A/S
+Inno Web CRM
-
-
- @($"{DateTime.Parse(_workDate).ToLongDateString()}")
-
-
-
-
-
-
-
+
+
+
+
+ @(string.IsNullOrWhiteSpace(_workDate) ? "" : $"{DateTime.Parse(_workDate).ToLongDateString()}")
+
+
+
+
+
+
+
-
-Dagens aktivitet
-
-
-
- Kunde |
- Demo |
- Salg |
- Sum |
-
-
-
- @if (_view != null)
- {
- foreach (var activity in _view.Activities)
- {
-
-
- @activity.Company.Name
- |
-
- @activity.Demo
- |
-
- @activity.SalesResume
- |
-
- @activity.OrderAmount
- |
-
- }
- }
-
-
+
+ Dagens aktivitet
+
+
+
+ Kunde |
+ Demo |
+ Salg |
+ Sum |
+
+
+
+ @if (_view != null)
+ {
+ foreach (var activity in _view.Activities)
+ {
+
+
+ @activity.Company.Name
+ |
+
+ @activity.Demo
+ |
+
+ @activity.SalesResume
+ |
+
+ @activity.OrderAmount
+ |
+
+ }
+ }
+
+
+
+
+ Login
+
+
diff --git a/Wonky.Client/Components/Home.razor.cs b/Wonky.Client/Components/Home.razor.cs
index a5f76c55..5169138b 100644
--- a/Wonky.Client/Components/Home.razor.cs
+++ b/Wonky.Client/Components/Home.razor.cs
@@ -37,23 +37,23 @@ public partial class Home : IDisposable
[Inject] private NavigationManager Navigator { get; set; }
[Inject] private IActivityHttpRepository ActivityRepo { get; set; }
[Inject] private IToastService _toast { get; set; }
- private NgActivityListView _view { get; set; }
+ private NgActivityListView _view { get; set; } = new();
private Preferences _prefs { get; set; } = new();
private string _workDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}";
protected override async Task OnInitializedAsync()
{
_prefs = await UserPrefs.GetPreferences();
-
if(!string.IsNullOrWhiteSpace(_prefs.WorkDate))
_workDate = _prefs.WorkDate;
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
- await FetchActivities(_workDate);
+
+ await GetActivities(_workDate);
}
- private async Task FetchActivities(string workDate)
+ private async Task GetActivities(string workDate)
{
_toast.ShowInfo("Vent nogle sekunder for data");
_workDate = workDate;
diff --git a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs
index 11271a12..1d063fd1 100644
--- a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs
@@ -95,8 +95,9 @@ public class CompanyHttpRepository : ICompanyHttpRepository
{
var response = await _client.PostAsJsonAsync($"{_apiConfig.CustomerEndpoint}", model);
var content = await response.Content.ReadAsStringAsync();
+ Console.WriteLine(content);
var result = JsonSerializer.Deserialize(content);
- return result.CompanyId;
+ return result == null ? "" : result.CompanyId;
}
public async Task UpdateCompany(string companyId, CompanyDto model)
diff --git a/Wonky.Client/HttpRepository/ReportHttpRepository.cs b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
index 1cc84d3d..174916e1 100644
--- a/Wonky.Client/HttpRepository/ReportHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
@@ -34,8 +34,8 @@ public class ReportHttpRepository :IReportHttpRepository
{
var result =
await _client
- .GetFromJsonAsync($"{_apiConfig.ReportEndpoint}/exist/{workDate}");
- return result.ReportClosed || true;
+ .GetFromJsonAsync($"{_apiConfig.ReportEndpoint}/exist/{workDate}");
+ return result.ReportClosed;
}
public async Task GetReport(string workDate)
diff --git a/Wonky.Client/Pages/ActivityCreate.razor b/Wonky.Client/Pages/ActivityCreate.razor
index db8dc523..f1503c3e 100644
--- a/Wonky.Client/Pages/ActivityCreate.razor
+++ b/Wonky.Client/Pages/ActivityCreate.razor
@@ -19,20 +19,23 @@
@using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Adviser")]
@using Wonky.Client.Components
-
-
+
+
@_workDate.ToLongDateString()
-
@if (_reportClosdd)
{
-
+
-
Der kan ikke oprettes aktiviteter for den valgte dato
+ Rapport for @($"{_workDate:yyyy-MM-dd}") er fundet.
+
+
}
diff --git a/Wonky.Client/Pages/ActivityCreate.razor.cs b/Wonky.Client/Pages/ActivityCreate.razor.cs
index a45e878a..7034e5da 100644
--- a/Wonky.Client/Pages/ActivityCreate.razor.cs
+++ b/Wonky.Client/Pages/ActivityCreate.razor.cs
@@ -83,7 +83,9 @@ public partial class ActivityCreate : IDisposable
_workDate = DateTime.Parse(_prefs.WorkDate);
_poDraft.ActivityDate = $"{_workDate:yyyy-MM-dd}" ;
+
// check if report is closed
+
_reportClosdd = await _reportRepo.ReportExist(_poDraft.ActivityDate);
_paging.SearchColumn = _prefs.ItemSearch ?? "name";
@@ -94,6 +96,10 @@ public partial class ActivityCreate : IDisposable
Ux = await _storage.GetItemAsync
("_xu");
NgCompany = await _companyRepo.GetCompanyById(CompanyId);
+ DraftContext = new EditContext(_poDraft);
+ DraftContext.OnFieldChanged += HandleFieldChanged;
+ DraftContext.OnValidationStateChanged += ValidationChanged;
+
// set up identification
_poDraft.CompanyId = NgCompany.CompanyId;
_poDraft.BcId = NgCompany.BcId;
@@ -122,15 +128,12 @@ public partial class ActivityCreate : IDisposable
_poDraft.DlvZipCode = NgCompany.ZipCode;
_poDraft.DlvCity = NgCompany.City;
- DraftContext = new EditContext(_poDraft);
- DraftContext.OnFieldChanged += HandleFieldChanged;
- DraftContext.OnValidationStateChanged += ValidationChanged;
-
}
private void SetWorkDate(string workDate)
{
_logger.LogInformation("WorkDateComponent.OnChanged(SetWorkDate(workDate)) => {workDate}", workDate);
+ _workDate = DateTime.Parse(workDate);
_poDraft.ActivityDate = workDate;
}
diff --git a/Wonky.Client/Pages/CompanyEdit.razor b/Wonky.Client/Pages/CompanyEdit.razor
index d742b5da..8083d2e5 100644
--- a/Wonky.Client/Pages/CompanyEdit.razor
+++ b/Wonky.Client/Pages/CompanyEdit.razor
@@ -187,12 +187,14 @@