diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 2207b0b..f38ebb8 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ WebDoorCreator - Egalware -

Version: 0.9.2305.2319

+

Version: 0.9.2305.2414


Release note: - @*
-
- @context.User.Identity?.Name -
- @if (listCompanies != null) - { - @if (listCompanies.Count > 1) - { - - } - else - { - @if (compToShow != null) - { -
@compToShow.CompanyName
- } - } - } -
-
- -
-
-
- -
-
*@ diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor index f3d6b84..3a4e322 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor @@ -4,11 +4,10 @@ } else { -
+ @*
- @*
*@
@($"{translate(DoorOpInst.ObjectId)} #{instanceN}") @@ -155,11 +154,6 @@ else
- @*
- -
*@
+
*@ + +
+ +
+ @if (DoorOpInst.userConfirm != "" && DoorOpInst.DtConfirm != null) + { + + } +
+
@($"{@getTrad(DoorOpInst.ObjectId)} #{instanceN}")
+
+ @if (isChangedVal()) + { +
+ } + else + { +
+ } +
+ +
+
+ Folder +
+ +
+
+
+ Folder +
+ @if (listValuesFiles != null && listValuesFiles.Count > 0 && !string.IsNullOrEmpty(templateName)) + { + + } + else + { + + } +
+
+ + @foreach (var item in currVal) + { + + @if (item.Key != "Folder" && item.Key != "template" && item.Key != "shape") + { + @if (isCombo(item.Key)) + { +
+
+ @translate(item.Key) +
+ + +
+ } + else + { +
+
+ @translate(item.Key) +
+ + +
+ } + } + } +
+
+
+
+ + +
+
+ @if (isChangedVal()) + { + + + } + else + { + + + } +
+
+
} diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs index 4be87b8..f543625 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs @@ -1,12 +1,9 @@ using Microsoft.AspNetCore.Components; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.JSInterop; using Newtonsoft.Json; -using System.Security.Policy; using WebDoorCreator.Data.DbModels; using WebDoorCreator.Data.Services; using WebDoorCreator.UI.Data; -using static WebDoorCreator.UI.Data.WDCRefreshService; namespace WebDoorCreator.UI.Components.Hardware { @@ -17,11 +14,11 @@ namespace WebDoorCreator.UI.Components.Hardware [Parameter] public DoorOpModel DoorOpInst { get; set; } = null!; - [Parameter] - public EventCallback E_recordUpdate { get; set; } [Parameter] public EventCallback E_act2Rel { get; set; } + [Parameter] + public EventCallback E_recordUpdate { get; set; } [Parameter] public string HwCode { get; set; } = ""; @@ -36,11 +33,8 @@ namespace WebDoorCreator.UI.Components.Hardware #endregion Public Properties - #region Public Methods - #endregion Public Methods - #region Protected Properties protected Dictionary _currVal { get; set; } = new Dictionary(); @@ -60,6 +54,7 @@ namespace WebDoorCreator.UI.Components.Hardware } } } + protected string folderName { get => currVal != null ? tryGetCurrVal("Folder") : ""; @@ -85,6 +80,7 @@ namespace WebDoorCreator.UI.Components.Hardware protected IJSRuntime JSRuntime { get; set; } = null!; protected List? listValuesFiles { get; set; } = null!; + protected List? listValuesHW { get; set; } = null!; protected List? listValuesFname { get; set; } = null!; @@ -93,7 +89,6 @@ namespace WebDoorCreator.UI.Components.Hardware protected string templateName { - /*currVal != null ? tryGetCurrVal("template") : tryGetCurrVal("shape");*/ get { string answ = ""; @@ -208,6 +203,7 @@ namespace WebDoorCreator.UI.Components.Hardware } return answ; } + protected bool isCombo(string pKey) { bool answ = false; @@ -223,7 +219,6 @@ namespace WebDoorCreator.UI.Components.Hardware await FullReloadData(); } - protected string translate(string lemma) { string answ = ""; @@ -253,21 +248,23 @@ namespace WebDoorCreator.UI.Components.Hardware #region Private Methods + protected string currTempOrSh { get; set; } = ""; + private async Task FullReloadData() { currVal = DoorOpInst.CurrVals; graphicParams = DoorOpInst.GraphicParams; await SetSelectedData(); } - - protected string currTempOrSh { get; set; } = ""; - private async Task SetSelectedData() { isLoading = true; await Task.Delay(1); // fix folder listValuesFiles = null; + listValuesHW = null; + listValuesHW = await WDCService.ListValuesGetAll(HwCode, "Hardware"); + var tempListVal = await WDCService.ListValuesGetAll(HwCode, "Folder"); if (tempListVal != null) { @@ -296,7 +293,6 @@ namespace WebDoorCreator.UI.Components.Hardware } try { - if (listValuesFiles != null && listValuesFiles.Count > 0) { currTempOrSh = listValuesFiles.FirstOrDefault()?.FieldName!; @@ -312,6 +308,23 @@ namespace WebDoorCreator.UI.Components.Hardware await InvokeAsync(StateHasChanged); } + + protected string getTrad(string objId) + { + string answ = ""; + + if (listValuesHW != null) + { + var currHw2Trad = listValuesHW.Where(x => x.TableName == objId).FirstOrDefault(); + if(currHw2Trad != null) + { + answ = translate(currHw2Trad.Label); + } + } + + return answ; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css index f2ebe11..34a38a8 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css @@ -1,4 +1,11 @@ -.btnGen { +.btnPDF { + border-radius: 50%; + width: 1.5rem; + height: 1.5rem; + border: 2px solid #00838F; + z-index: 99999; +} +.btnGen { border-radius: 50%; width: 3.5rem; height: 3.5rem; @@ -12,7 +19,7 @@ border: 5px solid #00838F; z-index: 99999; background: #B71C1C; - transform: translate(25px, -1rem); + /*transform: translate(@xDelta, -@yDelta);*/ } .btnClone { border-radius: 50%; @@ -21,25 +28,26 @@ border: 5px solid #00838F; z-index: 99999; background: #FFF; - transform: translate(1.6rem, -1rem); + /*transform: translate(1.6rem, -1rem);*/ } .btnPDFSuccess { border-radius: 50%; - width: 3.5rem; - height: 3.5rem; - border: 5px solid #00838F; + width: 1.5rem; + height: 1.5rem; + border: 2px solid #00838F; z-index: 99999; background: #8E44AD; - transform: translate(1rem, 1rem); } .btnPDFPending { border-radius: 50%; - width: 3.5rem; - height: 3.5rem; - border: 5px solid #00838F; + width: 1.5rem; + height: 1.5rem; + border: 2px solid #00838F; z-index: 99999; background: #F1C40F; - transform: translate(20.3rem, 1rem); +} +.btnPDFSuccess > i { + font-size: 0.8rem; } .btnHighlight { border-radius: 50%; @@ -57,7 +65,6 @@ border: 5px solid #00838F; z-index: 99999; background: var(--colorCode); - transform: translate(-7rem, 1rem); } .btnSave { border-radius: 50%; @@ -66,7 +73,6 @@ border: 5px solid #00838F; z-index: 99999; background: var(--colorCode); - transform: translate(-7.5rem, 1rem); } .btnHeadTail { width: 100%; @@ -117,4 +123,28 @@ i { justify-content: center; flex-wrap: wrap; font-size: 1.1rem; +} +.blue { + background: #3652D9; +} +.grey { + background: #7F8C8D; + opacity: 50%; +} +.circle { + width: 1rem; + height: 1rem; + border-radius: 50%; + box-shadow: 0px 0px 1px 1px #0000001a; +} +.pulse { + animation: pulse-animation 2s infinite; +} +@keyframes pulse-animation { + 0% { + box-shadow: 0 0 0 0px rgba(0, 0, 0, 0.2); + } + 100% { + box-shadow: 0 0 0 20px rgba(0, 0, 0, 0); + } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less index 4712a02..2d3b155 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less @@ -1,6 +1,14 @@ @xDelta: 25px; @yDelta: 1rem; +.btnPDF { + border-radius: 50%; + width: 1.5rem; + height: 1.5rem; + border: 2px solid #00838F; + z-index: 99999; +} + .btnGen { border-radius: 50%; width: 3.5rem; @@ -12,25 +20,28 @@ .btnDelete { .btnGen; background: #B71C1C; - transform: translate(@xDelta, -@yDelta); + /*transform: translate(@xDelta, -@yDelta);*/ } .btnClone { .btnGen; background: #FFF; - transform: translate(1.6rem, -1rem); + /*transform: translate(1.6rem, -1rem);*/ } .btnPDFSuccess { - .btnGen; + .btnPDF; background: #8E44AD; - transform: translate(1rem, @yDelta); } .btnPDFPending { - .btnGen; + .btnPDF; background: #F1C40F; - transform: translate(20.3rem, 1rem); + //transform: translate(20.3rem, 1rem); +} + +.btnPDFSuccess > i { + font-size: 0.8rem; } .btnHighlight { @@ -38,15 +49,15 @@ background: #03A9F4; transform: translate(10.3rem, -8rem); } + .btnCancel { .btnGen; background: var(--colorCode); - transform: translate(-7rem, 1rem); } + .btnSave { .btnGen; background: var(--colorCode); - transform: translate(-7.5rem, 1rem); } @@ -104,3 +115,36 @@ i { flex-wrap: wrap; font-size: 1.1rem; } + + + +.blue { + background: #3652D9; +} + +.grey { + background: #7F8C8D; + opacity: 50%; +} + + +.circle { + width: 1rem; + height: 1rem; + border-radius: 50%; + box-shadow: 0px 0px 1px 1px #0000001a; +} + +.pulse { + animation: pulse-animation 2s infinite; +} + +@keyframes pulse-animation { + 0% { + box-shadow: 0 0 0 0px rgba(0, 0, 0, 0.2); + } + + 100% { + box-shadow: 0 0 0 20px rgba(0, 0, 0, 0); + } +} diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css index 34f6737..69ecf7c 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css @@ -1 +1 @@ -.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#b71c1c;transform:translate(25px,-1rem);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#8e44ad;transform:translate(1rem,1rem);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#f1c40f;transform:translate(20.3rem,1rem);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#03a9f4;transform:translate(10.3rem,-8rem);}.btnCancel{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-7rem,1rem);}.btnSave{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-7.5rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;} \ No newline at end of file +.btnPDF{border-radius:50%;width:1.5rem;height:1.5rem;border:2px solid #00838f;z-index:99999;}.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#b71c1c;}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#fff;}.btnPDFSuccess{border-radius:50%;width:1.5rem;height:1.5rem;border:2px solid #00838f;z-index:99999;background:#8e44ad;}.btnPDFPending{border-radius:50%;width:1.5rem;height:1.5rem;border:2px solid #00838f;z-index:99999;background:#f1c40f;}.btnPDFSuccess>i{font-size:.8rem;}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#03a9f4;transform:translate(10.3rem,-8rem);}.btnCancel{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);}.btnSave{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;}.blue{background:#3652d9;}.grey{background:#7f8c8d;opacity:50%;}.circle{width:1rem;height:1rem;border-radius:50%;box-shadow:0 0 1px 1px #0000001a;}.pulse{animation:pulse-animation 2s infinite;}@keyframes pulse-animation{0%{box-shadow:0 0 0 0 rgba(0,0,0,.2);}100%{box-shadow:0 0 0 20px rgba(0,0,0,0);}} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor index 577982f..5e0c9b0 100644 --- a/WebDoorCreator.UI/Components/Order/OrderList.razor +++ b/WebDoorCreator.UI/Components/Order/OrderList.razor @@ -4,94 +4,43 @@ } else { - @*
- COORDS: - X=@screenX - Y=@screenY -
- SIZE: - HEIGHT: @Height - WIDTH: @Width -
*@ - - - @if (Ord2Show == null) - { - - - - - - - - - - - - @**@ - +
Order Date Order Number Order DescriptionQuantityModel NumberOrder StatusTOTAL COSTPROGRESS
+ + + + + + + + + + + + + + + @foreach (var item in ListOrdersStatus) + { + + + + + + + + + + - - - @foreach (var item in ListOrdersStatus) - { - @**@ - - @**@ - - - - - - - - - @**@ - - - } - -
Order Date Order Number Order DescriptionQuantityModel NumberOrder StatusTOTAL COST
+ + + @item.DateIns@item.OrderExtCode@item.OrderDescript@item.NumDoors@item.NumType@getOrderStatusLabel(item.OrderStatus)@($"{item.TotCost:C2}") + @if (item.OrderStatus <= 10) + { + + } +
- - - @item.DateIns@item.OrderExtCode@item.OrderDescript@item.NumDoors@item.NumType@getOrderStatusLabel(item.OrderStatus)@($"{item.TotCost:C2}") -
-
-
- 		- @if (item.OrderStatus <= 10) - { - - } -
- } - else - { - @**@ - @**@ - @* - - @Ord2Show.DateIns - @Ord2Show.OrderExtCode - @Ord2Show.OrderDescript - @Ord2Show.NumDoors - @Ord2Show.NumType - @getOrderStatusLabel(Ord2Show.OrderStatus) - @($"{Ord2Show.TotCost:C2}") - -
-
-
- - - @if (Ord2Show.OrderStatus <= 10) - { - - } - - *@ - - - - } + } + + } diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs index c07f55a..49c9a1f 100644 --- a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs +++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs @@ -1,18 +1,11 @@ using EgwCoreLib.Razor; using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.WebUtilities; -using Microsoft.Build.Framework; 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; namespace WebDoorCreator.UI.Components.Order @@ -21,11 +14,17 @@ namespace WebDoorCreator.UI.Components.Order { [Parameter] public bool B_doorChaged { get; set; } + [Parameter] public EventCallback E_currOrderStatus { get; set; } + public int Height { get; set; } + + public string reportBaseUrl { get; set; } = "http://w2019-sql-steam/reportserver?/Test/WebDoor/"; + [Parameter] public int UserCurrCompany { get; set; } + #region Protected Properties private bool sortAsc = true; @@ -35,13 +34,13 @@ namespace WebDoorCreator.UI.Components.Order [Parameter] public OrderSelectFilter actFilter { get; set; } = new OrderSelectFilter(); - [Parameter] - public EventCallback updateRecordCount { get; set; } [Parameter] public EventCallback E_SetOrd2Show { get; set; } public OrderStatusViewModel? Ord2Show { get; set; } + [Parameter] + public EventCallback updateRecordCount { get; set; } protected string currUser { get; set; } = ""; [Inject] @@ -49,6 +48,7 @@ namespace WebDoorCreator.UI.Components.Order [Inject] protected WebDoorCreatorService WDService { get; set; } = null!; + private int _totalCount { get; set; } = 0; private int currPage @@ -106,6 +106,7 @@ namespace WebDoorCreator.UI.Components.Order sortAsc = e.IsAscending; await ReloadData(); } + #endregion Protected Properties #region Protected Methods @@ -131,6 +132,9 @@ namespace WebDoorCreator.UI.Components.Order protected bool isModRole { get; set; } = false; + [Inject] + protected NavigationManager NavManager { get; set; } = null!; + protected bool ordByCode { get; set; } = false; protected bool ordByDate { get; set; } = false; @@ -155,7 +159,6 @@ namespace WebDoorCreator.UI.Components.Order protected async Task deleteRecord(OrderStatusViewModel currRec) { - if (!await JSRuntime.InvokeAsync("confirm", $"Order Deletion requested: are you sure to remove {currRec.OrderExtCode}?")) return; @@ -219,6 +222,7 @@ namespace WebDoorCreator.UI.Components.Order return answ; } + private async Task ReloadData() { ListOrdersStatus = null; @@ -265,6 +269,7 @@ namespace WebDoorCreator.UI.Components.Order ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.DateIns).ToList(); } break; + case "OrderNumber": if (sortAsc) { @@ -275,12 +280,12 @@ namespace WebDoorCreator.UI.Components.Order ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.OrderExtCode).ToList(); } break; + default: ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.DateIns).ToList(); break; } } - } } @@ -293,11 +298,16 @@ namespace WebDoorCreator.UI.Components.Order await Task.Delay(1); await InvokeAsync(StateHasChanged); } + #endregion Private Methods + + public int Width { get; set; } [Inject] - protected NavigationManager NavManager { get; set; } = null!; + protected IJSRuntime JsRuntime { get; set; } = null!; - #endregion Private Methods + protected int screenX { get; set; } = 0; + + protected int screenY { get; set; } = 0; protected string getOrderStatusLabel(int orderStat) { @@ -314,9 +324,6 @@ namespace WebDoorCreator.UI.Components.Order return answ; } - - public string reportBaseUrl { get; set; } = "http://w2019-sql-steam/reportserver?/Test/WebDoor/"; - protected string reportUrl(int orderId) { return $"{reportBaseUrl}ReportOrder&OrderID={orderId}&rs:Command=Render&rs:format=PDF"; @@ -335,22 +342,6 @@ namespace WebDoorCreator.UI.Components.Order } } } - - protected int screenX { get; set; } = 0; - protected int screenY { get; set; } = 0; - - private void getElementCoords(MouseEventArgs e) - { - screenX = (int)(e.ClientX); - screenY = (int)(e.ClientY); - } - - public int Height { get; set; } - public int Width { get; set; } - - [Inject] - protected IJSRuntime JsRuntime { get; set; } = null!; - private async Task getDim() { var dimension = await JsRuntime.InvokeAsync("getWindowDimensions"); @@ -358,11 +349,15 @@ namespace WebDoorCreator.UI.Components.Order Width = dimension.Width; } + private void getElementCoords(MouseEventArgs e) + { + screenX = (int)(e.ClientX); + screenY = (int)(e.ClientY); + } public class WindowDimension { - public int Width { get; set; } public int Height { get; set; } + public int Width { get; set; } } - } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor.cs b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor.cs index 67d0361..de68728 100644 --- a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor.cs +++ b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor.cs @@ -1,38 +1,29 @@ 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 { public partial class OrderStatusStep { - - [Inject] - protected WebDoorCreatorService WDService { get; set; } = null!; - [Parameter] public int CurrOrderStatus { get; set; } = 10; [Parameter] public EventCallback E_CurrStepColor { get; set; } - protected override async Task OnParametersSetAsync() - { - await Task.Delay(1); - } + protected string currColor { get; set; } = ""; + protected List? currListOrderStatus { get; set; } = null; + + [Inject] + protected WebDoorCreatorService WDService { get; set; } = null!; protected async Task doChangeStep(string actDoorDefStep) { await Task.Delay(1); - //await E_StepChanged.InvokeAsync(actDoorDefStep); } - protected List? currListOrderStatus { get; set; } = null; - protected string currColor { get; set; } = ""; - protected override async Task OnInitializedAsync() { await Task.Delay(1); @@ -50,5 +41,9 @@ namespace WebDoorCreator.UI.Components.Order } } + protected override async Task OnParametersSetAsync() + { + await Task.Delay(1); + } } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Report/ReportList.razor.cs b/WebDoorCreator.UI/Components/Report/ReportList.razor.cs index 418952e..874f719 100644 --- a/WebDoorCreator.UI/Components/Report/ReportList.razor.cs +++ b/WebDoorCreator.UI/Components/Report/ReportList.razor.cs @@ -1,7 +1,4 @@ using Microsoft.AspNetCore.Components; -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; @@ -20,6 +17,7 @@ namespace WebDoorCreator.UI.Components.Report [Inject] protected WebDoorCreatorService WDService { get; set; } = null!; + [Inject] protected WDCVocabularyService WDVService { get; set; } = null!; @@ -37,7 +35,6 @@ namespace WebDoorCreator.UI.Components.Report } return answ; - } protected string getTranslatedLabel(string HwId) @@ -49,14 +46,13 @@ namespace WebDoorCreator.UI.Components.Report var hw2Translate = listHw.FirstOrDefault(); if (hw2Translate != null) { - answ = translate(hw2Translate.Label); } } return answ; } - protected async override Task OnParametersSetAsync() + protected override async Task OnParametersSetAsync() { var result = await WDService.DoorOpGetByDoorId(doorId); if (result != null) @@ -64,6 +60,7 @@ namespace WebDoorCreator.UI.Components.Report DoorOps = result.Where(x => x.ObjectId != "Size" && x.ObjectId != "Profiles" && x.ObjectId != "Swing" && x.ObjectId != "Properties" && x.ObjectId != "Finishing").ToList(); } } + protected string translate(string lemma) { string answ = ""; diff --git a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor index 0bc13e5..a607bae 100644 --- a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor +++ b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor @@ -3,24 +3,13 @@ @if (currDoorOp != null) {
- @*@if (currDoorOp.DtConfirm != null && currDoorOp.userConfirm != "") - {*@
Please press - - - after reading the whole file + after reading the whole Document
- @*} - else - { -
- Template already confirmed by user: @currDoorOp.userConfirm on @currDoorOp.DtConfirm -
- }*@
} \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs index 37bb141..f805d66 100644 --- a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs +++ b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs @@ -9,20 +9,75 @@ namespace WebDoorCreator.UI.Pages { public partial class HwPdfConfirm { + protected int doorId = 0; + + protected string objectId = ""; + + protected List allDoorOps { get; set; } = new List(); + + protected DoorOpModel currDoorOp { get; set; } = new DoorOpModel(); + + protected int doorOpId { get; set; } = 0; + [Inject] protected NavigationManager NavManager { get; set; } = null!; - [Inject] - protected WDCUserService WDCUService { get; set; } = null!; + + protected string userLang + { + get => WDCUService.currLanguage ?? "EN"; + set => WDCUService.currLanguage = value; + } + [Inject] protected WDCRefreshService WDCRService { get; set; } = null!; - protected int doorOpId { get; set; } = 0; - protected int doorId = 0; - protected string objectId = ""; - protected DoorOpModel currDoorOp { get; set; } = new DoorOpModel(); - protected List allDoorOps { get; set; } = new List(); + [Inject] + protected WDCUserService WDCUService { get; set; } = null!; + [Inject] + protected WDCRefreshService WDRService { get; set; } = null!; - protected async override Task OnInitializedAsync() + [Inject] + protected WebDoorCreatorService WDService { get; set; } = null!; + + protected bool checkIfConf() + { + bool answ = false; + if (allDoorOps != null) + { + var rawObj = JsonConvert.DeserializeObject>>(currDoorOp.JsoncActVal!); + if (rawObj != null) + { + foreach (var op in allDoorOps) + { + var opObj = JsonConvert.DeserializeObject>>(op.JsoncActVal!); + if (opObj != null) + { + if (rawObj["template"] == opObj["template"] && op.DtConfirm != null && op.userConfirm != "") + { + answ = true; + } + } + } + } + } + return answ; + } + + protected async Task doConfirm() + { + currDoorOp.userConfirm = WDCUService.userId; + currDoorOp.DtConfirm = DateTime.Now; + + var doorOps2Save = new List() { currDoorOp }; + + var done = await WDService.DoorOpUpdate(doorOps2Save); + if (done) + { + WDRService.ReportDoorOpConf(doorId, doorOpId, objectId); + } + } + + protected override async Task OnInitializedAsync() { await Task.Delay(1); var uri = NavManager.ToAbsoluteUri(NavManager.Uri); @@ -41,7 +96,6 @@ namespace WebDoorCreator.UI.Pages doorOpId = int.Parse(sDoorOpId); await ReloadData(); } - } protected async Task ReloadData() @@ -50,59 +104,8 @@ namespace WebDoorCreator.UI.Pages if (currDoorOp != null) { allDoorOps = await WDService.DoorOpGetByDoorId(currDoorOp.DoorId); - } await Task.Delay(1); } - [Inject] - protected WebDoorCreatorService WDService { get; set; } = null!; - [Inject] - protected WDCRefreshService WDRService { get; set; } = null!; - - protected async Task doConfirm() - { - currDoorOp.userConfirm = WDCUService.userId; - currDoorOp.DtConfirm = DateTime.Now; - - var doorOps2Save = new List() { currDoorOp }; - - var done = await WDService.DoorOpUpdate(doorOps2Save); - if (done) - { - WDRService.ReportDoorOpConf(doorId, doorOpId, objectId); - } - } - - protected string userLang - { - get => WDCUService.currLanguage ?? "EN"; - set => WDCUService.currLanguage = value; - } - - protected bool checkIfConf() - { - bool answ = false; - if (allDoorOps != null) - { - var rawObj = JsonConvert.DeserializeObject>>(currDoorOp.JsoncActVal!); - if (rawObj != null) - { - foreach (var op in allDoorOps) - { - var opObj = JsonConvert.DeserializeObject>>(op.JsoncActVal!); - if (opObj != null) - { - - if (rawObj["template"] == opObj["template"] && op.DtConfirm != null && op.userConfirm != "") - { - answ = true; - } - } - } - } - } - return answ; - } - } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/Index.razor.cs b/WebDoorCreator.UI/Pages/Index.razor.cs index 5fa1a39..d0202e5 100644 --- a/WebDoorCreator.UI/Pages/Index.razor.cs +++ b/WebDoorCreator.UI/Pages/Index.razor.cs @@ -1,31 +1,4 @@ -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.Components.Hardware; -using WebDoorCreator.UI.Components.SvgComp; -using WebDoorCreator.UI.Components.Filters; -using WebDoorCreator.UI.Shared; -using WebDoorCreator.Data.DbModels; -using EgwCoreLib.Razor; namespace WebDoorCreator.UI.Pages { @@ -33,6 +6,7 @@ namespace WebDoorCreator.UI.Pages { [Inject] protected NavigationManager NavManager { get; set; } = null!; + protected async Task changePage(bool newPage) { await Task.Delay(1); diff --git a/WebDoorCreator.UI/Pages/Utils.razor.cs b/WebDoorCreator.UI/Pages/Utils.razor.cs index 91012e5..fd2ab64 100644 --- a/WebDoorCreator.UI/Pages/Utils.razor.cs +++ b/WebDoorCreator.UI/Pages/Utils.razor.cs @@ -1,27 +1,62 @@ using Microsoft.AspNetCore.Components; using WebDoorCreator.Data.DbModels; using WebDoorCreator.Data.Services; -using WebDoorCreator.UI.Data; namespace WebDoorCreator.UI.Pages { public partial class Utils { + protected string _keyWord { get; set; } = ""; + [Inject] + protected IConfiguration config { get; set; } = null!; + + protected WebDoorCreator.Data.DDF.Converter currDdfConv { get; set; } = null!; + protected bool done { get; set; } = false; protected List? DoorOpsList { get; set; } protected List DoorsList { get; set; } = new List(); + protected string keyWord + { + get => _keyWord; + set => _keyWord = value; + } + + protected List listOp { get; set; } = new List(); + protected List listOpAll { get; set; } = new List(); + [Inject] + protected NavigationManager NavManager { get; set; } = null!; + protected List? OrdersList { get; set; } protected List ordListVal { get; set; } = new List(); - protected List listOp { get; set; } = new List(); - protected List listOpAll { get; set; } = new List(); - [Inject] protected QueueDataService QDataServ { get; set; } = null!; [Inject] protected WebDoorCreatorService WDCService { get; set; } = null!; + + [Inject] + protected WebDoorCreatorService WDService { get; set; } = null!; + + public async Task flushCache() + { + await Task.Delay(1); + await WDService.FlushRedisCache(); + await Task.Delay(1); + // rimando a pagina corrente + NavManager.NavigateTo("/", true); + } + + public async Task FlushCustomPattern() + { + await Task.Delay(1); + await WDService.FlushCustomPattern(keyWord); + await Task.Delay(1); + // rimando a pagina corrente + NavManager.NavigateTo("/", true); + } + protected async Task doorsGetAll() { await ordersGetAll(); @@ -39,24 +74,7 @@ namespace WebDoorCreator.UI.Pages } } } - } - protected bool done { get; set; } = false; - - [Inject] - protected IConfiguration config { get; set; } = null!; - - protected override void OnInitialized() - { - base.OnInitialized(); - string vers = config.GetValue("ConfDDF:VersNumber"); - bool remDoorOp = config.GetValue("ConfDDF:RemoveDoorOps"); - var headRows = config.GetSection("ConfDDF:Header").Get>(); - var footRows = config.GetSection("ConfDDF:Footer").Get>(); - currDdfConv = new WebDoorCreator.Data.DDF.Converter(vers, remDoorOp, headRows, footRows); - } - - protected WebDoorCreator.Data.DDF.Converter currDdfConv { get; set; } = null!; /// /// Effettua salvataggio record e generazione DDF /// @@ -97,7 +115,6 @@ namespace WebDoorCreator.UI.Pages // versione corrente del DDF generato int currVers = await QDataServ.SendCalcReq(door.DoorId, currDdf); } - } } } @@ -106,44 +123,20 @@ namespace WebDoorCreator.UI.Pages done = true; } + protected override void OnInitialized() + { + base.OnInitialized(); + string vers = config.GetValue("ConfDDF:VersNumber"); + bool remDoorOp = config.GetValue("ConfDDF:RemoveDoorOps"); + var headRows = config.GetSection("ConfDDF:Header").Get>(); + var footRows = config.GetSection("ConfDDF:Footer").Get>(); + currDdfConv = new WebDoorCreator.Data.DDF.Converter(vers, remDoorOp, headRows, footRows); + } protected async Task ordersGetAll() { DateTime adesso = DateTime.Today; OrdersList = await WDCService.OrderStatusGetFilt(0, 0, adesso.AddYears(-200), adesso.AddYears(200)); } - - public async Task flushCache() - { - await Task.Delay(1); - await WDService.FlushRedisCache(); - await Task.Delay(1); - // rimando a pagina corrente - NavManager.NavigateTo("/", true); - } - - protected string _keyWord { get; set; } = ""; - protected string keyWord - { - get => _keyWord; - set => _keyWord = value; - } - - - public async Task FlushCustomPattern() - { - await Task.Delay(1); - await WDService.FlushCustomPattern(keyWord); - await Task.Delay(1); - // rimando a pagina corrente - NavManager.NavigateTo("/", true); - } - - - [Inject] - protected NavigationManager NavManager { get; set; } = null!; - - [Inject] - protected WebDoorCreatorService WDService { get; set; } = null!; } } \ No newline at end of file diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj index 448aaaf..2ae41a6 100644 --- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj +++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj @@ -3,7 +3,7 @@ net6.0 enable - 0.9.2305.2319 + 0.9.2305.2414 enable aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608