diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e26d74..8ff83c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,8 +73,8 @@ WDC.Api:build: tags: - win variables: - APP_NAME: GPW.WDC.Api - SOL_NAME: GPW.CORE.WRKLOG + APP_NAME: WebDoorCreator.API + SOL_NAME: WebDoorCreator.UI before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -86,144 +86,144 @@ WDC.UI:build: tags: - win variables: - APP_NAME: GPW.WDC.UI - SOL_NAME: GPW.WDC.UI + APP_NAME: WebDoorCreator.UI + SOL_NAME: WebDoorCreator.UI before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# # ---------- STAGING ---------- -# WDC.Api:staging: -# stage: staging -# tags: -# - win -# variables: -# APP_NAME: GPW.WDC.Api -# SOL_NAME: GPW.CORE.WRKLOG -# only: -# - develop -# needs: ["WDC.Api:build"] -# before_script: -# - *nuget-fix -# - dotnet restore "$env:SOL_NAME.sln" -# script: -# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj +# ---------- STAGING ---------- +WDC.Api:staging: + stage: staging + tags: + - win + variables: + APP_NAME: WebDoorCreator.API + SOL_NAME: WebDoorCreator.UI + only: + - develop + needs: ["WDC.Api:build"] + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -# WDC.UI:staging: -# stage: staging -# tags: -# - win -# environment: -# name: staging -# url: https://iis01.egalware.com/GPW/WDC.UI -# variables: -# APP_NAME: GPW.WDC.UI -# SOL_NAME: GPW.WDC.UI -# only: -# - develop -# needs: ["WDC.UI:build"] -# before_script: -# - *nuget-fix -# - dotnet restore "$env:SOL_NAME.sln" -# script: -# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj +WDC.UI:staging: + stage: staging + tags: + - win + environment: + name: staging + url: https://iis01.egalware.com/GPW/WDC.UI + variables: + APP_NAME: WebDoorCreator.UI + SOL_NAME: WebDoorCreator.UI + only: + - develop + needs: ["WDC.UI:build"] + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -# # ---------- DEPLOY ---------- -# WDC.Api:deploy: -# stage: deploy -# tags: -# - win -# environment: -# name: production -# url: https://seriate.egalware.com/GPW/WDC.UI -# variables: -# APP_NAME: GPW.WDC.Api -# SOL_NAME: GPW.CORE.WRKLOG -# only: -# - main -# needs: ["WDC.Api:build"] -# before_script: -# - *nuget-fix -# - dotnet restore "$env:SOL_NAME.sln" -# script: -# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# # # IIS 02 -# # - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -# # IIS PROD -# - dotnet publish -p:PublishProfile=IIS-PROD.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj +# ---------- DEPLOY ---------- +WDC.Api:deploy: + stage: deploy + tags: + - win + environment: + name: production + url: https://seriate.egalware.com/GPW/WDC.UI + variables: + APP_NAME: WebDoorCreator.API + SOL_NAME: WebDoorCreator.UI + only: + - main + needs: ["WDC.Api:build"] + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + # IIS 02 + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # IIS PROD + - dotnet publish -p:PublishProfile=IIS-PROD.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -# WDC.UI:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: GPW.WDC.UI -# SOL_NAME: GPW.WDC.UI -# only: -# - main -# needs: ["WDC.UI:build"] -# before_script: -# - *nuget-fix -# - dotnet restore "$env:SOL_NAME.sln" -# script: -# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# # IIS EXT -# - dotnet publish -p:PublishProfile=IIS-EXT.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -# # IIS INT -# - dotnet publish -p:PublishProfile=IIS-INT.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj +WDC.UI:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebDoorCreator.UI + SOL_NAME: WebDoorCreator.UI + only: + - main + needs: ["WDC.UI:build"] + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + # IIS EXT + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # IIS INT + - dotnet publish -p:PublishProfile=IIS-PROD.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -# # ---------- RELEASE ---------- -# WDC.Api:release: -# stage: release -# tags: -# - win -# variables: -# APP_NAME: GPW.WDC.Api -# SOL_NAME: GPW.CORE.WRKLOG -# only: -# - main -# except: -# - branches -# needs: ["WDC.Api:build"] -# before_script: -# - *nuget-fix -# - dotnet restore "$env:SOL_NAME.sln" -# artifacts: -# paths: -# - publish/ -# script: -# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet -# # qui il deploy su nexus... -# - *hashBuild -# - *nexusUpload -# # script: -# # - dotnet publish -c Release -o ./publish GPW.WDC.Api/GPW.WDC.Api.csproj +# ---------- RELEASE ---------- +WDC.Api:release: + stage: release + tags: + - win + variables: + APP_NAME: WebDoorCreator.API + SOL_NAME: WebDoorCreator.UI + only: + - main + except: + - branches + needs: ["WDC.Api:build"] + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + artifacts: + paths: + - publish/ + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + # script: + # - dotnet publish -c Release -o ./publish GPW.WDC.Api/GPW.WDC.Api.csproj -# WDC.UI:release: -# stage: release -# tags: -# - win -# variables: -# APP_NAME: GPW.WDC.UI -# SOL_NAME: GPW.WDC.UI -# only: -# - main -# except: -# - branches -# needs: ["WDC.UI:build"] -# artifacts: -# paths: -# - publish/ -# script: -# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -# - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet -# # qui il deploy su nexus... -# - *hashBuild -# - *nexusUpload -# # script: -# # - dotnet publish -c Release -o ./publish GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj \ No newline at end of file +WDC.UI:release: + stage: release + tags: + - win + variables: + APP_NAME: WebDoorCreator.UI + SOL_NAME: WebDoorCreator.UI + only: + - main + except: + - branches + needs: ["WDC.UI:build"] + artifacts: + paths: + - publish/ + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + # script: + # - dotnet publish -c Release -o ./publish GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj \ No newline at end of file diff --git a/WebDoorCreator.API/Properties/PublishProfiles/IIS-PROD.pubxml b/WebDoorCreator.API/Properties/PublishProfiles/IIS-PROD.pubxml new file mode 100644 index 0000000..8a9f0e5 --- /dev/null +++ b/WebDoorCreator.API/Properties/PublishProfiles/IIS-PROD.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis04.egalware.com/WDC/SRV/swagger/index.html + false + c2109e71-4eae-4167-9052-175123ccc2bc + false + https://iis04.egalware.com:8172/MsDeploy.axd + Default Web Site/WDC/SRV + + false + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + net6.0 + + \ No newline at end of file diff --git a/WebDoorCreator.API/Properties/PublishProfiles/IIS-PROD.pubxml.user b/WebDoorCreator.API/Properties/PublishProfiles/IIS-PROD.pubxml.user new file mode 100644 index 0000000..0173043 --- /dev/null +++ b/WebDoorCreator.API/Properties/PublishProfiles/IIS-PROD.pubxml.user @@ -0,0 +1,13 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAAB43BVhUmznhAu3pUfV1IfOAAAAAASAAACgAAAAEAAAAEV8hgbujDFfsMjS77NS2oYYAAAAUHPGFaVWgRqQPDU4wk5KGABmVHKko4/9FAAAANtaROBOcPHljx4RnmQHj5aHdtYk + True|2023-05-11T15:35:09.5858697Z;True|2022-01-27T10:34:09.2346456+01:00;True|2022-01-27T10:13:36.3080675+01:00;True|2022-01-27T10:05:45.6649507+01:00;True|2022-01-26T14:34:16.5263189+01:00;True|2022-01-26T13:04:22.2336648+01:00;False|2022-01-26T13:04:06.0677616+01:00;True|2021-11-08T09:03:37.7855257+01:00;True|2021-11-08T09:03:34.8263479+01:00;True|2021-11-08T09:03:31.8889390+01:00;True|2021-10-29T16:19:33.6539408+02:00;True|2021-10-29T16:19:28.2082360+02:00;True|2021-10-26T16:12:11.7740950+02:00;True|2021-10-26T16:11:56.2014641+02:00;True|2021-10-26T16:11:22.2897842+02:00;False|2021-10-26T16:10:58.3733037+02:00;False|2021-10-26T16:10:29.4793991+02:00;True|2021-10-21T17:35:11.9761128+02:00;True|2021-10-18T20:22:00.9305399+02:00;True|2021-10-18T18:32:29.4558070+02:00;True|2021-10-18T18:32:22.8950294+02:00;True|2021-10-18T18:16:13.7563877+02:00;True|2021-10-18T18:15:48.5678387+02:00;True|2021-10-18T12:45:45.7228681+02:00;True|2021-10-18T12:14:22.3221605+02:00;True|2021-10-18T12:14:15.7373530+02:00;True|2021-10-18T12:10:43.8607301+02:00; + + + \ No newline at end of file diff --git a/WebDoorCreator.API/Properties/PublishProfiles/IIS02.pubxml b/WebDoorCreator.API/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 0000000..6ef3826 --- /dev/null +++ b/WebDoorCreator.API/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis02.egalware.com/WDC/SRV/swagger/index.html + false + c2109e71-4eae-4167-9052-175123ccc2bc + false + https://iis02.egalware.com:8172/MsDeploy.axd + Default Web Site/WDC/SRV + + false + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + net6.0 + + \ No newline at end of file diff --git a/WebDoorCreator.API/Properties/PublishProfiles/IISProfile.pubxml b/WebDoorCreator.API/Properties/PublishProfiles/IISProfile.pubxml new file mode 100644 index 0000000..7c9343f --- /dev/null +++ b/WebDoorCreator.API/Properties/PublishProfiles/IISProfile.pubxml @@ -0,0 +1,19 @@ + + + + + Package + Release + Any CPU + + true + false + c2109e71-4eae-4167-9052-175123ccc2bc + bin\publish\WDC.API.zip + true + Default Web Site/WDC/SRV + <_TargetId>IISWebDeployPackage + + \ No newline at end of file diff --git a/WebDoorCreator.API/WebDoorCreator.API.csproj b/WebDoorCreator.API/WebDoorCreator.API.csproj index 3a61c6f..0f32449 100644 --- a/WebDoorCreator.API/WebDoorCreator.API.csproj +++ b/WebDoorCreator.API/WebDoorCreator.API.csproj @@ -7,7 +7,14 @@ + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS-PROD.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" /> + + + + diff --git a/WebDoorCreator.Data/DDF/Converter.cs b/WebDoorCreator.Data/DDF/Converter.cs index bc1e907..e1f1e3a 100644 --- a/WebDoorCreator.Data/DDF/Converter.cs +++ b/WebDoorCreator.Data/DDF/Converter.cs @@ -45,6 +45,7 @@ namespace WebDoorCreator.Data.DDF PropertiesDto CurrentProperties = new PropertiesDto(); FinishingDto CurrentFinishing = new FinishingDto(); DDFDto CurrentConf = new DDFDto(); + ListValuesModel CurrentCompoOrder = new ListValuesModel(); // per prima cosa popolo gli oggetti di appoggio... dictDoorOP = new Dictionary>>(); var i = 0; diff --git a/WebDoorCreator.Data/Services/QueueDataService.cs b/WebDoorCreator.Data/Services/QueueDataService.cs index bc1c2ed..f1b214f 100644 --- a/WebDoorCreator.Data/Services/QueueDataService.cs +++ b/WebDoorCreator.Data/Services/QueueDataService.cs @@ -427,6 +427,9 @@ namespace WebDoorCreator.Data.Services // invio il FINTO messaggio di ritorno... string retMess = $"{sDoorId}:{sCurrVers}"; CalcDonePipe.saveAndSendMessage(Constants.LAST_CALC_DONE_KEY, retMess); + // sposto tra le 2 code + await RequestProcessingRemove(sDoorId); + await RequestDoneUpsert(sDoorId, sCurrVers); } } } diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs index 10decd7..85cf504 100644 --- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs +++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs @@ -64,6 +64,7 @@ namespace WebDoorCreator.UI.Components.Buttons } protected DDFDto CurrentConf { get; set; } = new DDFDto(); protected DoorOpsDTO CurrentDoorOp { get; set; } = new DoorOpsDTO(); + protected List ordListVal { get; set; } = new List(); public async Task SaveYaml(string ddfContent) { await Task.Delay(1); @@ -113,6 +114,17 @@ namespace WebDoorCreator.UI.Components.Buttons { // chiamo metodo x avewre DDF serializzato //var list2Ord = ; + var CurrentCompoOrder = await WDCService.ListValuesGetAll("*", "Hardware"); + if (CurrentCompoOrder != null) + { + foreach (var item in CurrentCompoOrder.OrderBy(x => x.Ordinal).ToList()) + { + ordListVal.Add(item.TableName); + } + } + + listOp = listOp.OrderBy(d => ordListVal.IndexOf(d.ObjectId)).ToList(); + string currDdf = currDdfConv.GetSerialized(listOp); // FIXME TODO: si potrebbe eliminare in futuro che va su REDIS await SaveYaml(currDdf); diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs index a2c1974..8cb9407 100644 --- a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs @@ -58,6 +58,10 @@ namespace WebDoorCreator.UI.Components.Hardware { var listRecordFolder = await WDService.ListValuesGetAll(HwToShow.TableName, "Folder"); var listRecordTmp = await WDService.ListValuesGetAll(HwToShow.TableName, "template"); + if (listRecordTmp!.Count == 0) + { + listRecordTmp = await WDService.ListValuesGetAll(HwToShow.TableName, "shape"); + } Dictionary> defaultDict = new Dictionary>(); List listDefVal = new List(); Dictionary actDict = new Dictionary(); diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor index 6259700..d0df140 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor @@ -46,7 +46,7 @@ else
- Template + @currTempOrSh
@if (listValuesFiles != null && listValuesFiles.Count > 0 && !string.IsNullOrEmpty(templateName)) @@ -77,7 +77,7 @@ else @foreach (var item in currVal) { - @if (item.Key != "Folder" && item.Key != "template") + @if (item.Key != "Folder" && item.Key != "template" && item.Key != "shape") { @if (isCombo(item.Key)) { diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs index c717362..b9f545d 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs @@ -28,7 +28,7 @@ namespace WebDoorCreator.UI.Components.Hardware public string Lingua { get; set; } = "EN"; [CascadingParameter] - public string userId { get; set; } = ""; + public string userId { get; set; } = ""; #endregion Public Properties @@ -88,27 +88,65 @@ namespace WebDoorCreator.UI.Components.Hardware protected string templateName { - get => currVal != null ? tryGetCurrVal("template") : ""; - set + /*currVal != null ? tryGetCurrVal("template") : tryGetCurrVal("shape");*/ + get { - if (currVal["template"] != value) + string answ = ""; + if (currVal != null) { - currVal["template"] = value; - DoorOpInst.userConfirm = ""; - DoorOpInst.DtConfirm = null; - if (!string.IsNullOrEmpty(value)) + if (currVal[currTempOrSh] != null) { - var pUpd = Task.Run(async () => - { - // aggiorno direttamente i graphics parameters... - var newData = await WDCService.DoorOpGetUpdatedVals(DoorOpInst.ObjectId, currVal, graphicParams); - currVal = newData.Item1; - graphicParams = newData.Item2; - await SetSelectedData(); - await E_recordUpdate.InvokeAsync(DoorOpInst); - }); + answ = tryGetCurrVal(currTempOrSh); } } + return answ; + } + set + { + if (currVal[currTempOrSh] != null) + { + if (currVal[currTempOrSh] != value) + { + currVal[currTempOrSh] = value; + DoorOpInst.userConfirm = ""; + DoorOpInst.DtConfirm = null; + if (!string.IsNullOrEmpty(value)) + { + var pUpd = Task.Run(async () => + { + // aggiorno direttamente i graphics parameters... + var newData = await WDCService.DoorOpGetUpdatedVals(DoorOpInst.ObjectId, currVal, graphicParams); + currVal = newData.Item1; + graphicParams = newData.Item2; + await SetSelectedData(); + await E_recordUpdate.InvokeAsync(DoorOpInst); + }); + } + } + } +#if false + else if (currVal["shape"] != null) + { + if (currVal["shape"] != value) + { + currVal["shape"] = value; + DoorOpInst.userConfirm = ""; + DoorOpInst.DtConfirm = null; + if (!string.IsNullOrEmpty(value)) + { + var pUpd = Task.Run(async () => + { + // aggiorno direttamente i graphics parameters... + var newData = await WDCService.DoorOpGetUpdatedVals(DoorOpInst.ObjectId, currVal, graphicParams); + currVal = newData.Item1; + graphicParams = newData.Item2; + await SetSelectedData(); + await E_recordUpdate.InvokeAsync(DoorOpInst); + }); + } + } + } +#endif } } @@ -250,11 +288,12 @@ namespace WebDoorCreator.UI.Components.Hardware await SetSelectedData(); } + protected string currTempOrSh { get; set; } = ""; + private async Task SetSelectedData() { isLoading = true; await Task.Delay(1); - // fix folder listValuesFiles = null; var tempListVal = await WDCService.ListValuesGetAll(HwCode, "Folder"); @@ -271,19 +310,32 @@ namespace WebDoorCreator.UI.Components.Hardware } // fix template - var tempListFiles = await WDCService.ListValuesGetAll(HwCode, "template"); + var tempListFilesTempl = await WDCService.ListValuesGetAll(HwCode, "template"); - if (tempListFiles != null) + var tempListFilesSh = await WDCService.ListValuesGetAll(HwCode, "shape"); + + if (tempListFilesTempl!.Count != 0) { - listValuesFiles = tempListFiles.Where(x => x.Value.Contains(folderName)).ToList(); + listValuesFiles = tempListFilesTempl.Where(x => x.Value.Contains(folderName)).ToList(); } - if (string.IsNullOrEmpty(templateName)) + else if (tempListFilesSh!.Count != 0) { + listValuesFiles = tempListFilesSh!.Where(x => x.Value.Contains(folderName)).ToList(); + } + try + { + if (listValuesFiles != null && listValuesFiles.Count > 0) { - templateName = listValuesFiles.FirstOrDefault()?.Label!; + currTempOrSh = listValuesFiles.FirstOrDefault()?.FieldName!; + if (string.IsNullOrEmpty(templateName)) + { + templateName = listValuesFiles.FirstOrDefault()?.Label!; + } } } + catch (Exception ex) + { } isLoading = false; await InvokeAsync(StateHasChanged); } diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs index 3e07d2e..9b3c1b2 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs @@ -107,18 +107,18 @@ namespace WebDoorCreator.UI.Components.SvgComp pathPointList = new List(); pathClipCloseList = new List(); // calcolo i dati necessari a disegnare - int deltaX = (ObjW / 2 - StartPoint) / 6; + int deltaX = (ObjW / 2 - StartPoint); int deltaY = ObjH / 3; // inizio aggiungendo punti parametrici - pathPointList.Add(new PointData(StartPoint, ObjH)); - pathPointList.Add(new PointData(StartPoint - deltaX, ObjH - (deltaY / 2))); - pathPointList.Add(new PointData(StartPoint + deltaX, ObjH - deltaY)); - pathPointList.Add(new PointData((ObjW / 2) - deltaX * 3, (ObjH / 2) + deltaY / 8)); + pathPointList.Add(new PointData(StartPoint, ObjH + 5)); + pathPointList.Add(new PointData((int)(StartPoint - deltaX * 0.19), ObjH - (deltaY / 2))); + pathPointList.Add(new PointData((int)(StartPoint + deltaX * 0.26), ObjH - deltaY)); + pathPointList.Add(new PointData((int)(ObjW / 2 - deltaX * 0.48 ), (int)((ObjH / 2) + deltaY * 0.216))); pathPointList.Add(new PointData(ObjW / 2, ObjH / 2)); - pathPointList.Add(new PointData((ObjW / 2) + deltaX * 3, (ObjH / 2) - deltaY / 8)); - pathPointList.Add(new PointData(ObjW - (StartPoint + deltaX), deltaY)); - pathPointList.Add(new PointData(ObjW - (StartPoint - deltaX), (deltaY / 2))); - pathPointList.Add(new PointData(ObjW - StartPoint, 0)); + pathPointList.Add(new PointData((int)(ObjW / 2 + deltaX * 0.48 ), (int)((ObjH / 2) - deltaY * 0.216))); + pathPointList.Add(new PointData((int)(ObjW - (StartPoint + deltaX * 0.26)), deltaY)); + pathPointList.Add(new PointData((int)(ObjW - (StartPoint - deltaX * 0.19)), (deltaY / 2))); + pathPointList.Add(new PointData(ObjW - StartPoint, - 5)); // ora provvedo x la parte clip pathClipCloseList.Add(new PointData(ObjW - StartPoint, 0)); pathClipCloseList.Add(new PointData(ObjW, 0)); diff --git a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs index 8fe8575..69e27ef 100644 --- a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs +++ b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs @@ -906,7 +906,7 @@ namespace WebDoorCreator.UI.Data { // cerco il setup del template selezionato var listRecordTmp = await ListValuesGetAll(currDoorOp.ObjectId, "template"); - if (listRecordTmp != null && actDict.ContainsKey("Folder") && actDict.ContainsKey("template")) + if (listRecordTmp != null && actDict.ContainsKey("Folder") && (actDict.ContainsKey("template") || actDict.ContainsKey("shape")) ) { string actKey = actDict["template"];// Path.Combine(actDict["Folder"], actDict["template"]); var firstTemplate = listRecordTmp.Where(x => x.Value == actKey).FirstOrDefault(); @@ -1188,6 +1188,7 @@ namespace WebDoorCreator.UI.Data foreach (string dir in dirs) { string compoCode = ""; + string compoTempOrShape = ""; string[] templateDirectories = Directory.GetDirectories(dir); string[] iniFiles = Directory.GetFiles(dir, "Config.ini"); @@ -1204,7 +1205,9 @@ namespace WebDoorCreator.UI.Data IniFile fIni = new IniFile(file); var compoName = fIni.ReadString("Compo", "Name", "COMPONAME"); + var compoT = fIni.ReadString("Template", "Name", "TEMPSHAPE"); compoCode = compoName.Split("/")[0].Trim(); + compoTempOrShape = compoT.Split("/")[0].Trim(); } string[] templateFiles = Directory.GetFiles(templateDirectory); if (templateFiles.Length > 0) @@ -1255,7 +1258,7 @@ namespace WebDoorCreator.UI.Data ListValuesTempModel temp = new ListValuesTempModel() { TableName = $"{compoCode}".Replace(" ", "_"), - FieldName = "template", + FieldName = compoTempOrShape, Value = @$"{tName[tName.Length - 1]}\{fileName}", Label = fileName, Ordinal = ordin, diff --git a/WebDoorCreator.UI/Pages/Index.razor b/WebDoorCreator.UI/Pages/Index.razor index a393302..007e9b1 100644 --- a/WebDoorCreator.UI/Pages/Index.razor +++ b/WebDoorCreator.UI/Pages/Index.razor @@ -4,6 +4,6 @@
- +
diff --git a/WebDoorCreator.UI/Properties/PublishProfiles/IIS-PROD.pubxml b/WebDoorCreator.UI/Properties/PublishProfiles/IIS-PROD.pubxml new file mode 100644 index 0000000..fb2b7cc --- /dev/null +++ b/WebDoorCreator.UI/Properties/PublishProfiles/IIS-PROD.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis04.egalware.com/WDC/UI/ + false + c2109e71-4eae-4167-9052-175123ccc2bc + false + https://iis04.egalware.com:8172/MsDeploy.axd + Default Web Site/WDC/UI + + false + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + net6.0 + + \ No newline at end of file diff --git a/WebDoorCreator.UI/Properties/PublishProfiles/IIS02.pubxml b/WebDoorCreator.UI/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 0000000..b77615e --- /dev/null +++ b/WebDoorCreator.UI/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis02.egalware.com/WDC/UI/ + false + c2109e71-4eae-4167-9052-175123ccc2bc + false + https://iis02.egalware.com:8172/MsDeploy.axd + Default Web Site/WDC/UI + + false + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + net6.0 + + \ No newline at end of file diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj index 6ff3724..644fabd 100644 --- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj +++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj @@ -13,7 +13,10 @@ + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS-PROD.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" /> diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index c01dd34..ee57649 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -14,20 +14,13 @@ order: line: date: 2023-11-05T00:00:00.0000000 piece: DO_1 -size: {} -swing: {} -properties: Pine -finishing: Varnishing size: width: 33.8125 height: 81.25 thickness: 1.75 -swing: RH +swing: LH secure: UP material: wood -profiles: {} -hardware: {} - profiles: lockedge: type: SQ @@ -46,17 +39,37 @@ profiles: machining: ON overmaterial: 0.1 hardware: - flush_pulls: - - template: Generic\Circle - position: 35 - back_set: 5 - depth: 1 - face: secure - - template: Generic\Circle - position: 35 - back_set: 5 - depth: 1 - face: secure + vision_cut_outs: + - shape: Generic\Circle + radius: 10 + center_from_top: 20 + center_from_lock: 0 + door_center: center + + louver_cut_outs: + - shape: Generic\Cuore2.nge + length: 10.0000 + width: 18.8125 + bottom_rail: 8.0 + lock_stile: 0.0 + door_center: center + + mail_slots: + - template: Generic\Rect + height: 3 + bottom_rail: 20 + delta_center: 5 + + hinges: + - template: Generic Conceiled\StdConHingeDeepR + ToptoCL: 4.875 + back_set: 0.125 + thickness: 0.25 + + ept: + - template: Generic\StdEPT + ToptoCL: 15 + FacetoCL: 0.875 locks: - template: Generic\DocMyTest5Bore.nge @@ -65,19 +78,36 @@ hardware: offset_WS: 0.0 side: lock_top - hinges: - - template: Generic Conceiled\StdConHingeDeepR - ToptoCL: 4.875 - back_set: 0.125 - thickness: 0.25 + edge_pulls: + - template: Generic\EdgePull230B + position: 45 + offset_WS: 0.0 - groove: - - template: Generic\Groove - type: side + pivot: + - template: Generic\CenterHungPivot + type: centerhung + side: top + radius: 0 + position: 2 + back_set: 0.25 + depth: 0.125 + offset_WS: 0.0 + + stops_and_closers: + - template: Generic\OHCloserArm_103_1_90 + position: 0.000 + + strikes: + - template: Generic\StdFaceStrike + position: 57.875 + back_set: 2.75 + offset_WS: 0.0 + + rabbet: + - template: Generic\Rabbet + side: top width: 0.6 depth: 0.8 - offset_WS: 0 - side: bottom ---