+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/AdminUserTableComponent.razor b/Wonky.Client/Components/AdminUserTableComponent.razor
index 05d54bcb..5d4600c9 100644
--- a/Wonky.Client/Components/AdminUserTableComponent.razor
+++ b/Wonky.Client/Components/AdminUserTableComponent.razor
@@ -51,5 +51,5 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/CompanyTableComponent.razor b/Wonky.Client/Components/CompanyTableComponent.razor
index 3b9e85b6..af568e2c 100644
--- a/Wonky.Client/Components/CompanyTableComponent.razor
+++ b/Wonky.Client/Components/CompanyTableComponent.razor
@@ -67,5 +67,5 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/ItemTableComponent.razor b/Wonky.Client/Components/ItemTableComponent.razor
index 04ff6ca3..3953d720 100644
--- a/Wonky.Client/Components/ItemTableComponent.razor
+++ b/Wonky.Client/Components/ItemTableComponent.razor
@@ -55,5 +55,5 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/LoaderBallTriangle.razor b/Wonky.Client/Components/LoaderBallTriangle.razor
new file mode 100644
index 00000000..dc933d37
--- /dev/null
+++ b/Wonky.Client/Components/LoaderBallTriangle.razor
@@ -0,0 +1,26 @@
+@*
+// 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 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
+// GNU Affero General Public License for more details.
+//
+// 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]
+//
+*@
+
+@if (Loading)
+{
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/LoaderBallTriangle.razor.cs b/Wonky.Client/Components/LoaderBallTriangle.razor.cs
new file mode 100644
index 00000000..9176186e
--- /dev/null
+++ b/Wonky.Client/Components/LoaderBallTriangle.razor.cs
@@ -0,0 +1,18 @@
+
+namespace Wonky.Client.Components;
+
+public partial class LoaderBallTriangle
+{
+ private bool Loading { get; set; }
+
+ protected override async Task OnInitializedAsync()
+ {
+ Loading = true;
+
+ await Task.Delay(10000);
+
+ Loading = false;
+ }
+
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/AppSpinner.razor b/Wonky.Client/Components/LoaderBars.razor
similarity index 73%
rename from Wonky.Client/Components/AppSpinner.razor
rename to Wonky.Client/Components/LoaderBars.razor
index 16f0cfc1..d5e9f34f 100644
--- a/Wonky.Client/Components/AppSpinner.razor
+++ b/Wonky.Client/Components/LoaderBars.razor
@@ -14,6 +14,13 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
-
- Loading...
-
+
+@if (Loading)
+{
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/LoaderBars.razor.cs b/Wonky.Client/Components/LoaderBars.razor.cs
new file mode 100644
index 00000000..ed3ed82e
--- /dev/null
+++ b/Wonky.Client/Components/LoaderBars.razor.cs
@@ -0,0 +1,18 @@
+
+namespace Wonky.Client.Components;
+
+public partial class LoaderBars
+{
+ private bool Loading { get; set; }
+
+ protected override async Task OnInitializedAsync()
+ {
+ Loading = true;
+
+ await Task.Delay(10000);
+
+ Loading = false;
+ }
+
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/LoaderSnake.razor b/Wonky.Client/Components/LoaderSnake.razor
new file mode 100644
index 00000000..34a1fb49
--- /dev/null
+++ b/Wonky.Client/Components/LoaderSnake.razor
@@ -0,0 +1,26 @@
+@*
+// 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 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
+// GNU Affero General Public License for more details.
+//
+// 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]
+//
+*@
+
+@if (Loading)
+{
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/LoaderSnake.razor.cs b/Wonky.Client/Components/LoaderSnake.razor.cs
new file mode 100644
index 00000000..3464d043
--- /dev/null
+++ b/Wonky.Client/Components/LoaderSnake.razor.cs
@@ -0,0 +1,18 @@
+
+namespace Wonky.Client.Components;
+
+public partial class LoaderSnake
+{
+ private bool Loading { get; set; }
+
+ protected override async Task OnInitializedAsync()
+ {
+ Loading = true;
+
+ await Task.Delay(10000);
+
+ Loading = false;
+ }
+
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor
index c672569a..b991ca96 100644
--- a/Wonky.Client/Components/ReportTableComponent.razor
+++ b/Wonky.Client/Components/ReportTableComponent.razor
@@ -82,5 +82,5 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor.cs b/Wonky.Client/Components/SearchPhraseComponent.razor.cs
index c8a8de17..22ca22ca 100644
--- a/Wonky.Client/Components/SearchPhraseComponent.razor.cs
+++ b/Wonky.Client/Components/SearchPhraseComponent.razor.cs
@@ -15,7 +15,6 @@
using System.Timers;
using Microsoft.AspNetCore.Components;
-using Microsoft.VisualBasic;
using Timer = System.Timers.Timer;
namespace Wonky.Client.Components
diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor
index 3afe83b4..05d31cf0 100644
--- a/Wonky.Client/Components/TaskItemTableComponent.razor
+++ b/Wonky.Client/Components/TaskItemTableComponent.razor
@@ -73,5 +73,5 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/WarehouseListComponent.razor b/Wonky.Client/Components/WarehouseListComponent.razor
new file mode 100644
index 00000000..95b499ac
--- /dev/null
+++ b/Wonky.Client/Components/WarehouseListComponent.razor
@@ -0,0 +1,85 @@
+
+}
+else
+{
+
+}
+
+@code {
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Components/WarehouseListComponent.razor.cs
similarity index 76%
rename from Wonky.Client/Pages/WarehouseOrderListPage.razor.cs
rename to Wonky.Client/Components/WarehouseListComponent.razor.cs
index c9323677..17c0e5a1 100644
--- a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs
+++ b/Wonky.Client/Components/WarehouseListComponent.razor.cs
@@ -4,9 +4,9 @@ using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
using Wonky.Entity.Views;
-namespace Wonky.Client.Pages;
+namespace Wonky.Client.Components;
-public partial class WarehouseOrderListPage : IDisposable
+public partial class WarehouseListComponent
{
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IWarehouseHttpRepository _warehouseRepo { get; set; }
@@ -28,21 +28,32 @@ public partial class WarehouseOrderListPage : IDisposable
private async Task GetOrderStatusNone()
{
+ _orders = new List();
_orders = await _warehouseRepo.GetWarehouseOrderListByStatus("none");
_readyToShip = false;
}
private async Task GetOrderStatusPicked()
{
+ _orders = new List();
_orders = await _warehouseRepo.GetWarehouseOrderListByStatus("picked");
_readyToShip = false;
}
private async Task GetOrderStatusPacked()
{
+ _orders = new List();
_orders = await _warehouseRepo.GetWarehouseOrderListByStatus("packed");
_readyToShip = true;
}
+
+ private async Task GetOrderStatusShipped()
+ {
+ _orders = new List();
+ var orderList = await _warehouseRepo.GetWarehouseOrderListByStatus("shipped");
+ _orders = orderList.OrderByDescending(x => x.OrderDate).ToList();
+ _readyToShip = false;
+ }
private async Task SetProcessStatusShipped()
{
@@ -63,4 +74,5 @@ public partial class WarehouseOrderListPage : IDisposable
{
_interceptor.DisposeEvent();
}
+
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/ActivityHttpRepository.cs b/Wonky.Client/HttpRepository/ActivityHttpRepository.cs
index 3c70f13e..ba1a0bc7 100644
--- a/Wonky.Client/HttpRepository/ActivityHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/ActivityHttpRepository.cs
@@ -57,7 +57,7 @@ public class ActivityHttpRepository : IActivityHttpRepository
public async Task GetActivities(string activityDate)
{
var response = await _client
- .GetAsync($"{_apiConfig.ActivityUri}/date/{activityDate}");
+ .GetAsync($"{_apiConfig.CrmSale}/date/{activityDate}");
var content = await response.Content.ReadAsStringAsync();
return string.IsNullOrWhiteSpace(content)
? new ReportItemListView()
@@ -67,7 +67,7 @@ public class ActivityHttpRepository : IActivityHttpRepository
public async Task CreateActivity(ActivityDto model)
{
Console.WriteLine(JsonSerializer.Serialize(model, _options));
- var response = await _client.PostAsJsonAsync($"{_apiConfig.ActivityUri}", model, _options);
+ var response = await _client.PostAsJsonAsync($"{_apiConfig.CrmSale}", model, _options);
var content = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize(content);
return result!;
@@ -76,13 +76,13 @@ public class ActivityHttpRepository : IActivityHttpRepository
public async Task GetActivity(string id)
{
var salesItem = await _client
- .GetFromJsonAsync($"{_apiConfig.ActivityUri}/{id}");
+ .GetFromJsonAsync($"{_apiConfig.CrmSale}/{id}");
return salesItem ?? new ActivityDto();
}
public async Task AcceptOffer(string id)
{
- var response = await _client.PostAsJsonAsync($"{_apiConfig.ActivityUri}/{id}/accept", id)
+ var response = await _client.PostAsJsonAsync($"{_apiConfig.CrmSale}/{id}/accept", id)
;
var content = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize(content);
diff --git a/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs b/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs
index c90494e3..9f0b52bd 100644
--- a/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs
@@ -47,12 +47,12 @@ public class AdminReportHttpRepository : IAdminReportHttpRepository
public async Task> GetReports(string userId)
{
- return await _client.GetFromJsonAsync>($"{_apiConfig.AdminAdvisorUri}/{userId}/reports");
+ return await _client.GetFromJsonAsync>($"{_apiConfig.AdminUser}/{userId}/reports");
}
public async Task GetReport(string userId, string workDate)
{
- return await _client.GetFromJsonAsync($"{_apiConfig.AdminAdvisorUri}/{userId}/reports/{workDate}");
+ return await _client.GetFromJsonAsync($"{_apiConfig.AdminUser}/{userId}/reports/{workDate}");
}
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs
index 66cd3a81..91c47051 100644
--- a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs
@@ -68,7 +68,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository
["isHidden"] = pagingParameters.IsHidden.ToString(),
["hasFolded"] = pagingParameters.HasFolded.ToString()
};
- var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.CompanyUri}/page", queryString));
+ var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.CrmCustomer}/page", queryString));
var content = await response.Content.ReadAsStringAsync();
@@ -93,7 +93,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository
["hasFolded"] = pagingParameters.HasFolded.ToString()
};
var response = await _client
- .GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.AdminAdvisorUri}/{userId}/companies", queryString));
+ .GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.AdminUser}/{userId}/companies", queryString));
var content = await response.Content.ReadAsStringAsync();
@@ -107,13 +107,13 @@ public class CompanyHttpRepository : ICompanyHttpRepository
public async Task GetCompanyByAccount(string accountNumber)
{
- var company = await _client.GetFromJsonAsync($"{_apiConfig.CompanyUri}/account/{accountNumber}");
+ var company = await _client.GetFromJsonAsync($"{_apiConfig.CrmCustomer}/account/{accountNumber}");
return company ?? new CompanyDto();
}
public async Task GetCompanyById(string companyId)
{
- var company = await _client.GetFromJsonAsync($"{_apiConfig.CompanyUri}/{companyId}");
+ var company = await _client.GetFromJsonAsync($"{_apiConfig.CrmCustomer}/{companyId}");
return company ?? new CompanyDto();
}
@@ -124,7 +124,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository
/// company id
public async Task CreateCompany(CompanyDto model)
{
- var response = await _client.PostAsJsonAsync($"{_apiConfig.CompanyUri}", model);
+ var response = await _client.PostAsJsonAsync($"{_apiConfig.CrmCustomer}", model);
var content = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize(content, _options);
return result.CompanyId;
@@ -132,7 +132,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository
public async Task UpdateCompany(string companyId, CompanyDto model)
{
- var response = await _client.PutAsJsonAsync($"{_apiConfig.CompanyUri}/{companyId}", model);
+ var response = await _client.PutAsJsonAsync($"{_apiConfig.CrmCustomer}/{companyId}", model);
var content = await response.Content.ReadAsStringAsync();
Console.WriteLine(content);
return response.IsSuccessStatusCode;
@@ -140,7 +140,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository
public async Task DeleteCompany(string companyId)
{
- var response = await _client.DeleteAsync($"{_apiConfig.CompanyUri}/{companyId}");
+ var response = await _client.DeleteAsync($"{_apiConfig.CrmCustomer}/{companyId}");
return response.IsSuccessStatusCode;
}
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/HistoryHttpRepository.cs b/Wonky.Client/HttpRepository/HistoryHttpRepository.cs
index dbff5f6f..557f1d84 100644
--- a/Wonky.Client/HttpRepository/HistoryHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/HistoryHttpRepository.cs
@@ -48,7 +48,7 @@ public class HistoryHttpRepository : IHistoryHttpRepository
}
public async Task> FetchInventory(string companyId)
{
- var response = await _client.GetAsync($"{_api.CompanyUri}/{companyId}/{_api.InventoryUri}");
+ var response = await _client.GetAsync($"{_api.CrmCustomer}/{companyId}/{_api.CrmInventory}");
var content = await response.Content.ReadAsStringAsync();
return response.IsSuccessStatusCode
? JsonSerializer.Deserialize>(content, _options)
@@ -59,18 +59,18 @@ public class HistoryHttpRepository : IHistoryHttpRepository
public async Task> FetchHistory(string companyId)
{
return await _client.GetFromJsonAsync>(
- $"{_api.CompanyUri}/{companyId}/{_api.ProductUri}");
+ $"{_api.CrmCustomer}/{companyId}/{_api.CrmProduct}");
}
public async Task> FetchHistory(string companyId, string sku)
{
return await _client.GetFromJsonAsync>(
- $"{_api.CompanyUri}/{companyId}/{_api.ProductUri}/{sku}");
+ $"{_api.CrmCustomer}/{companyId}/{_api.CrmProduct}/{sku}");
}
public async Task UpdateProductHistory(string companyId, string syncDate = "2010-01-01")
{
- return await _client.GetStringAsync($"{_api.CompanyUri}/{companyId}/{_api.SyncUri}/{syncDate}");
+ return await _client.GetStringAsync($"{_api.CrmCustomer}/{companyId}/{_api.CrmSync}/{syncDate}");
}
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/ReportHttpRepository.cs b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
index 6e21fead..ea934d0d 100644
--- a/Wonky.Client/HttpRepository/ReportHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
@@ -48,32 +48,32 @@ public class ReportHttpRepository :IReportHttpRepository
public async Task> GetReports()
{
- return await _client.GetFromJsonAsync>($"{_apiConfig.ReportUri}");
+ return await _client.GetFromJsonAsync>($"{_apiConfig.CrmReport}");
}
public async Task ReportExist(string workDate)
{
var result =
await _client
- .GetFromJsonAsync($"{_apiConfig.ReportUri}/exist/{workDate}");
+ .GetFromJsonAsync($"{_apiConfig.CrmReport}/exist/{workDate}");
return result.ReportClosed;
}
public async Task GetReport(string workDate)
{
- return await _client.GetFromJsonAsync($"{_apiConfig.ReportUri}/{workDate}");
+ return await _client.GetFromJsonAsync($"{_apiConfig.CrmReport}/{workDate}");
}
public async Task InitializeReportData(string workDate)
{
var initData = await _client
- .GetFromJsonAsync($"{_apiConfig.ReportUri}/init/{workDate}");
+ .GetFromJsonAsync($"{_apiConfig.CrmReport}/init/{workDate}");
return initData ?? new ReportInitDto();
}
public async Task PostReport(string workDate, ReportDto reportDto)
{
var response = await _client
- .PostAsJsonAsync($"{_apiConfig.ReportUri}/{workDate}", reportDto, _options);
+ .PostAsJsonAsync($"{_apiConfig.CrmReport}/{workDate}", reportDto, _options);
var jsonDate = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize(jsonDate);
diff --git a/Wonky.Client/HttpRepository/SalesItemHttpRepository.cs b/Wonky.Client/HttpRepository/SalesItemHttpRepository.cs
index c061b05d..e85be4e6 100644
--- a/Wonky.Client/HttpRepository/SalesItemHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/SalesItemHttpRepository.cs
@@ -64,7 +64,7 @@ public class SalesItemHttpRepository : ISalesItemHttpRepository
["selectGroup"] = pagingParameters.SelectGroup == "0" ? "" : pagingParameters.SelectGroup,
};
var response = await _client
- .GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.CatalogUri}/page", queryString));
+ .GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.CrmCatalog}/page", queryString));
var content = await response.Content.ReadAsStringAsync();
@@ -80,7 +80,7 @@ public class SalesItemHttpRepository : ISalesItemHttpRepository
public async Task GetSalesItem(string id)
{
var salesItem = await _client
- .GetFromJsonAsync($"{_apiConfig.CatalogUri}/{id}");
+ .GetFromJsonAsync($"{_apiConfig.CrmCatalog}/{id}");
return salesItem ?? new SalesItemView();
}
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs b/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs
index 8321eb73..a613b682 100644
--- a/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/TaskItemHttpRepository.cs
@@ -51,31 +51,31 @@ public class TaskItemHttpRepository : ITaskItemHttpRepository
public async Task?> GetTaskList()
{
- return await _client.GetFromJsonAsync>($"{_apiConfig.TaskUri}", _options);
+ return await _client.GetFromJsonAsync>($"{_apiConfig.CrmTask}", _options);
}
public async Task?> GetTaskList(string workDate)
{
- return await _client.GetFromJsonAsync>($"{_apiConfig.TaskUri}/date/{workDate}", _options);
+ return await _client.GetFromJsonAsync>($"{_apiConfig.CrmTask}/date/{workDate}", _options);
}
public async Task GetTaskItem(string taskItemId)
{
- return await _client.GetFromJsonAsync($"{_apiConfig.TaskUri}/{taskItemId}", _options);
+ return await _client.GetFromJsonAsync($"{_apiConfig.CrmTask}/{taskItemId}", _options);
}
public async Task CreateTaskItem(TaskItemDto taskItem)
{
- await _client.PostAsJsonAsync($"{_apiConfig.TaskUri}", taskItem, _options);
+ await _client.PostAsJsonAsync($"{_apiConfig.CrmTask}", taskItem, _options);
}
public async Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem)
{
- await _client.PutAsJsonAsync($"{_apiConfig.TaskUri}/{taskItemId}", taskItem, _options);
+ await _client.PutAsJsonAsync($"{_apiConfig.CrmTask}/{taskItemId}", taskItem, _options);
}
public async Task DeleteTaskItem(string taskItemId)
{
- await _client.DeleteAsync($"{_apiConfig.TaskUri}/{taskItemId}");
+ await _client.DeleteAsync($"{_apiConfig.CrmTask}/{taskItemId}");
}
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/UserHttpRepository.cs b/Wonky.Client/HttpRepository/UserHttpRepository.cs
index 7d9bc78a..7415df98 100644
--- a/Wonky.Client/HttpRepository/UserHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/UserHttpRepository.cs
@@ -49,37 +49,37 @@ public class UserHttpRepository : IUserHttpRepository
public async Task> GetAdvisors()
{
- return await _client.GetFromJsonAsync>(_api.AdminAdvisorUri);
+ return await _client.GetFromJsonAsync>(_api.AdminUser);
}
public async Task GetAdvisorInfo(string userId)
{
- return await _client.GetFromJsonAsync($"{_api.AdminAdvisorUri}/{userId}");
+ return await _client.GetFromJsonAsync($"{_api.AdminUser}/{userId}");
}
public async Task UpdateAdvisor(string userId, UserUpdateDto model)
{
- await _client.PutAsJsonAsync($"{_api.AdminAdvisorUri}/{userId}", model, _options);
+ await _client.PutAsJsonAsync($"{_api.AdminUser}/{userId}", model, _options);
}
public async Task> GetAdminUsers()
{
- return await _client.GetFromJsonAsync>(_api.AdminUserUri);
+ return await _client.GetFromJsonAsync>(_api.AdminOffice);
}
public async Task GetAdminUserInfo(string userId)
{
- return await _client.GetFromJsonAsync($"{_api.AdminUserUri}/{userId}");
+ return await _client.GetFromJsonAsync($"{_api.AdminOffice}/{userId}");
}
public async Task UpdateAdminUser(string userId, UserUpdateDto model)
{
- await _client.PutAsJsonAsync($"{_api.AdminUserUri}/{userId}", model, _options);
+ await _client.PutAsJsonAsync($"{_api.AdminOffice}/{userId}", model, _options);
}
public async Task ResetUserPassword(string userId, string newPasswd, string confirmPasswd)
{
var passwd = new Dictionary {{"newPassword", newPasswd}, {"confirmPassword", confirmPasswd}};
- await _client.PostAsJsonAsync($"{_api.AdminPasswdUri}/{userId}", passwd, _options);
+ await _client.PostAsJsonAsync($"{_api.AdminPasswd}/{userId}", passwd, _options);
}
}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs b/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs
index 24b10fd2..8791c5cb 100644
--- a/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs
@@ -32,21 +32,21 @@ public class WarehouseHttpRepository : IWarehouseHttpRepository
public async Task> GetWarehouseOrderListByDate(string date)
{
- return await _client.GetFromJsonAsync>($"{_api.WarehouseUri}?date={date}", _options);
+ return await _client.GetFromJsonAsync>($"{_api.Warehouse}?date={date}", _options);
}
public async Task> GetWarehouseOrderListByStatus(string status)
{
- return await _client.GetFromJsonAsync>($"{_api.WarehouseUri}?status={status}", _options);
+ return await _client.GetFromJsonAsync>($"{_api.Warehouse}?status={status}", _options);
}
public async Task GetWarehouseOrder(string orderId)
{
- return await _client.GetFromJsonAsync($"{_api.WarehouseUri}/{orderId}", _options);
+ return await _client.GetFromJsonAsync($"{_api.Warehouse}/{orderId}", _options);
}
public async Task UpdateWarehouseOrderStatus(WarehouseProcess process)
{
_logger.LogDebug("process => {}", JsonSerializer.Serialize(process));
- await _client.PutAsJsonAsync($"{_api.WarehouseUri}/{process.OrderId}", process, _options);
+ await _client.PutAsJsonAsync($"{_api.Warehouse}/{process.OrderId}", process, _options);
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor
index 910328a7..d86c839c 100644
--- a/Wonky.Client/Pages/ActivityNewVisitPage.razor
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor
@@ -352,7 +352,7 @@
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdminOfficeUserViewPage.razor b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor
index f5ad9c17..237e3d43 100644
--- a/Wonky.Client/Pages/AdminOfficeUserViewPage.razor
+++ b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor
@@ -17,6 +17,7 @@
@page "/admin/users/office/{CountryCode}/{UserId}/view"
@using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Components
@attribute [Authorize(Roles = "Admin")]
@@ -112,7 +113,7 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdvisorReportNewPage.razor b/Wonky.Client/Pages/AdvisorReportNewPage.razor
index 33404b86..64a8fe95 100644
--- a/Wonky.Client/Pages/AdvisorReportNewPage.razor
+++ b/Wonky.Client/Pages/AdvisorReportNewPage.razor
@@ -33,7 +33,7 @@
@if (_working)
{
-
+
}
diff --git a/Wonky.Client/Pages/CustomerViewPage.razor b/Wonky.Client/Pages/CustomerViewPage.razor
index f1aa6fdb..bb17da22 100644
--- a/Wonky.Client/Pages/CustomerViewPage.razor
+++ b/Wonky.Client/Pages/CustomerViewPage.razor
@@ -219,5 +219,5 @@
}
else
{
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/HelpPage.razor b/Wonky.Client/Pages/HelpPage.razor
index df8ff86b..99122065 100644
--- a/Wonky.Client/Pages/HelpPage.razor
+++ b/Wonky.Client/Pages/HelpPage.razor
@@ -23,22 +23,44 @@
@attribute [Authorize(Roles = "Advisor,Admin,Office,Warehouse")]
-
-
-
-
-
Browservalg
- Den nyeste udgave af Google Chrome, Chromium, Microsoft Edge, Apple Safari eller Vivaldi.
+
+ 
+ 
+ 