diff --git a/Jenkinsfile b/Jenkinsfile index e0bb1385..a42004db 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1277']) { + withEnv(['NEXT_BUILD_NUMBER=1287']) { // env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' @@ -49,18 +49,14 @@ pipeline { /* compilo installers in base al BRANCH del cliente... */ if (env.BRANCH_NAME == "develop") { parallel ( - ADM_IO: { - sleep 2 + ADM_IO_MON: { bat "\"${tool 'MSBuild-15.0'}\" MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" bat "\"${tool 'MSBuild-15.0'}\" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - }, - LAND_MON: { - sleep 4 - bat "\"${tool 'MSBuild-15.0'}\" MP-LAND/MP-LAND.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" bat "\"${tool 'MSBuild-15.0'}\" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, - SITE_TAB: { - sleep 0 + LAND_SITE_TAB: { + sleep 2 + bat "\"${tool 'MSBuild-15.0'}\" MP-LAND/MP-LAND.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" bat "\"${tool 'MSBuild-15.0'}\" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" bat "\"${tool 'MSBuild-15.0'}\" MP-TAB/MP-TAB.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, diff --git a/MAPO.sln b/MAPO.sln index 066a18d0..746fb20f 100644 --- a/MAPO.sln +++ b/MAPO.sln @@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-SITE", "MP-SITE\MP-SITE. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoSDK", "MapoSDK\MapoSDK.csproj", "{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ES3", "ES3\ES3.csproj", "{C5296C93-4738-4B42-8C9D-B7E5A75110FD}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -185,22 +183,6 @@ Global {D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Prod|Any CPU.Build.0 = Release|Any CPU {D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU {D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.Build.0 = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Donati|Any CPU.ActiveCfg = Debug|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Donati|Any CPU.Build.0 = Debug|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS01|Any CPU.ActiveCfg = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS01|Any CPU.Build.0 = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS02|Any CPU.ActiveCfg = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS02|Any CPU.Build.0 = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Jetco|Any CPU.ActiveCfg = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Jetco|Any CPU.Build.0 = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Prod|Any CPU.ActiveCfg = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Prod|Any CPU.Build.0 = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 1aff4af3..6ecaf08c 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -80,14 +80,17 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.9.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.9.3\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.9.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll + + + ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -102,7 +105,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -113,8 +116,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.1911.699\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2001.711\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -123,12 +126,12 @@ - - ..\packages\System.Diagnostics.PerformanceCounter.4.6.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll @@ -137,8 +140,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -147,8 +150,8 @@ - - ..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -418,6 +421,7 @@ + @@ -428,23 +432,95 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -509,14 +585,6 @@ - - - - - - - - @@ -961,8 +1029,11 @@ + + + @@ -970,8 +1041,6 @@ - - Web.config @@ -991,9 +1060,6 @@ - - - {4617a665-d6e3-4ceb-a689-ce2eecd45713} @@ -1004,6 +1070,9 @@ MapoSDK + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -1066,7 +1135,9 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. + + es: 20181223180600000 @@ -185,7 +185,7 @@ namespace MP_IO.Controllers DateTime dataOraEvento = DateTime.Now; if (memLayer.ML.CRI("_logLevel") > 6) { - logger.lg.scriviLog(string.Format("Valori letti:{0}idxMacchina: {1}{0}flux: {6}{0}valore: {2}{0}dtEve: {3}{0}dtCurr: {4}{0}cnt: {5}", Environment.NewLine, id, valore, dtEve, dtCurr, cnt, flux), tipoLog.INFO); + logger.lg.scriviLog($"Valori letti: idxMacchina: {id} | flux: {flux} valore: {valore}", tipoLog.INFO); } try { @@ -195,7 +195,7 @@ namespace MP_IO.Controllers } catch (Exception exc) { - logger.lg.scriviLog(string.Format("Errore in flog{0}{1}", Environment.NewLine, exc)); + logger.lg.scriviLog($"Errore in flog{Environment.NewLine}{exc}"); answ = "NO"; } return answ; @@ -1107,7 +1107,7 @@ namespace MP_IO.Controllers DateTime dataOraEvento = DateTime.Now; if (memLayer.ML.CRI("_logLevel") > 6) { - logger.lg.scriviLog(string.Format("Salvataggio counter:{0}idxMacchina: {1}{0}conteggio: {2}", Environment.NewLine, id, counter), tipoLog.INFO); + logger.lg.scriviLog($"Salvataggio counter | idxMacchina: {id}", tipoLog.INFO); } try { diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index c911a54c..90e369f3 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -74,14 +74,17 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.9.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.9.3\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.9.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll + + + ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -96,7 +99,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -107,19 +110,19 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.1911.699\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2001.711\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - ..\packages\System.Diagnostics.PerformanceCounter.4.6.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll @@ -128,8 +131,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -138,8 +141,8 @@ - - ..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -220,6 +223,7 @@ + @@ -443,7 +447,9 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. + + aspetto taSP_ms_ant e poi RICHIAMO procedura... int maxTry = 3; - while (!odlFound && maxTry > 0) + while (!okDatiProd && maxTry > 0) { - logger.lg.scriviLog(string.Format("[pzCounterTC] Impossibile recuperare dati ODL x idxMacchina {0}", idxMacchina), tipoLog.ERROR); + logger.lg.scriviLog(string.Format("[pzCounterTC] Impossibile recuperare dati ODL x idxMacchina {0}", idxMacchina), tipoLog.WARNING); // sleep... - System.Threading.Thread.Sleep(taSP_ms_ant); + System.Threading.Thread.Sleep(taSP_ms_ant * 2); // riprovo lettura... - odlFound = getStatoProd(idxMacchina, ref datiProdAct, dataRif); + okDatiProd = getStatoProd(idxMacchina, ref datiProdAct, dataRif); maxTry--; } // ora proseguo SE ho trovato i dati... - if (odlFound) + if (okDatiProd) { // ...a questo punto recupero DAVVERO i dati (o almeno ci provo...) try @@ -2025,7 +2080,7 @@ namespace MapoDb } else { - logger.lg.scriviLog(string.Format("[pzCounterTC] Dati ODL x idxMacchina {0} non recuperati dopo tentativi reiterati...", idxMacchina), tipoLog.ERROR); + logger.lg.scriviLog(string.Format("[pzCounterTC] Dati ODL x idxMacchina {0} non recuperati dopo tentativi reiterati...", idxMacchina), tipoLog.WARNING); } return answ; } @@ -2042,7 +2097,10 @@ namespace MapoDb try { // recupero con stored NUOVA... - datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, dataRif); + //2020.01.31 NUOVO oggetto singleton + DataLayer man = new DataLayer(); + datiProdAct = man.taStatoProd.GetData(idxMacchina, dataRif); + //datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, dataRif); if (datiProdAct.Rows.Count > 0) { // solo SE ho idxODL (altrimenti loggo errore) diff --git a/MapoDb/MapoDb.cs b/MapoDb/MapoDb.cs index a483e582..4f95cf80 100644 --- a/MapoDb/MapoDb.cs +++ b/MapoDb/MapoDb.cs @@ -180,6 +180,8 @@ namespace MapoDb /// private void checkCambiaStatoBatch(tipoInputEvento tipoInput, string IdxMacchina, DateTime InizioStato, int IdxTipo, string CodArt, string Value, int MatrOpr, string pallet) { + int _logLevel = memLayer.ML.CRI("_logLevel"); + DS_applicazione.TransizioneStatiDataTable tabTransStati; DS_applicazione.TransizioneStatiRow rigaTransStati; switch (tipoInput) { @@ -187,38 +189,61 @@ namespace MapoDb // effettuo cambio stato INDIPENDENTEMENTE da stato precedente try { - rigaTransStati = taTranSt.GetUserForcedTransitions(IdxMacchina, IdxTipo)[0]; - // solo se cambia stato... - if (rigaTransStati.IdxStato != rigaTransStati.next_IdxStato) + tabTransStati = taTranSt.GetUserForcedTransitions(IdxMacchina, IdxTipo); + if (tabTransStati.Count > 0) { - taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, CodArt, Value, MatrOpr, pallet); - // aggiorno MSE - DataLayer.obj.taMSE.forceRecalc(0, IdxMacchina); + rigaTransStati = tabTransStati[0]; + // solo se cambia stato... + if (rigaTransStati.IdxStato != rigaTransStati.next_IdxStato) + { + taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, CodArt, Value, MatrOpr, pallet); + // aggiorno MSE + DataLayer.obj.taMSE.forceRecalc(0, IdxMacchina); + } + } + else + { + if (_logLevel > 6) + { + logger.lg.scriviLog($"Non trovata riga per: BARCODE | IdxMacchina: {IdxMacchina} | IdxTipo: {IdxTipo} | CodArt: {CodArt} | Value: {Value} | MatrOpr: {MatrOpr} | pallet: {pallet}", tipoLog.INFO); + } } } catch (Exception exc) { // non dovrebbe succedere... input utente da barcode dovrebbero TUTTI essere inseriti in tab transizione con famiglia 1... - logger.lg.scriviLog(string.Format("Errore controllo transizione stato x evento barcode:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + logger.lg.scriviLog($"Errore controllo transizione stato x evento barcode: BARCODE | IdxMacchina: {IdxMacchina} | IdxTipo: {IdxTipo} | CodArt: {CodArt} | Value: {Value} | MatrOpr: {MatrOpr} | pallet: {pallet}{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } break; case tipoInputEvento.hw: // verifico se ci sia necessità di cambio stato try { - rigaTransStati = taTranSt.GetHwTransitions(IdxMacchina, IdxTipo)[0]; - if (rigaTransStati != null) + tabTransStati = taTranSt.GetHwTransitions(IdxMacchina, IdxTipo); + if (tabTransStati.Count > 0) { - // solo se cambia stato... - if (rigaTransStati.IdxStato != rigaTransStati.next_IdxStato) + rigaTransStati = tabTransStati[0]; + if (rigaTransStati != null) { - taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, CodArt, Value, MatrOpr, pallet); + // solo se cambia stato... + if (rigaTransStati.IdxStato != rigaTransStati.next_IdxStato) + { + taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, CodArt, Value, MatrOpr, pallet); + } + } + } + else + { + if (_logLevel > 6) + { + logger.lg.scriviLog($"Non trovata riga per: HW | IdxMacchina: {IdxMacchina} | IdxTipo: {IdxTipo} | CodArt: {CodArt} | Value: {Value} | MatrOpr: {MatrOpr} | pallet: {pallet}", tipoLog.INFO); } } } - catch + catch (Exception exc) { // non trovo riga [0]... NON scrivo! + logger.lg.scriviLog($"Errore controllo transizione stato x evento barcode: HW | IdxMacchina: {IdxMacchina} | IdxTipo: {IdxTipo} | CodArt: {CodArt} | Value: {Value} | MatrOpr: {MatrOpr} | pallet: {pallet}{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } break; } @@ -459,7 +484,10 @@ namespace MapoDb logger.lg.scriviLog("Recupero currODLTab da DB!", tipoLog.INFO); try { - answ = DataLayer.obj.taODL.getByMacchina(idxMacchina); + //2020.01.31 nuovo obj x evitare singleton + DataLayer man = new DataLayer(); + answ = man.taODL.getByMacchina(idxMacchina); + //answ = DataLayer.obj.taODL.getByMacchina(idxMacchina); } catch (Exception exc) { @@ -469,7 +497,7 @@ namespace MapoDb return answ; } /// - /// Testituisce tabella con riga dell'ODL attivo (iniziato e NON concluso) + /// Restituisce tabella con riga stato macchina /// /// /// @@ -479,7 +507,10 @@ namespace MapoDb logger.lg.scriviLog("Recupero currStatoMaccTab da DB!", tipoLog.INFO); try { - answ = DataLayer.obj.taStatoMacchine.GetDataByIdxMacchina(idxMacchina); + // 2020.01.31 creo nuovo obj x lettura + DataLayer man = new DataLayer(); + answ = man.taStatoMacchine.GetDataByIdxMacchina(idxMacchina); + //answ = DataLayer.obj.taStatoMacchine.GetDataByIdxMacchina(idxMacchina); } catch (Exception exc) { @@ -1322,7 +1353,7 @@ namespace MapoDb } if (memLayer.ML.CRI("_logLevel") > 6) { - logger.lg.scriviLog(string.Format("Scrittura keep alive! IdxMacchina:{0} | oraMacchina:{1}", IdxMacchina, oraMacchina)); + logger.lg.scriviLog($"Scrittura keep alive! IdxMacchina: {IdxMacchina}"); } // 2017.07.11 se richiesto di NON usare singleton... riporto FUORI la gestione NUOVO oggetto if (memLayer.ML.CRB("disable_singleton")) @@ -1334,7 +1365,7 @@ namespace MapoDb } catch (Exception exc) { - logger.lg.scriviLog(string.Format("Errore in scrittura keep alive!{0}oraMacchina:{1} - IdxMacchina:{2}{0}{3}", Environment.NewLine, oraMacchina, IdxMacchina, exc), tipoLog.EXCEPTION); + logger.lg.scriviLog($"Errore in scrittura keep alive!{Environment.NewLine}oraMacchina: {oraMacchina} - IdxMacchina: {IdxMacchina}{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } } } diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 9e07de50..dfcf7d92 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -87,14 +87,17 @@ False ExtLib\Microsoft.ReportViewer.WinForms.dll - - ..\packages\MongoDB.Bson.2.9.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.9.3\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.9.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll + + + ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -109,7 +112,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -120,8 +123,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.1911.699\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2001.711\lib\net462\SteamWare.dll @@ -131,13 +134,13 @@ - - ..\packages\System.Diagnostics.PerformanceCounter.4.6.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll @@ -146,8 +149,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -157,8 +160,8 @@ - - ..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -333,6 +336,7 @@ + @@ -347,7 +351,9 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. + + - -

Popper.js

- -

- A library used to position poppers in web applications. -

- -

- Build Status - Stable Release Size - bitHound Overall Score - Istanbul Code Coverage - Get support or discuss -
- SauceLabs Reports -

- - - - - -## Wut? Poppers? - -A popper is an element on the screen which "pops out" from the natural flow of your application. -Common examples of poppers are tooltips, popovers and drop-downs. - - -## So, yet another tooltip library? - -Well, basically, **no**. -Popper.js is a **positioning engine**, its purpose is to calculate the position of an element -to make it possible to position it near a given reference element. - -The engine is completely modular and most of its features are implemented as **modifiers** -(similar to middlewares or plugins). -The whole code base is written in ES2015 and its features are automatically tested on real browsers thanks to [SauceLabs](https://saucelabs.com/) and [TravisCI](https://travis-ci.org/). - -Popper.js has zero dependencies. No jQuery, no LoDash, nothing. -It's used by big companies like [Twitter in Bootstrap v4](https://getbootstrap.com/), [Microsoft in WebClipper](https://github.com/OneNoteDev/WebClipper) and [Atlassian in AtlasKit](https://aui-cdn.atlassian.com/atlaskit/registry/). - -### Popper.js - -This is the engine, the library that computes and, optionally, applies the styles to -the poppers. - -Some of the key points are: - -- Position elements keeping them in their original DOM context (doesn't mess with your DOM!); -- Allows to export the computed informations to integrate with React and other view libraries; -- Supports Shadow DOM elements; -- Completely customizable thanks to the modifiers based structure; - -Visit our [project page](https://fezvrasta.github.io/popper.js) to see a lot of examples of what you can do with Popper.js! - -Find [the documentation here](/docs/_includes/popper-documentation.md). - - -### Tooltip.js - -Since lots of users just need a simple way to integrate powerful tooltips in their projects, -we created **Tooltip.js**. -It's a small library that makes it easy to automatically create tooltips using as engine Popper.js. -Its API is almost identical to the famous tooltip system of Bootstrap, in this way it will be -easy to integrate it in your projects. -The tooltips generated by Tooltip.js are accessible thanks to the `aria` tags. - -Find [the documentation here](/docs/_includes/tooltip-documentation.md). - - -## Installation -Popper.js is available on the following package managers and CDNs: - -| Source | | -|:-------|:---------------------------------------------------------------------------------| -| npm | `npm install popper.js --save` | -| yarn | `yarn add popper.js` | -| NuGet | `PM> Install-Package popper.js` | -| Bower | `bower install popper.js --save` | -| unpkg | [`https://unpkg.com/popper.js`](https://unpkg.com/popper.js) | -| cdnjs | [`https://cdnjs.com/libraries/popper.js`](https://cdnjs.com/libraries/popper.js) | - -Tooltip.js as well: - -| Source | | -|:-------|:---------------------------------------------------------------------------------| -| npm | `npm install tooltip.js --save` | -| yarn | `yarn add tooltip.js` | -| Bower* | `bower install tooltip.js=https://unpkg.com/tooltip.js --save` | -| unpkg | [`https://unpkg.com/tooltip.js`](https://unpkg.com/tooltip.js) | -| cdnjs | [`https://cdnjs.com/libraries/popper.js`](https://cdnjs.com/libraries/popper.js) | - -\*: Bower isn't officially supported, it can be used to install Tooltip.js only trough the unpkg.com CDN. This method has the limitation of not being able to define a specific version of the library. Bower and Popper.js suggests to use npm or Yarn for your projects. -For more info, [read the related issue](https://github.com/FezVrasta/popper.js/issues/390). - -### Dist targets - -Popper.js is currently shipped with 3 targets in mind: UMD, ESM and ESNext. - -- UMD - Universal Module Definition: AMD, RequireJS and globals; -- ESM - ES Modules: For webpack/Rollup or browser supporting the spec; -- ESNext: Available in `dist/`, can be used with webpack and `babel-preset-env`; - -Make sure to use the right one for your needs. If you want to import it with a `