Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completato spostsamento servizio webdoor in DATA

Browse Source
This commit is contained in:
Samuele Locatelli
2023-05-19 16:29:52 +02:00
parent 8287ff68ef
commit b02481ef33
24 changed files with 113 additions and 2242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebDoorCreator.Data/Services/WebDoorCreatorService.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Identity.UI.Services;
using EgwCoreLib.Utils;
using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
WebDoorCreator.Data/WebDoorCreator.Data.csproj
+1
View File
@@ -13,6 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2305.1916" />
<PackageReference Include="EntityFrameworkCore.SqlServer.HierarchyId" Version="3.0.1" />
<PackageReference Include="MailKit" Version="3.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.11" />
WebDoorCreator.UI/Components/Buttons/ButtonAddRemDoor.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Identity;
using Microsoft.JSInterop;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Buttons
WebDoorCreator.UI/Components/CompMan/CompanyList.razor.cs
+1
View File
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Components;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.CompMan
WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor.cs
+1
View File
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Components;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.DoorDef
WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.DoorDef
WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.DoorDef
WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Components.SvgComp;
using WebDoorCreator.UI.Data;
WebDoorCreator.UI/Components/Filters/OrderFilter.razor.cs
+1
View File
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Components;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Filters
WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
+1
View File
@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Identity;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Gen
WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs
+25 -25
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Newtonsoft.Json;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Hardware
@@ -21,7 +22,6 @@ namespace WebDoorCreator.UI.Components.Hardware
[CascadingParameter]
public string UserId { get; set; } = "";
#endregion Public Properties
#region Protected Properties
@@ -43,6 +43,21 @@ namespace WebDoorCreator.UI.Components.Hardware
#region Protected Methods
protected int getInstNumber(string hwCode)
{
int answ = 0;
if (DoorOpList != null)
{
answ = DoorOpList
.Where(x => x.ObjectId == hwCode)
.ToList()
.Count();
}
return answ;
}
protected async Task hwToAdd()
{
await Task.Delay(1);
@@ -200,6 +215,15 @@ namespace WebDoorCreator.UI.Components.Hardware
return answ;
}
protected async Task setRefOnDelete(bool isDel)
{
if (isDel)
{
HwToShow = null;
await ReloadData();
}
}
//CultureInfo ci = CultureInfo.InstalledUICulture;
protected string translate(string lemma)
{
@@ -236,30 +260,6 @@ namespace WebDoorCreator.UI.Components.Hardware
}
}
protected async Task setRefOnDelete(bool isDel)
{
if (isDel)
{
HwToShow = null;
await ReloadData();
}
}
protected int getInstNumber(string hwCode)
{
int answ = 0;
if (DoorOpList != null)
{
answ = DoorOpList
.Where(x => x.ObjectId == hwCode)
.ToList()
.Count();
}
return answ;
}
#endregion Private Methods
}
}
WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Newtonsoft.Json;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Components.SvgComp;
using WebDoorCreator.UI.Data;
using static WebDoorCreator.UI.Data.WDCRefreshService;
WebDoorCreator.UI/Components/Order/OrderDets.razor.cs
+61 -48
View File
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Components;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.DTO;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Order
@@ -10,7 +11,14 @@ namespace WebDoorCreator.UI.Components.Order
{
#region Public Properties
protected DataPager? pagerDoors = null!;
[Parameter]
public EventCallback<bool> E_isEmpty { get; set; }
[Parameter]
public EventCallback<DoorModel> E_SendDoor { get; set; }
[Parameter]
public OrderStatusViewModel? OrderView { get; set; }
public string userId
{
@@ -19,23 +27,24 @@ namespace WebDoorCreator.UI.Components.Order
return WDCUService.userId;
}
}
[Parameter]
public EventCallback<DoorModel> E_SendDoor { get; set; }
protected async Task SetCurrDoor(DoorModel door)
{
await Task.Delay(1);
//currDoor = door;
await E_SendDoor.InvokeAsync(door);
}
#endregion Public Properties
#region Protected Fields
protected DataPager? pagerDoors = null!;
#endregion Protected Fields
#region Protected Properties
protected DoorModel? currDoor { get; set; } = null;
protected int currDoorType { get; set; } = 0;
[Parameter]
public OrderStatusViewModel? OrderView { get; set; }
protected DDFDto CurrentConf { get; set; } = new DDFDto();
protected DoorsSelectFilter currFilter { get; set; } = new DoorsSelectFilter();
/// <summary>
/// Unit� di misura selezionata
@@ -43,15 +52,27 @@ namespace WebDoorCreator.UI.Components.Order
protected string currMeaUnit { get; set; } = "mm";
protected List<DoorModel>? DoorsList { get; set; } = null;
protected WebDoorCreator.Data.DbModels.Edges edgesFirstInst { get; set; } = new WebDoorCreator.Data.DbModels.Edges();
protected int idOrd { get; set; } = -1;
protected int orderStat { get; set; } = -1;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
protected int orderStat { get; set; } = -1;
protected OrderStatusViewModel? OrderStatus { get; set; } = null;
protected string stepColor { get; set; } = "";
protected int totalCount { get; set; }
protected int userCurrCompany
{
get => WDCUService.userCurrComp;
}
[Inject]
protected WDCUserService WDCUService { get; set; } = null!;
@@ -62,11 +83,8 @@ namespace WebDoorCreator.UI.Components.Order
#region Protected Methods
protected DDFDto CurrentConf { get; set; } = new DDFDto();
protected async Task createDoor()
{
int doorId = await WDService.createDoor(idOrd, userId, currMeaUnit);
if (doorId > 0)
{
@@ -77,20 +95,32 @@ namespace WebDoorCreator.UI.Components.Order
NavManager.NavigateTo($"DoorDefinition?idOrd={idOrd}&idDoor={doorId}");
}
protected int userCurrCompany
protected void ForceReload(int newNum)
{
get => WDCUService.userCurrComp;
numRecord = newNum;
}
protected async override Task OnParametersSetAsync()
protected void ForceReloadPage(int newNum)
{
await Task.Delay(1);
currPage = newNum;
}
protected string stepColor { get; set; } = "";
protected override async Task OnParametersSetAsync()
{
await Task.Delay(1);
}
protected async Task SetCurrDoor(DoorModel door)
{
await Task.Delay(1);
//currDoor = door;
await E_SendDoor.InvokeAsync(door);
}
protected async Task setEmpty()
{
await E_isEmpty.InvokeAsync(true);
}
protected async Task setStepColor(string StepColor)
{
@@ -99,22 +129,14 @@ namespace WebDoorCreator.UI.Components.Order
StateHasChanged();
}
[Parameter]
public EventCallback<bool> E_isEmpty { get; set; }
protected async Task setEmpty()
protected void UpdateTotCount(int newTotCount)
{
await E_isEmpty.InvokeAsync(true);
totalCount = newTotCount;
}
#endregion Protected Methods
#region Private Fields
#endregion Private Fields
protected DoorsSelectFilter currFilter { get; set; } = new DoorsSelectFilter();
#region Private Properties
private int currPage
{
@@ -129,27 +151,16 @@ namespace WebDoorCreator.UI.Components.Order
get => currFilter.NumRec;
set => currFilter.NumRec = value;
}
private string searchValue
{
get => currFilter.searchValue;
set => currFilter.searchValue = value;
}
protected int totalCount { get; set; }
#endregion Private Properties
protected void ForceReload(int newNum)
{
numRecord = newNum;
}
protected void ForceReloadPage(int newNum)
{
currPage = newNum;
}
protected void UpdateTotCount(int newTotCount)
{
totalCount = newTotCount;
}
#region Private Methods
private async Task updateFilter(DoorsSelectFilter newParams)
{
@@ -162,5 +173,7 @@ namespace WebDoorCreator.UI.Components.Order
currFilter = newParams;
isLoading = false;
}
#endregion Private Methods
}
}
WebDoorCreator.UI/Components/Order/OrderList.razor.cs
+1
View File
@@ -10,6 +10,7 @@ using Microsoft.JSInterop;
using NLog.LayoutRenderers;
using System.Linq;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
using static Microsoft.AspNetCore.Razor.Language.TagHelperMetadata;
using static WebDoorCreator.Core.Enum;
WebDoorCreator.UI/Components/Order/OrderStatusStep.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Order
WebDoorCreator.UI/Components/Report/ReportList.razor.cs
+1
View File
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Razor.Language.Extensions;
using Microsoft.Build.Framework;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Report
WebDoorCreator.UI/Components/Users/UserList.razor.cs
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.Users
WebDoorCreator.UI/Data/WebDoorCreatorService.cs
-2163
View File
File diff suppressed because it is too large Load Diff
WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs
+1
View File
@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.WebUtilities;
using Newtonsoft.Json;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Pages
WebDoorCreator.UI/Pages/OrdersHomePage.razor.cs
+1
View File
@@ -5,6 +5,7 @@ using Microsoft.JSInterop;
using System;
using System.Runtime.InteropServices;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Pages
WebDoorCreator.UI/Pages/SuperAdmin.razor.cs
+1
View File
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.WebUtilities;
using System.Text;
using System.Text.Encodings.Web;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Pages
WebDoorCreator.UI/Pages/TestAnim.razor
+3 -2
View File
@@ -1,5 +1,6 @@
@using WebDoorCreator.UI.Components.SvgComp
@using WebDoorCreator.UI.Data
@using WebDoorCreator.Data.Services;
@using WebDoorCreator.UI.Components.SvgComp
@using WebDoorCreator.Data
@page "/TestAnim"
@inject WebDoorCreatorService WDCService
WebDoorCreator.UI/Pages/TestPage.razor
+2 -1
View File
@@ -1,4 +1,5 @@
@using WebDoorCreator.UI.Components.SvgComp
@using WebDoorCreator.Data.Services;
@using WebDoorCreator.UI.Components.SvgComp
@using WebDoorCreator.UI.Data
@page "/TestPage"
WebDoorCreator.UI/_Imports.razor
+3 -2
View File
@@ -6,6 +6,9 @@
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
@using EgwCoreLib.Razor
@using WebDoorCreator.Data
@using WebDoorCreator.Data.DbModels
@using WebDoorCreator.UI
@using WebDoorCreator.UI.Components
@using WebDoorCreator.UI.Components.Buttons
@@ -20,7 +23,5 @@
@using WebDoorCreator.UI.Components.Filters
@using WebDoorCreator.UI.Components.Report
@using WebDoorCreator.UI.Shared
@using WebDoorCreator.Data.DbModels
@using EgwCoreLib.Razor