diff --git a/MP-ADM/Web.config b/MP-ADM/Web.config index 1a3fc145..f7d16808 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -32,6 +32,7 @@ + @@ -43,6 +44,9 @@ + diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 3f8fd9f8..47b3a7ec 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -39,15 +39,18 @@ namespace MP_IO.Controllers return answ; } - /// AGGIUNGE TASK richiesto x macchina: + /// + /// AGGIUNGE TASK richiesto x macchina: /// /// GET: IOB/addTask2Exe/3010?taskName=startSetup&taskVal=T190406101512 /// GET: IOB/addTask2Exe/3010?taskName=stopSetup&taskVal=T190406101512 /// GET: IOB/addTask2Exe/SIMUL_03?taskName=setProg&taskVal=P00000001 /// GET: IOB/addTask2Exe/SIMUL_03?taskName=setComm&taskVal=ODL_0000123 /// GET: IOB/addTask2Exe/SIMUL_03?taskName=setArt&taskVal=ART_0000321 - /// - /// + /// + /// + /// + /// public string addTask2Exe(string id, string taskName, string taskVal) { string answ = ""; @@ -2055,7 +2058,7 @@ namespace MP_IO.Controllers /// /// Registrazione variazione allarmi /// - /// GET: IOB/sendAlarmBankUpdate/SIMUL_03 + /// GET: IOB/sendAlarmBankUpdate/SIMUL_03?memAddr=SIM_BANK&index=0&currStatus=22 /// /// /// diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 9b4053a2..63becdb7 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -40,6 +40,7 @@ + @@ -50,6 +51,9 @@ + diff --git a/MP-SITE/example-NLog.config b/MP-SITE/example-NLog.config deleted file mode 100644 index a11a39e6..00000000 --- a/MP-SITE/example-NLog.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-SITE/example-app.config b/MP-SITE/example-app.config deleted file mode 100644 index fb421650..00000000 --- a/MP-SITE/example-app.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/MP-SITE/example-config-table.txt b/MP-SITE/example-config-table.txt deleted file mode 100644 index dd0ab8ef..00000000 --- a/MP-SITE/example-config-table.txt +++ /dev/null @@ -1,30 +0,0 @@ -# chiave valore valoreStd note -_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net -_allowForceUser true true abilita login forzato -_commonPages menu menu pagina comune -_emailPwd drmfsls16 drmfsls16 drmfsls16 -_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com -_enableSSL true true true -_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg -_righeDataGrid 30 30 Num righe datagrid std -_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche -_righeDataGridLong 30 30 Num righe datagrid long -_righeDataGridMed 15 15 Num righe datagrid med -_righeDataGridShort 10 10 Num righe datagrid short -_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com -_useAIMSmtp false false impiego client posta elettronica alternativo -_useAuthSmtp true true true -AuthCookieName admodellingAuth admodellingAuth Cookie applicativo -autoConfCmd true true Conferma automatica comandi barcode -baseUrl http://site_name http://iis02/site_name URL base del sito -cacheValSec 60 60 Validità cache dati in gestore Barcode -cookieDayExp 365 365 Periodo validità cookie -cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati -enableCookie true true Abilitazione uso cookie -enableLogOut true false Abilita button logout COMPLETO in alto a sx -enablePlain true true Abilitazione decode plain -maxAuth 1000 1000 num auth minimo per NON consumare tokens -serializeSession true true Serializzazione valori in sessione (REDIS) -SiteName iis02/site_name iis02/site_name Nome sito -enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default -doShrinkFolder true true Imposta compressione area LOGS \ No newline at end of file diff --git a/MP-SITE/example-favicon.ico b/MP-SITE/example-favicon.ico deleted file mode 100644 index 4f0e0ad0..00000000 Binary files a/MP-SITE/example-favicon.ico and /dev/null differ diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index 08e3cf62..4fea6212 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -290,8 +290,6 @@ - - @@ -373,8 +371,6 @@ - - diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 2461f8b4..e196412c 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -34,6 +34,7 @@ + @@ -42,6 +43,9 @@ + diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index ad6c3ff9..3af4aeb2 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -61,6 +61,7 @@ + @@ -74,6 +75,9 @@ + diff --git a/MapoDb/DS_DossPar.Designer.cs b/MapoDb/DS_DossPar.Designer.cs index 004cece7..fe5aa18e 100644 --- a/MapoDb/DS_DossPar.Designer.cs +++ b/MapoDb/DS_DossPar.Designer.cs @@ -1340,7 +1340,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonProConnectionString; + this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonPro_FluxDataConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1796,7 +1796,7 @@ SELECT IdxMacchina, CodFlux, EnabDoss FROM ConfFlux WHERE (CodFlux = @CodFlux) A [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonProConnectionString; + this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonPro_FluxDataConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/MapoDb/DS_DossPar.xsd b/MapoDb/DS_DossPar.xsd index df93671a..703e23ce 100644 --- a/MapoDb/DS_DossPar.xsd +++ b/MapoDb/DS_DossPar.xsd @@ -2,14 +2,15 @@ - + + - + DELETE FROM [Dossiers] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([IdxMacchina] = @Original_IdxMacchina) AND ([DtRif] = @Original_DtRif) AND ([IdxODL] = @Original_IdxODL) AND ([CodArticolo] = @Original_CodArticolo) AND ([DataType] = @Original_DataType)) @@ -77,7 +78,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO - + dbo.stp_DOSS_getLastByArt @@ -88,7 +89,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO - + dbo.stp_DOSS_getLastByMacch @@ -99,7 +100,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO - + dbo.stp_DOSS_getLastByPODL @@ -113,7 +114,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO - + DELETE FROM [ConfFlux] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([CodFlux] = @Original_CodFlux) AND ([EnabDoss] = @Original_EnabDoss)) @@ -179,30 +180,30 @@ SELECT IdxMacchina, CodFlux, EnabDoss FROM ConfFlux WHERE (CodFlux = @CodFlux) A - + - - - + + + - + - + @@ -212,24 +213,24 @@ SELECT IdxMacchina, CodFlux, EnabDoss FROM ConfFlux WHERE (CodFlux = @CodFlux) A - + - + - + - + diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs index 92186888..134cebca 100644 --- a/MapoDb/DS_applicazione.Designer.cs +++ b/MapoDb/DS_applicazione.Designer.cs @@ -29176,7 +29176,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonProConnectionString; + this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonPro_FluxDataConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd index fc37c08a..e78c8e9b 100644 --- a/MapoDb/DS_applicazione.xsd +++ b/MapoDb/DS_applicazione.xsd @@ -5,6 +5,7 @@ + @@ -2475,7 +2476,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag - + DELETE FROM [dbo].[FluxLog] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt)) @@ -2535,7 +2536,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_getFilt @@ -2549,7 +2550,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_getFiltCount @@ -2564,7 +2565,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_getFiltOrdered @@ -2579,7 +2580,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_getFiltPaged @@ -2596,7 +2597,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_getFirstByMacc @@ -2608,7 +2609,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_InsNew @@ -2623,7 +2624,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_TakeSnapshot @@ -2635,7 +2636,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + dbo.stp_FL_TakeSnapshotLast @@ -3985,17 +3986,17 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + - + - + @@ -4136,33 +4137,33 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index e8687ab3..dd88eba2 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -4369,6 +4369,7 @@ namespace MapoDb string connectionStringIS = memLayer.ML.confReadString("MoonProConnectionStringIS"); string connectionStringArca = memLayer.ML.confReadString("MoonProConnectionStringArca"); string connectionStringES3 = memLayer.ML.confReadString("MoonProConnectionStringES3"); + string connectionStringFluxData = memLayer.ML.confReadString("MoonProConnectionStringFluxData"); string connectionStringMAG = memLayer.ML.confReadString("MoonProConnectionStringMAG"); // connections del db taAG.Connection.ConnectionString = connectionString; @@ -4383,7 +4384,7 @@ namespace MapoDb taCalFF.Connection.ConnectionString = connectionString; taConfig.Connection.ConnectionString = connectionString; taComm.Connection.ConnectionString = connectionString; - taConfFlux.Connection.ConnectionString = connectionString; + taConfFlux.Connection.ConnectionString = connectionStringFluxData; taDatiConf.Connection.ConnectionString = connectionString; taDatiMacchine.Connection.ConnectionString = connectionString; taDatiProd.Connection.ConnectionString = connectionString; @@ -4391,9 +4392,9 @@ namespace MapoDb taDatiProdMacchPer.Connection.ConnectionString = connectionString; taDatiStatoMacch.Connection.ConnectionString = connectionString; taDiarioDich.Connection.ConnectionString = connectionString; - taDOSS.Connection.ConnectionString = connectionString; + taDOSS.Connection.ConnectionString = connectionStringFluxData; taEventi.Connection.ConnectionString = connectionString; - taFL.Connection.ConnectionString = connectionString; + taFL.Connection.ConnectionString = connectionStringFluxData; taIS_TrDati.Connection.ConnectionString = connectionStringIS; taIstK.Connection.ConnectionString = connectionStringIS; taKeepAlive.Connection.ConnectionString = connectionString; diff --git a/MapoDb/Properties/Settings.Designer.cs b/MapoDb/Properties/Settings.Designer.cs index a40daa65..fb665dea 100644 --- a/MapoDb/Properties/Settings.Designer.cs +++ b/MapoDb/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MapoDb.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -88,5 +88,16 @@ namespace MapoDb.Properties { return ((string)(this["MoonPro_MAGConnectionString"])); } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] + [global::System.Configuration.DefaultSettingValueAttribute("Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=Tru" + + "e;User ID=sa;Password=keyhammer16;TrustServerCertificate=True")] + public string MoonPro_FluxDataConnectionString { + get { + return ((string)(this["MoonPro_FluxDataConnectionString"])); + } + } } } diff --git a/MapoDb/Properties/Settings.settings b/MapoDb/Properties/Settings.settings index bf25ac11..3afda9f2 100644 --- a/MapoDb/Properties/Settings.settings +++ b/MapoDb/Properties/Settings.settings @@ -50,5 +50,13 @@ </SerializableConnectionString> Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True; + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> +</SerializableConnectionString> + Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True + \ No newline at end of file diff --git a/MapoDb/app.config b/MapoDb/app.config index 1b427616..016338f7 100644 --- a/MapoDb/app.config +++ b/MapoDb/app.config @@ -1,109 +1,125 @@  - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file