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

2023-05-11 19:59:06 +02:00
parent ae05935402 806eef6d6f
commit 2dceeda6b1
19 changed files with 453 additions and 198 deletions
@@ -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 
+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 
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis04.egalware.com/WDC/SRV/swagger/index.html</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis04.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/WDC/SRV</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAAB43BVhUmznhAu3pUfV1IfOAAAAAASAAACgAAAAEAAAAEV8hgbujDFfsMjS77NS2oYYAAAAUHPGFaVWgRqQPDU4wk5KGABmVHKko4/9FAAAANtaROBOcPHljx4RnmQHj5aHdtYk</EncryptedPassword>
+    <History>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;</History>
+    <LastFailureDetails />
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis02.egalware.com/WDC/SRV/swagger/index.html</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis02.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/WDC/SRV</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+	<PropertyGroup>
+		<WebPublishMethod>Package</WebPublishMethod>
+		<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+		<LastUsedPlatform>Any CPU</LastUsedPlatform>
+		<SiteUrlToLaunchAfterPublish />
+		<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+		<ExcludeApp_Data>false</ExcludeApp_Data>
+		<ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
+		<DesktopBuildPackageLocation>bin\publish\WDC.API.zip</DesktopBuildPackageLocation>
+		<PackageAsSingleFile>true</PackageAsSingleFile>
+		<DeployIisAppPath>Default Web Site/WDC/SRV</DeployIisAppPath>
+		<_TargetId>IISWebDeployPackage</_TargetId>
+	</PropertyGroup>
+</Project>
@@ -7,7 +7,14 @@
  </PropertyGroup>

  <ItemGroup>
+    <_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" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Properties\PublishProfiles\IIS-PROD.pubxml.user" />
  </ItemGroup>

  <ItemGroup>
@@ -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<string, List<Dictionary<string, string>>>();
                var i = 0;
@@ -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);
                    }
                }
            }
@@ -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<string> ordListVal { get; set; } = new List<string>();
        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);
@@ -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<string, List<string>> defaultDict = new Dictionary<string, List<string>>();
                List<string> listDefVal = new List<string>();
                Dictionary<string, string> actDict = new Dictionary<string, string>();
@@ -46,7 +46,7 @@ else
                </div>
                <div class="row my-1">
                    <div class="col-4 d-flex flex-wrap align-items-center">
-                        <span>Template</span>
+                        <span>@currTempOrSh</span>
                    </div>

                    @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))
                                {
@@ -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);
        }
@@ -107,18 +107,18 @@ namespace WebDoorCreator.UI.Components.SvgComp
            pathPointList = new List<PointData>();
            pathClipCloseList = new List<PointData>();
            // 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));
@@ -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,
@@ -4,6 +4,6 @@


 <div class="shadow-lg">
-    <HomeCard ObjH="900" ObjW="1920" StartPoint="820" LineWidth="18" TitleText="Web Door Creator" BodyText="The new way to create doors" ImagePath="images/HeroSecDoor.png" EC_ExeFunct="changePage" ButtonText="Go To Orders"></HomeCard>
+    <HomeCard ObjH="1080" ObjW="1920" StartPoint="850" LineWidth="18" TitleText="Web Door Creator" BodyText="The new way to create doors" ImagePath="images/HeroSecDoor.png" EC_ExeFunct="changePage" ButtonText="Go To Orders"></HomeCard>
 </div>

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis04.egalware.com/WDC/UI/</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis04.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/WDC/UI</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis02.egalware.com/WDC/UI/</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis02.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/WDC/UI</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+</Project>
@@ -13,7 +13,10 @@
  </ItemGroup>

  <ItemGroup>
+    <_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" />
  </ItemGroup>

  <ItemGroup>
@@ -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
 

 ---