diff --git a/Jenkinsfile b/Jenkinsfile index 39342e90..d8d6b985 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1346']) { + withEnv(['NEXT_BUILD_NUMBER=1347']) { // env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' @@ -87,9 +87,9 @@ pipeline { if(env.enableIIS02 == "Y") { // ADM - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj" + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj" // IO - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj" + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj" // SITE bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj" // } @@ -115,9 +115,9 @@ pipeline { if(env.enableIIS01 == "Y") { // ADM - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj" + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj" // IO - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj" + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj" // SITE bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj" // } diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 391097c4..e85dec40 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - Release|Any CPU + Debug|Any CPU MvcControllerEmptyScaffolder root/Common/MVC/Controller 600 diff --git a/MP-IO/Web-Sql2012.config b/MP-IO/Web-Sql2012.config index c5413a8a..a95efb22 100644 --- a/MP-IO/Web-Sql2012.config +++ b/MP-IO/Web-Sql2012.config @@ -6,30 +6,30 @@ - + - - - - + + + + - + - - - + + + - - - - - + + + + + - + - - + + - - - - + + + + - - + + - - + + - - + + diff --git a/MP-IO/Web-Sql2016.config b/MP-IO/Web-Sql2016.config index 2c8ce8f1..30328b3f 100644 --- a/MP-IO/Web-Sql2016.config +++ b/MP-IO/Web-Sql2016.config @@ -6,31 +6,31 @@ - + - - - - + + + + - + - - - + + + - - - - - + + + + + - + - - + + - - - - + + + + - - + + - - + + - - + + diff --git a/MP-IO/Web.OVH-demo.config b/MP-IO/Web.OVH-demo.config index ff5d6d47..331aeaa7 100644 --- a/MP-IO/Web.OVH-demo.config +++ b/MP-IO/Web.OVH-demo.config @@ -4,16 +4,16 @@ - - - - - - + + + + + + - - + + diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 91b69945..db0591d8 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -37,9 +37,9 @@ - + - + @@ -142,7 +142,7 @@ - + diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index 3bf3694e..8765882c 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,7 +19,7 @@ - Release|Any CPU + Debug|Any CPU ApiControllerWithActionsScaffolder root/Controller diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index 3679bec0..c2cb7f33 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles IIS02 diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 21bfd866..3367e5cf 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -33,7 +33,7 @@ - + diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index eefe0e0c..be64d8e4 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -507,7 +507,6 @@ - @@ -684,8 +683,6 @@ - - diff --git a/MP-TAB/SheetTech.aspx.cs b/MP-TAB/SheetTech.aspx.cs index 7a5c2547..953418c1 100644 --- a/MP-TAB/SheetTech.aspx.cs +++ b/MP-TAB/SheetTech.aspx.cs @@ -15,7 +15,7 @@ namespace MoonProTablet private void checkModuleEnabled() { - cmp_sheetTech.Visible = enableSchedaTecnica; + cmp_sheetTech.Visible = enableSchedaTecnica && (idxODL > 0); cmp_disabled.Visible = !enableSchedaTecnica; } diff --git a/MP-TAB/Web-SQL2012.config b/MP-TAB/Web-SQL2012.config index 0159437e..ae8931f3 100644 --- a/MP-TAB/Web-SQL2012.config +++ b/MP-TAB/Web-SQL2012.config @@ -120,9 +120,9 @@ - + - + diff --git a/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs b/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs index 4c0aa9e8..55240f95 100644 --- a/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs @@ -20,8 +20,14 @@ namespace MoonProTablet.WebUserControls } set { - hfCodArticolo.Value = value.Trim(); - cmp_ST_objCheck.CodArticolo = value.Trim(); + string newVal = value.Trim(); + hfCodArticolo.Value = newVal; + cmp_ST_objCheck.CodArticolo = newVal; + // se ho articolo FIX DISPLAY! + if (!string.IsNullOrEmpty(newVal)) + { + repGroup.DataBind(); + } } } @@ -36,23 +42,27 @@ namespace MoonProTablet.WebUserControls { // condizioni booleane bool inAttr = false; - // controllo se la macchina è in attrezzaggio... - DS_applicazione.StatoMacchineRow rigaStato = null; - try + // SOLO SE ho articolo sennò niente reset... + if (!string.IsNullOrEmpty(CodArticolo)) { - // se è multi controllo parent... - if (isMulti) + // controllo se la macchina è in attrezzaggio... + DS_applicazione.StatoMacchineRow rigaStato = null; + try { - rigaStato = selData.mng.rigaStato(idxMaccParent); + // se è multi controllo parent... + if (isMulti) + { + rigaStato = selData.mng.rigaStato(idxMaccParent); + } + else + { + rigaStato = selData.mng.rigaStato(idxMacchinaFix); + } + inAttr = (rigaStato.IdxStato == 2); } - else - { - rigaStato = selData.mng.rigaStato(idxMacchinaFix); - } - inAttr = (rigaStato.IdxStato == 2); + catch + { } } - catch - { } lbtClearOdl.Visible = inAttr; } diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index 85a0631b..a19d6eec 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -857,8 +857,8 @@ namespace MoonProTablet.WebUserControls } // resetto ODL su redis... DataLayerObj.emptyCurrODL(idxMacchinaFix); - // imposto odl a zero... - idxOdl = 0; + // reset ODL!... + idxOdl = -1; // aggiorno visualizzazione checkAll(); // sollevo evento! @@ -1038,14 +1038,14 @@ namespace MoonProTablet.WebUserControls { TCRichAttr = TCAssegnato(idxODLSel); } - int idxODL = 0; + int idxODLTemp = 0; if (enableSplitODL) { // splitto VECCHIO ODL (se è rimasto qualcosa da produrre e se ce ne è rimasto uno.......) try { - idxODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL; - DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false, 0); + idxODLTemp = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL; + DataLayerObj.taODL.splitODL(idxODLTemp, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODLTemp), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODLTemp, TCAssegnato(idxODLTemp)), false, 0); // se è multi processo ANCHE x altra tavola... if (isMulti) { @@ -1152,7 +1152,7 @@ namespace MoonProTablet.WebUserControls // imposto ODL su redis... DataLayerObj.saveCurrODL(idxMacchinaFix, idxODL_curr.ToString()); // salvo odl selezionato - idxODL = idxODL_curr; + idxOdl = idxODL_curr; } else { diff --git a/MP-TAB/libzstd.dll b/MP-TAB/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-TAB/libzstd.dll and /dev/null differ diff --git a/MP-TAB/snappy32.dll b/MP-TAB/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-TAB/snappy32.dll and /dev/null differ diff --git a/MP-TAB/snappy64.dll b/MP-TAB/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-TAB/snappy64.dll and /dev/null differ diff --git a/WebConfigSetter/CONF/ColCom.json b/WebConfigSetter/CONF/ColCom.json index 59842259..54945105 100644 --- a/WebConfigSetter/CONF/ColCom.json +++ b/WebConfigSetter/CONF/ColCom.json @@ -5,9 +5,9 @@ "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "UtenteCdcConnectionString": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesConnectionString": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=ColCom_MoonPro_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" diff --git a/WebConfigSetter/CONF/Donati.json b/WebConfigSetter/CONF/Donati.json deleted file mode 100644 index 9b9d386a..00000000 --- a/WebConfigSetter/CONF/Donati.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "appSettRules": { - "DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "UtenteCdcConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" - }, - "connStrRules": { - "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MapoDb.Properties.Settings.MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MapoDb.Properties.Settings.MoonPro_IS_ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MapoDb.Properties.Settings.C_TRACKConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_C_TRACK_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MapoDb.Properties.Settings.MoonPro_ES3ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16", - "ErrorLog": "Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "MoonProEntities": "metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=\"data source=SQL2016PROD;initial Catalog=Donati_MoonPro_Prod;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework\"", - "SteamWare.Properties.Settings.DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" - } -} \ No newline at end of file diff --git a/WebConfigSetter/CONF/DonatiBasi.json b/WebConfigSetter/CONF/DonatiBasi.json new file mode 100644 index 00000000..005b6572 --- /dev/null +++ b/WebConfigSetter/CONF/DonatiBasi.json @@ -0,0 +1,25 @@ +{ + "appSettRules": { + "DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" + }, + "connStrRules": { + "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.MoonPro_IS_ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.C_TRACKConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_C_TRACK_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.MoonPro_ES3ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16", + "ErrorLog": "Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProEntities": "metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=\"data source=SQL2016PROD;initial Catalog=Donati_MoonProBASI_Prod;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework\"", + "SteamWare.Properties.Settings.DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProBASI_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" + } +} \ No newline at end of file diff --git a/WebConfigSetter/CONF/DonatiLav.json b/WebConfigSetter/CONF/DonatiLav.json new file mode 100644 index 00000000..aa70505f --- /dev/null +++ b/WebConfigSetter/CONF/DonatiLav.json @@ -0,0 +1,25 @@ +{ + "appSettRules": { + "DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" + }, + "connStrRules": { + "MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.MoonProConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.MoonPro_IS_ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.C_TRACKConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_C_TRACK_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MapoDb.Properties.Settings.MoonPro_ES3ConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16", + "ErrorLog": "Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "MoonProEntities": "metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=\"data source=SQL2016PROD;initial Catalog=Donati_MoonProLAV_Prod;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework\"", + "SteamWare.Properties.Settings.DbConfConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Donati_MoonProLAV_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" + } +} \ No newline at end of file diff --git a/WebConfigSetter/CONF/EdilChim.json b/WebConfigSetter/CONF/EdilChim.json index 55319f84..addad5e9 100644 --- a/WebConfigSetter/CONF/EdilChim.json +++ b/WebConfigSetter/CONF/EdilChim.json @@ -5,9 +5,9 @@ "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "UtenteCdcConnectionString": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesConnectionString": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=EdilChim_MoonPro_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" diff --git a/WebConfigSetter/CONF/LVF.json b/WebConfigSetter/CONF/LVF.json index 66724986..eacef530 100644 --- a/WebConfigSetter/CONF/LVF.json +++ b/WebConfigSetter/CONF/LVF.json @@ -5,9 +5,9 @@ "MoonProConnectionStringIS": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringES3": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_ES3_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "PermessiConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "UtenteCdcConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "VocabolarioConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "DevicesAuthConnectionString": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringArca": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_IS_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringMAG": "Data Source=SQL2016PROD;Initial Catalog=Lvf_MoonPro_MAG_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" diff --git a/WebConfigSetter/CONF/Steamware.json b/WebConfigSetter/CONF/Steamware.json index 1034fd20..68cb2284 100644 --- a/WebConfigSetter/CONF/Steamware.json +++ b/WebConfigSetter/CONF/Steamware.json @@ -5,9 +5,9 @@ "MoonProConnectionStringIS": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Jetco;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringES3": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "PermessiConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "VocabolarioConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "DevicesAuthConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringArca": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringMAG": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16;" diff --git a/WebConfigSetter/CONF/default.json b/WebConfigSetter/CONF/default.json index 5dcb2da4..68cb2284 100644 --- a/WebConfigSetter/CONF/default.json +++ b/WebConfigSetter/CONF/default.json @@ -7,7 +7,7 @@ "PermessiConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "UtenteCdcConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "VocabolarioConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", - "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", + "DevicesConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "DevicesAuthConnectionString": "Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringArca": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16;", "MoonProConnectionStringMAG": "Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16;" diff --git a/WebConfigSetter/Program.cs b/WebConfigSetter/Program.cs index f56464d3..f7557983 100644 --- a/WebConfigSetter/Program.cs +++ b/WebConfigSetter/Program.cs @@ -20,12 +20,17 @@ namespace WebConfigSetter #region Protected Properties - protected static string baseDir { get; set; } = $"{Environment.CurrentDirectory}"; + protected static string baseDir { get; set; } = @"c:\Steamware\WebConfigSetter"; +#if DEBUG protected static string baseWebAppDir { get; set; } = @"\\iis02\c$\inetpub\wwwroot\MP\"; - protected static string confDir { get; set; } = $"{baseDir}\\CONF"; +#else + protected static string baseWebAppDir { get; set; } = @"c:\inetpub\wwwroot\MP\"; - protected static string currentSetFile { get; set; } = $"{confDir}\\default.json"; - protected static string globalConfFile { get; set; } = $"{confDir}\\settings.json"; +#endif + protected static string confDir { get; set; } = $@"{baseDir}\CONF"; + + protected static string currentSetFile { get; set; } = $@"{confDir}\default.json"; + protected static string globalConfFile { get; set; } = $@"{confDir}\settings.json"; /// /// modalità scrittura (altrimenti legge e carica conf parsando i files) diff --git a/WebConfigSetter/WebConfigSetter.csproj b/WebConfigSetter/WebConfigSetter.csproj index bdfc01c1..76fe124b 100644 --- a/WebConfigSetter/WebConfigSetter.csproj +++ b/WebConfigSetter/WebConfigSetter.csproj @@ -17,6 +17,7 @@ + @@ -26,7 +27,10 @@ Always - + + Always + + Always