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

Merge branch 'develop' of https://gitlab.steamware.net/egalware/webdoorcreator into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-04-19 12:07:34 +02:00
parent de2e831a70 c3a1b73256
commit 0bcc18a1d3
11 changed files with 51 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor
-4
View File
@@ -1,4 +0,0 @@
@if(ListGraphicParams != null){
}
WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor.cs
-21
View File
@@ -1,21 +0,0 @@
using Microsoft.AspNetCore.Components;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.DoorDef
{
public partial class DoorDefHwStep
{
[Inject]
protected WebDoorCreatorService WDService { get; set; } = null!;
List<GraphicParamsModel>? ListGraphicParams { get; set; } = null;
protected async override Task OnInitializedAsync()
{
ListGraphicParams = await WDService.ParamGetByHwId(6);
}
}
}
WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor
+16 -7
View File
@@ -7,7 +7,7 @@ else
<div class="d-flex justify-content-between small">
<div style="width: 90%">
<div style="width: 90%;transform: translate(0, -5.7rem);">
<div style="width: 90%;">
@foreach (var item in currVal)
{
@if (isCombo(item.Key))
@@ -20,8 +20,8 @@ else
<select class="col-7" @bind="@currVal[item.Key]">
@foreach (var param in comboSet(item.Key))
{
<option value="@param.Split("/")[0]">
@(translate(@param.Split("/")[1]))
<option value="@param">
@param)
</option>
}
</select>
@@ -36,13 +36,22 @@ else
<input type="text" class="col-7" @bind="@currVal[item.Key]" />
</div>
}
}
@if (doCheckVal())
{
<div class="col-10">
<div class="btn-group w-100">
<button class="btn btn-outline-dark" style="cursor: pointer;" @onclick="() => doCancel()">
CANCEL
</button>
<button class="btn btn-outline-dark" style="cursor: pointer;" @onclick="() => doSave()">
SAVE
</button>
</div>
</div>
}
</div>
</div>
</div>
WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs
+5 -5
View File
@@ -210,13 +210,13 @@ namespace WebDoorCreator.UI.Components.DoorDef
{
setupCurrValues();
setupGraphicParams();
await ReloadData(isFirst);
//await ReloadData(isFirst);
}
private async Task ReloadData(bool isFirst)
{
}
//private async Task ReloadData(bool isFirst)
//{
// await FullReloadData(true);
//}
#endregion Private Methods
}
WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor
-106
View File
@@ -1,106 +0,0 @@
<div class="d-flex justify-content-between">
<div class="btn @isSizingActive" @onclick="()=>setSizing()">Sizing</div>
<div class="btn @isOpeningActive" @onclick="()=>setOpening()">Opening</div>
<div class="btn @isEdgesActive" @onclick="()=>setEdges()">Edges</div>
</div>
<div>
@if (ListVals != null)
{
@foreach (var size in ListVals)
{
<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">@size.Label</div>
@if (isEdges)
{
<select value="@size.DefaultVal">
</select>
}
<input value="@size.DefaultVal" />
</div>
}
}
@*@if (isSizing)
{
@if (ListVals != null)
{
@foreach (var size in ListVals.Where(x => x.Value != "Swing"))
{
<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">@size.Label</div>
<input value="@size.DefaultVal" />
</div>
}
}
}
else if (isOpening)
{
@if (ListVals != null)
{
@foreach (var swing in ListVals.Where(x => x.Value == "Swing"))
{
<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">Swing</div>
<select @bind="@swing.DefaultVal">
</select>
</div>
}
}
}
else if (isEdges)
{
@*<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">Lock edge</div>
<select @bind="@lockEdge">
@if (ListEdges != null)
{
@foreach (var item in ListEdges)
{
<option value="@item.Value">@item.Label</option>
}
}
</select>
</div>
<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">Hinge edge</div>
<select @bind="@hingeEdge">
@if (ListEdges != null)
{
@foreach (var item in ListEdges)
{
<option value="@item.Value">@item.Label</option>
}
}
</select>
</div>
<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">Top edge</div>
<select @bind="@topEdge">
@if (ListEdges != null)
{
@foreach (var item in ListEdges)
{
<option value="@item.Value">@item.Label</option>
}
}
</select>
</div>
<div class="d-flex justify-content-center m-5">
<div class="fs-4 me-3">Bottom edge</div>
<select @bind="@bottomEdge">
@if (ListEdges != null)
{
@foreach (var item in ListEdges)
{
<option value="@item.Value">@item.Label</option>
}
}
</select>
</div>
}*@
</div>
WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs
-127
View File
@@ -1,127 +0,0 @@
using Microsoft.AspNetCore.Components;
using Newtonsoft.Json;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.Services;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.DoorDef
{
public partial class DoorSizingStep
{
[Inject]
protected WebDoorCreatorService WDService { get; set; } = null!;
[Inject]
protected QueueDataService QDataServ { get; set; } = null!;
[Parameter]
public int DoorId { get; set; } = 0;
[Parameter]
public EventCallback<bool> E_paramChanged { get; set; }
protected bool isSizing { get; set; } = true;
protected List<ListValuesModel>? ListVals { get; set; } = null;
protected List<DoorOpModel>? ListDoorOp { get; set; } = null;
protected string isSizingActive
{
get => isSizing ? "btn-primary" : "btn-secondary";
}
protected bool isOpening { get; set; } = false;
protected string isOpeningActive
{
get => isOpening ? "btn-primary" : "btn-secondary";
}
protected bool isEdges { get; set; } = false;
protected bool paramIsChanged { get; set; } = false;
protected string isEdgesActive
{
get => isEdges ? "btn-primary" : "btn-secondary";
}
protected async void setSizing()
{
isOpening = false;
isEdges = false;
isSizing = true;
await ReloadData();
}
protected void setOpening()
{
isEdges = false;
isSizing = false;
isOpening = true;
}
protected async void setEdges()
{
isOpening = false;
isSizing = false;
isEdges = true;
await ReloadData();
}
protected string _lockEdge { get; set; } = "";
//protected string lockEdge
//{
// get => _lockEdge;
// set
// {
// _lockEdge = value;
// if (DefaultEdges != null)
// {
// if (_lockEdge != DefaultEdges.lockEdge)
// {
// paramIsChanged = true;
// var pUpd = Task.Run(async () => await QDataServ.sendCalcReq($"ORD{DoorId:00000}"));
// }
// }
// }
//}
protected string _height { get; set; } = "";
//protected string height
//{
// get => _height;
// set
// {
// _height = value;
// if (DefaultSizing != null)
// {
// if (_height != DefaultSizing.height)
// {
// paramIsChanged = true;
// var pUpd = Task.Run(async () => await QDataServ.sendCalcReq($"ORD{DoorId:00000}"));
// }
// }
// }
//}
protected async Task ReloadData()
{
//ListVals = null;
//ListVals.Clear();
ListDoorOp = await WDService.DoorOpGetByDoorId(DoorId);
}
protected override async Task OnParametersSetAsync()
{
if (!paramIsChanged)
{
await ReloadData();
}
}
}
}
WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor
-1
View File
@@ -1 +0,0 @@

WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor.cs
-33
View File
@@ -1,33 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Components;
using WebDoorCreator.UI.Components.Buttons;
using WebDoorCreator.UI.Components.CompMan;
using WebDoorCreator.UI.Components.DoorMan;
using WebDoorCreator.UI.Components.DoorDef;
using WebDoorCreator.UI.Components.Gen;
using WebDoorCreator.UI.Components.Order;
using WebDoorCreator.UI.Components.Users;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
namespace WebDoorCreator.UI.Components.Order
{
public partial class OrderDetailsDoorsList
{
[Parameter]
public OrderStatusViewModel? currOrderStatus { get; set; } = null;
}
}
WebDoorCreator.UI/Pages/DoorDefinition.razor
+22 -13
View File
@@ -14,19 +14,28 @@
<div class="mb-3">
<StepsList E_StepChanged="@catchCurrStep" DoorDefStep="@currDefStep"></StepsList>
</div>
@if (currDefStep == Core.Enum.DoorDefStep.Door)
{
<CascadingValue Value="@WDCUService.userId">
<DoorDefSizing DoorId="@idDoor" Lingua="@userLang"></DoorDefSizing>
</CascadingValue>
@*<DoorSizingStep E_paramChanged="catchParamChange" DoorId="@idDoor"></DoorSizingStep>*@
}
else if (currDefStep == Core.Enum.DoorDefStep.Hardware)
{
<CascadingValue Value="@WDCUService.userId">
<HardwareList DoorId="@idDoor" Lingua="@userLang"></HardwareList>
</CascadingValue>
}
<div>
@if (currDefStep == Core.Enum.DoorDefStep.Door)
{
@if (ListBaseDoorOp != null)
{
@foreach (var item in ListBaseDoorOp)
{
<CascadingValue Value="@WDCUService.userId">
<DoorDefSizingSI Lingua="@userLang" DoorOpInst="@item" HwCode="@item.ObjectId"></DoorDefSizingSI>
</CascadingValue>
}
}
@*<DoorSizingStep E_paramChanged="catchParamChange" DoorId="@idDoor"></DoorSizingStep>*@
}
else if (currDefStep == Core.Enum.DoorDefStep.Hardware)
{
<CascadingValue Value="@WDCUService.userId">
<HardwareList DoorId="@idDoor" Lingua="@userLang"></HardwareList>
</CascadingValue>
}
</div>
</div>
<div class="col-5">
<DoorPreview SvgContent="@DoorSvgContent"></DoorPreview>
WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
+6
View File
@@ -77,6 +77,11 @@ namespace WebDoorCreator.UI.Pages
protected async Task ReloadData()
{
var ListRecordDoorOp = await WDService.DoorOpGetByDoorId(idDoor);
if (ListRecordDoorOp != null)
{
ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "1" || x.ObjectId == "2").ToList();
}
var domani = DateTime.Today.AddDays(1);
ListOrdersStatus = null;
await Task.Delay(1);
@@ -95,6 +100,7 @@ namespace WebDoorCreator.UI.Pages
private static Logger Log = LogManager.GetCurrentClassLogger();
private List<OrderStatusViewModel>? ListOrdersStatus = null;
private List<DoorOpModel>? ListBaseDoorOp = null;
#endregion Private Fields
WebDoorCreator.UI/Pages/OrderDetails.razor.cs
+2 -1
View File
@@ -117,6 +117,7 @@ namespace WebDoorCreator.UI.Pages
// salvo Door OP associate
//bool fatto = await WDService.DoorOpInsert(doorId, listOp);
defaultDict.Clear();
actDict.Clear();
foreach (var item in listRecordEdge)
{
if (item.isSerializable && item.DefaultVal.Contains(","))
@@ -144,7 +145,7 @@ namespace WebDoorCreator.UI.Pages
DateMod = adesso,
UserIdIns = WDCUService.userId,
UserIdMod = WDCUService.userId,
ObjectId = "1",
ObjectId = "2",
DoorId = doorId,
JsoncConfigVal = jsonDef,
JsoncActVal = jsonAct