diff --git a/Jenkinsfile b/Jenkinsfile index f47464dd..d701ebf0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1300']) { + withEnv(['NEXT_BUILD_NUMBER=1306']) { // env.versionNumber = VersionNumber(versionNumberString : '6.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/App_Start/MP_Startup.cs b/MP-ADM/App_Start/MP_Startup.cs index 62cb2dbc..edfd7492 100644 --- a/MP-ADM/App_Start/MP_Startup.cs +++ b/MP-ADM/App_Start/MP_Startup.cs @@ -7,16 +7,16 @@ namespace MP_ADM { public static void Init() { - logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP); + SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()"); try { // inizializzo appConf prima di tutto il resto... memLayer.ML.resetAppConf(); - logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP); + SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf"); } catch (Exception exc) { - logger.lg.scriviLog($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}", tipoLog.EXCEPTION); + SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}"); } } } diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 081ef50d..23cb3995 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -119,8 +119,11 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -464,8 +467,6 @@ - - @@ -476,6 +477,8 @@ + + @@ -854,7 +857,6 @@ cmp_numRow.ascx - ASPXCodeBehind cmp_numRow.ascx @@ -868,7 +870,6 @@ mod_aperturaImpianti.ascx - ASPXCodeBehind mod_aperturaImpianti.ascx @@ -896,7 +897,6 @@ mod_calChiusura.ascx - ASPXCodeBehind mod_calChiusura.ascx @@ -952,14 +952,12 @@ mod_login.ascx - ASPXCodeBehind mod_login.ascx mod_main_help.ascx - ASPXCodeBehind mod_main_help.ascx @@ -973,7 +971,6 @@ mod_menuSx.ascx - ASPXCodeBehind mod_menuSx.ascx @@ -1008,28 +1005,24 @@ mod_pageTitleAndSearch.ascx - ASPXCodeBehind mod_pageTitleAndSearch.ascx mod_planCreate.ascx - ASPXCodeBehind mod_planCreate.ascx mod_planStats.ascx - ASPXCodeBehind mod_planStats.ascx mod_ricercaGenerica.ascx - ASPXCodeBehind mod_ricercaGenerica.ascx diff --git a/MP-ADM/Web.config b/MP-ADM/Web.config index 447ff416..5cd3b8ce 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -115,6 +115,10 @@ + + + + diff --git a/MP-ADM/packages.config b/MP-ADM/packages.config index dd875a4e..d46621a4 100644 --- a/MP-ADM/packages.config +++ b/MP-ADM/packages.config @@ -42,7 +42,8 @@ - + + diff --git a/MP-IO/App_Start/MP_Startup.cs b/MP-IO/App_Start/MP_Startup.cs index b8175c63..92223ed9 100644 --- a/MP-IO/App_Start/MP_Startup.cs +++ b/MP-IO/App_Start/MP_Startup.cs @@ -3,21 +3,21 @@ using System; namespace MP_IO { - public class MP_Startup - { - public static void Init() + public class MP_Startup { - logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP); - try - { - // inizializzo appConf prima di tutto il resto... - memLayer.ML.resetAppConf(); - logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP); - } - catch (Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); - } + public static void Init() + { + SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()"); + try + { + // inizializzo appConf prima di tutto il resto... + memLayer.ML.resetAppConf(); + SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf"); + } + catch (Exception exc) + { + SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}"); + } + } } - } } \ No newline at end of file diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 76f7bf04..06568143 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -116,8 +116,11 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -360,11 +363,11 @@ - - PreserveNewest + + Designer diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 7601366c..f6b21c18 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -113,6 +113,10 @@ + + + + diff --git a/MP-IO/packages.config b/MP-IO/packages.config index 334d0c99..b61a044c 100644 --- a/MP-IO/packages.config +++ b/MP-IO/packages.config @@ -42,7 +42,8 @@ - + + diff --git a/MP-LAND/App_Start/MP_Startup.cs b/MP-LAND/App_Start/MP_Startup.cs index 4fd448b5..fe5df43c 100644 --- a/MP-LAND/App_Start/MP_Startup.cs +++ b/MP-LAND/App_Start/MP_Startup.cs @@ -3,21 +3,21 @@ using System; namespace MP { - public class MP_Startup - { - public static void Init() + public class MP_Startup { - logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP); - try - { - // inizializzo appConf prima di tutto il resto... - memLayer.ML.resetAppConf(); - logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP); - } - catch (Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); - } + public static void Init() + { + SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()"); + try + { + // inizializzo appConf prima di tutto il resto... + memLayer.ML.resetAppConf(); + SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf"); + } + catch (Exception exc) + { + SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}"); + } + } } - } } \ No newline at end of file diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index 91ffe177..8212b7bd 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -117,8 +117,11 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll @@ -233,11 +236,11 @@ ..\packages\WebGrease.1.6.0\lib\WebGrease.dll True - - ..\packages\ZXing.Net.0.16.5\lib\net461\zxing.dll + + ..\packages\ZXing.Net.0.16.6\lib\net461\zxing.dll - - ..\packages\ZXing.Net.0.16.5\lib\net461\zxing.presentation.dll + + ..\packages\ZXing.Net.0.16.6\lib\net461\zxing.presentation.dll diff --git a/MP-LAND/Web.OVH-Demo.config b/MP-LAND/Web.OVH-Demo.config index 850606e0..28cca490 100644 --- a/MP-LAND/Web.OVH-Demo.config +++ b/MP-LAND/Web.OVH-Demo.config @@ -1,14 +1,13 @@ - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/MP-LAND/Web.Prod.config b/MP-LAND/Web.Prod.config index 0715e0f9..ca795b8f 100644 --- a/MP-LAND/Web.Prod.config +++ b/MP-LAND/Web.Prod.config @@ -2,7 +2,7 @@ - + @@ -11,7 +11,6 @@ - diff --git a/MP-LAND/Web.config b/MP-LAND/Web.config index 89dd2a3a..7f2896ac 100644 --- a/MP-LAND/Web.config +++ b/MP-LAND/Web.config @@ -113,6 +113,10 @@ + + + + diff --git a/MP-LAND/packages.config b/MP-LAND/packages.config index d294e99a..073e39aa 100644 --- a/MP-LAND/packages.config +++ b/MP-LAND/packages.config @@ -46,7 +46,8 @@ - + + @@ -63,5 +64,5 @@ - + \ No newline at end of file diff --git a/MP-MON/App_Start/MP_Startup.cs b/MP-MON/App_Start/MP_Startup.cs index 4ab0edb8..e907cefd 100644 --- a/MP-MON/App_Start/MP_Startup.cs +++ b/MP-MON/App_Start/MP_Startup.cs @@ -3,21 +3,21 @@ using System; namespace MP_MON { - public class MP_Startup - { - public static void Init() + public class MP_Startup { - logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP); - try - { - // inizializzo appConf prima di tutto il resto... - memLayer.ML.resetAppConf(); - logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP); - } - catch (Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); - } + public static void Init() + { + SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()"); + try + { + // inizializzo appConf prima di tutto il resto... + memLayer.ML.resetAppConf(); + SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf"); + } + catch (Exception exc) + { + SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}"); + } + } } - } } \ No newline at end of file diff --git a/MP-MON/Content/Site.css b/MP-MON/Content/Site.css index 8342ec80..2a7b417e 100644 --- a/MP-MON/Content/Site.css +++ b/MP-MON/Content/Site.css @@ -17,9 +17,10 @@ body .ui-overlay-c { /* Set padding to keep content from hitting the edges */ .body-content { padding: 0.1em 0.2em; + margin-top: 1.6em; } -/* Override the default bootstrap behavior where horizontal description lists - will truncate terms that are too long to fit in the left column +/* Override the default bootstrap behavior where horizontal description lists + will truncate terms that are too long to fit in the left column */ .dl-horizontal dt { white-space: normal; @@ -79,6 +80,28 @@ body .ui-overlay-c { height: 40px; } } +@media all and (min-width: 2000px) { + .mainHead { + font-size: 1.6em; + } + body { + font-size: 2.4em; + } + .logoImg { + height: 60px; + } +} +@media all and (min-width: 2600px) { + .mainHead { + font-size: 1.6em; + } + body { + font-size: 3.2em; + } + .logoImg { + height: 80px; + } +} @media all and (max-width: 425px) { .mainHead { font-size: 1em; @@ -224,7 +247,7 @@ textarea { } .shortcuts .shortcut-label { display: block; - margin-top: .75em; + margin-top: 0.75em; font-weight: 400; color: #666; } \ No newline at end of file diff --git a/MP-MON/Content/Site.less b/MP-MON/Content/Site.less index a34f57f1..e5e78d66 100644 --- a/MP-MON/Content/Site.less +++ b/MP-MON/Content/Site.less @@ -3,170 +3,197 @@ /* Gestione blocchi base */ body { - font-family: 'Open Sans', sans-serif; - background-color: #5d5d5d; - padding: 25px 0 20px 0; + font-family: 'Open Sans', sans-serif; + background-color: #5d5d5d; + padding: 25px 0 20px 0; } - body .ui-body-a, body .ui-body-c, body .ui-overlay-c { +body .ui-body-a, body .ui-body-c, body .ui-overlay-c { text-shadow: 0 0 0; - } - +} .logoImg { - height: 40px; + height: 40px; } /* Set padding to keep content from hitting the edges */ .body-content { - padding: 0.1em 0.2em; + padding: 0.1em 0.2em; + margin-top: 1.6em; } -/* Override the default bootstrap behavior where horizontal description lists - will truncate terms that are too long to fit in the left column +/* Override the default bootstrap behavior where horizontal description lists + will truncate terms that are too long to fit in the left column */ .dl-horizontal dt { - white-space: normal; + white-space: normal; } - @media all and (min-width: 425px) { - .mainHead { - font-size: 1.3em; - } + .mainHead { + font-size: 1.3em; + } - body { - font-size: 0.8em; - } + body { + font-size: 0.8em; + } - .logoImg { - height: 30px; - } + .logoImg { + height: 30px; + } } @media all and (min-width: 768px) { - .mainHead { - font-size: 1.4em; - } + .mainHead { + font-size: 1.4em; + } - body { - font-size: 1em; - } + body { + font-size: 1em; + } - .logoImg { - height: 35px; - } + .logoImg { + height: 35px; + } } @media all and (min-width: 1024px) { - .mainHead { - font-size: 1.5em; - } + .mainHead { + font-size: 1.5em; + } - body { - font-size: 1.2em; - } + body { + font-size: 1.2em; + } - .logoImg { - height: 40px; - } + .logoImg { + height: 40px; + } } @media all and (min-width: 1440px) { - .mainHead { - font-size: 1.6em; - } + .mainHead { + font-size: 1.6em; + } - body { - font-size: 1.4em; - } + body { + font-size: 1.4em; + } - .logoImg { - height: 40px; - } + .logoImg { + height: 40px; + } } @media all and (min-width: 1600px) { - .mainHead { - font-size: 1.6em; - } + .mainHead { + font-size: 1.6em; + } - body { - font-size: 1.6em; - } + body { + font-size: 1.6em; + } - .logoImg { - height: 40px; - } + .logoImg { + height: 40px; + } +} + +@media all and (min-width: 2000px) { + .mainHead { + font-size: 1.6em; + } + + body { + font-size: 2.4em; + } + + .logoImg { + height: 60px; + } +} + +@media all and (min-width: 2600px) { + .mainHead { + font-size: 1.6em; + } + + body { + font-size: 3.2em; + } + + .logoImg { + height: 80px; + } } @media all and (max-width: 425px) { - .mainHead { - font-size: 1em; - } + .mainHead { + font-size: 1em; + } - body { - font-size: 0.7em; - } + body { + font-size: 0.7em; + } - .logoImg { - height: 25px; - } + .logoImg { + height: 25px; + } } /* Set width on the form input elements since they're 100% wide by default */ input, select, textarea { - max-width: 280px; + max-width: 280px; } .deleted { - text-decoration: line-through; + text-decoration: line-through; } .padZL { - padding-left: 0.2em; + padding-left: 0.2em; } .padZR { - padding-right: 0.2em; + padding-right: 0.2em; } .padZRL { - .padZL; - .padZR; + .padZL; + .padZR; } .colAlt { - color: #C93; + color: #C93; } .fontSmall { - font-size: 0.66em; + font-size: 0.66em; } .fontSmaller { - font-size: 0.5em; + font-size: 0.5em; } .fontBig { - font-size: 2em; + font-size: 2em; } .tNote { - color: #8a8a8a; - font-style: italic; + color: #8a8a8a; + font-style: italic; } .tNoWrap { - white-space: nowrap; + white-space: nowrap; } .navbar { - min-height: 0; - /*z-index: 0; // commentare quando in prod?!?*/ - color: #696969; - background-color: #000; + min-height: 0; + /*z-index: 0; // commentare quando in prod?!?*/ + color: #696969; + background-color: #000; } /*------------------------------------------------------------------ @@ -176,10 +203,10 @@ textarea { @blSCut: 20px; .shortcuts { - text-align: center; + text-align: center; } - .shortcuts .shortcut { +.shortcuts .shortcut { min-width: @blSCut * 9; min-height: @blSCut * 5; display: inline-block; @@ -197,9 +224,9 @@ textarea { border: 1px solid #ddd; box-sizing: border-box; border-radius: @blSCut/2; - } +} - .shortcuts .shortcut-sm { +.shortcuts .shortcut-sm { min-width: @blSCut * 4.5; min-height: @blSCut * 3; display: inline-block; @@ -217,25 +244,25 @@ textarea { border: 1px solid #ddd; box-sizing: border-box; border-radius: @blSCut/2; - } +} - .shortcuts .shortcut .shortcut-icon { +.shortcuts .shortcut .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; font-size: @blSCut*2; color: #333; - } +} - .shortcuts .shortcut-sm .shortcut-icon { +.shortcuts .shortcut-sm .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; font-size: @blSCut*2; color: #333; - } +} - .shortcuts .shortcut:hover { +.shortcuts .shortcut:hover { background: #E8E8E8; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); @@ -243,9 +270,9 @@ textarea { background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); - } +} - .shortcuts .shortcut-sm:hover { +.shortcuts .shortcut-sm:hover { background: #E8E8E8; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); @@ -253,27 +280,27 @@ textarea { background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); - } +} - .shortcuts .shortcut:active { +.shortcuts .shortcut:active { box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - } +} - .shortcuts .shortcut-sm:active { +.shortcuts .shortcut-sm:active { box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - } +} - .shortcuts .shortcut:hover .shortcut-icon { +.shortcuts .shortcut:hover .shortcut-icon { color: #C93; - } +} - .shortcuts .shortcut-sm:hover .shortcut-icon { +.shortcuts .shortcut-sm:hover .shortcut-icon { color: #666; - } +} - .shortcuts .shortcut-label { +.shortcuts .shortcut-label { display: block; margin-top: .75em; font-weight: 400; color: #666; - } +} \ No newline at end of file diff --git a/MP-MON/Content/Site.min.css b/MP-MON/Content/Site.min.css index 0cf83262..161696a1 100644 --- a/MP-MON/Content/Site.min.css +++ b/MP-MON/Content/Site.min.css @@ -1 +1 @@ -@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:25px 0 20px 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.logoImg{height:40px;}.body-content{padding:.1em .2em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:1024px){.mainHead{font-size:1.5em;}body{font-size:1.2em;}.logoImg{height:40px;}}@media all and (min-width:1440px){.mainHead{font-size:1.6em;}body{font-size:1.4em;}.logoImg{height:40px;}}@media all and (min-width:1600px){.mainHead{font-size:1.6em;}body{font-size:1.6em;}.logoImg{height:40px;}}@media all and (max-width:425px){.mainHead{font-size:1em;}body{font-size:.7em;}.logoImg{height:25px;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file +@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:25px 0 20px 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.logoImg{height:40px;}.body-content{padding:.1em .2em;margin-top:1.6em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:1024px){.mainHead{font-size:1.5em;}body{font-size:1.2em;}.logoImg{height:40px;}}@media all and (min-width:1440px){.mainHead{font-size:1.6em;}body{font-size:1.4em;}.logoImg{height:40px;}}@media all and (min-width:1600px){.mainHead{font-size:1.6em;}body{font-size:1.6em;}.logoImg{height:40px;}}@media all and (min-width:2000px){.mainHead{font-size:1.6em;}body{font-size:2.4em;}.logoImg{height:60px;}}@media all and (min-width:2600px){.mainHead{font-size:1.6em;}body{font-size:3.2em;}.logoImg{height:80px;}}@media all and (max-width:425px){.mainHead{font-size:1em;}body{font-size:.7em;}.logoImg{height:25px;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj index 9e85e0bc..8f6ac4bf 100644 --- a/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON.csproj @@ -117,8 +117,11 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll @@ -340,10 +343,6 @@ - - - compilerconfig.json - PreserveNewest @@ -360,6 +359,10 @@ + + + compilerconfig.json + EntityModelCodeGenerator diff --git a/MP-MON/Views/Shared/_Layout.cshtml b/MP-MON/Views/Shared/_Layout.cshtml index e85b52b6..7f9ad3df 100644 --- a/MP-MON/Views/Shared/_Layout.cshtml +++ b/MP-MON/Views/Shared/_Layout.cshtml @@ -1,76 +1,75 @@  - - - MP-MON - @Styles.Render("~/Content/css") - @Scripts.Render("~/bundles/modernizr") - @Scripts.Render("~/bundles/jquery") - + + + MP-MON + @Styles.Render("~/Content/css") + @Scripts.Render("~/bundles/modernizr") + @Scripts.Render("~/bundles/jquery") - + +
+ @RenderBody() + + @{ + // recupero variabile ambiente... + ViewBag.envir = System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"]; + string cssFixFooter = ""; + } + @if (ViewBag.envir != "Dev") + { + cssFixFooter = "fixed-bottom"; + } + +
+ @Html.Partial("_footer") +
- -
- @RenderBody() + @Scripts.Render("~/bundles/bootstrap") + + - @{ - // recupero variabile ambiente... - ViewBag.envir = System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"]; - string cssFixFooter = ""; - } - @if (ViewBag.envir != "Dev") - { - cssFixFooter = "fixed-bottom"; - } + @*@Scripts.Render("~/bundles/jqbootgrid")*@ -
- @Html.Partial("_footer") -
-
+ @Scripts.Render("~/bundles/jqueryval") - @Scripts.Render("~/bundles/bootstrap") - - + @RenderSection("scripts", required: false) - @*@Scripts.Render("~/bundles/jqbootgrid")*@ - - @Scripts.Render("~/bundles/jqueryval") - - @RenderSection("scripts", required: false) - - + - - + \ No newline at end of file diff --git a/MP-MON/Web.config b/MP-MON/Web.config index fd0dddc0..87423718 100644 --- a/MP-MON/Web.config +++ b/MP-MON/Web.config @@ -101,6 +101,10 @@ + + + + diff --git a/MP-MON/compilerconfig.json b/MP-MON/compilerconfig.json index 76d055c8..58b496a2 100644 --- a/MP-MON/compilerconfig.json +++ b/MP-MON/compilerconfig.json @@ -1,14 +1,14 @@ [ { - "outputFile": "Content/Site.css", - "inputFile": "Content/Site.less" + "outputFile": "Content/baseStyle.css", + "inputFile": "Content/baseStyle.less" }, { "outputFile": "Content/fonts.css", "inputFile": "Content/fonts.less" }, { - "outputFile": "Content/baseStyle.css", - "inputFile": "Content/baseStyle.less" + "outputFile": "Content/Site.css", + "inputFile": "Content/Site.less" } ] \ No newline at end of file diff --git a/MP-MON/compilerconfig.json.defaults b/MP-MON/compilerconfig.json.defaults index c75eb7d5..b3519312 100644 --- a/MP-MON/compilerconfig.json.defaults +++ b/MP-MON/compilerconfig.json.defaults @@ -13,6 +13,7 @@ "sourceMap": false }, "sass": { + "autoPrefix": "", "includePath": "", "indentType": "space", "indentWidth": 2, @@ -20,6 +21,7 @@ "Precision": 5, "relativeUrls": true, "sourceMapRoot": "", + "lineFeed": "", "sourceMap": false }, "stylus": { @@ -32,6 +34,18 @@ "bare": false, "runtimeMode": "node", "sourceMap": false + }, + "handlebars": { + "root": "", + "noBOM": false, + "name": "", + "namespace": "", + "knownHelpersOnly": false, + "forcePartial": false, + "knownHelpers": [], + "commonjs": "", + "amd": false, + "sourceMap": false } }, "minifiers": { diff --git a/MP-MON/packages.config b/MP-MON/packages.config index c2430084..a982ec9b 100644 --- a/MP-MON/packages.config +++ b/MP-MON/packages.config @@ -37,7 +37,8 @@ - + + diff --git a/MP-Site/App_Start/MP_Startup.cs b/MP-Site/App_Start/MP_Startup.cs index 882bd9c0..58a715e7 100644 --- a/MP-Site/App_Start/MP_Startup.cs +++ b/MP-Site/App_Start/MP_Startup.cs @@ -7,16 +7,16 @@ namespace MP_SITE { public static void Init() { - logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP); + SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()"); try { // inizializzo appConf prima di tutto il resto... memLayer.ML.resetAppConf(); - logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP); + SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf"); } catch (Exception exc) { - logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}"); } } } diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index 440877be..36b463a4 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -121,8 +121,11 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -335,8 +338,6 @@ - - @@ -347,6 +348,8 @@ + + @@ -577,7 +580,6 @@ erroreComunicazione.aspx - ASPXCodeBehind erroreComunicazione.aspx diff --git a/MP-Site/Web.config b/MP-Site/Web.config index bd3e6ad7..c1b1ed2f 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -123,6 +123,10 @@ + + + + diff --git a/MP-Site/packages.config b/MP-Site/packages.config index 71778bd0..3d042240 100644 --- a/MP-Site/packages.config +++ b/MP-Site/packages.config @@ -45,7 +45,8 @@ - + + diff --git a/MP-TAB/App_Start/MP_Startup.cs b/MP-TAB/App_Start/MP_Startup.cs index 442343eb..eecd4cc8 100644 --- a/MP-TAB/App_Start/MP_Startup.cs +++ b/MP-TAB/App_Start/MP_Startup.cs @@ -3,21 +3,21 @@ using System; namespace MoonProTablet { - public class MP_Startup - { - public static void Init() + public class MP_Startup { - logger.lg.scriviLog("Esecuzione MyStartup.init()", tipoLog.STARTUP); - try - { - // inizializzo appConf prima di tutto il resto... - memLayer.ML.resetAppConf(); - logger.lg.scriviLog("Completata esecuzione preliminare setup AppConf", tipoLog.STARTUP); - } - catch (Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in fase di INIT preliminare applicazione{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); - } + public static void Init() + { + SteamWare.Logger.Logging.LogInfo("Esecuzione MyStartup.init()"); + try + { + // inizializzo appConf prima di tutto il resto... + memLayer.ML.resetAppConf(); + SteamWare.Logger.Logging.LogInfo("Completata esecuzione preliminare setup AppConf"); + } + catch (Exception exc) + { + SteamWare.Logger.Logging.LogError($"Eccezione in fase di INIT preliminare applicazione{Environment.NewLine}{exc}"); + } + } } - } } \ No newline at end of file diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 32e9e298..93e8fa3f 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -21,9 +21,11 @@ 4.0 - 44328 - enabled - disabled + 44384 + + + + @@ -176,8 +178,11 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -339,8 +344,6 @@ - - @@ -437,6 +440,8 @@ + + typeahead.less @@ -744,7 +749,6 @@ About.aspx - ASPXCodeBehind About.aspx @@ -752,19 +756,15 @@ - - ASPXCodeBehind - + Commenti.aspx - ASPXCodeBehind Commenti.aspx Controlli.aspx - ASPXCodeBehind Controlli.aspx @@ -778,7 +778,6 @@ DettaglioMacchina.aspx - ASPXCodeBehind DettaglioMacchina.aspx @@ -792,7 +791,6 @@ fixODL.aspx - ASPXCodeBehind fixODL.aspx @@ -802,14 +800,12 @@ HwSwInfo.aspx - ASPXCodeBehind HwSwInfo.aspx IOB-info.aspx - ASPXCodeBehind IOB-info.aspx @@ -823,28 +819,24 @@ Logout.aspx - ASPXCodeBehind Logout.aspx MappaStato.aspx - ASPXCodeBehind MappaStato.aspx ODL.aspx - ASPXCodeBehind ODL.aspx PianoProd.aspx - ASPXCodeBehind PianoProd.aspx @@ -852,91 +844,78 @@ regNewDevice.aspx - ASPXCodeBehind regNewDevice.aspx RepProd_GG.aspx - ASPXCodeBehind RepProd_GG.aspx Reset.aspx - ASPXCodeBehind Reset.aspx Scarti.aspx - ASPXCodeBehind Scarti.aspx SendParameters.aspx - ASPXCodeBehind SendParameters.aspx StoricoTC.aspx - ASPXCodeBehind StoricoTC.aspx SheetTech.aspx - ASPXCodeBehind SheetTech.aspx Test.aspx - ASPXCodeBehind Test.aspx tryLogin.aspx - ASPXCodeBehind tryLogin.aspx Turni.aspx - ASPXCodeBehind Turni.aspx Update.aspx - ASPXCodeBehind Update.aspx User.aspx - ASPXCodeBehind User.aspx UserList.aspx - ASPXCodeBehind UserList.aspx @@ -1010,7 +989,6 @@ mod_checkHttps.ascx - ASPXCodeBehind mod_checkHttps.ascx diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index b88f5f31..e4fa9bdb 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -114,6 +114,10 @@ + + + + diff --git a/MP-TAB/packages.config b/MP-TAB/packages.config index ae5eb662..5e02e573 100644 --- a/MP-TAB/packages.config +++ b/MP-TAB/packages.config @@ -43,7 +43,8 @@ - + + diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 5d703274..84fec5a5 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -126,8 +126,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.0.2010.743\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll @@ -162,8 +162,6 @@ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True @@ -386,6 +384,7 @@ MapoSDK + diff --git a/MapoDb/app.config b/MapoDb/app.config index e3cea184..37952651 100644 --- a/MapoDb/app.config +++ b/MapoDb/app.config @@ -26,7 +26,7 @@ - + diff --git a/MapoDb/libzstd.dll b/MapoDb/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MapoDb/libzstd.dll and /dev/null differ diff --git a/MapoDb/mongocrypt.dll b/MapoDb/mongocrypt.dll deleted file mode 100644 index 3cc36341..00000000 Binary files a/MapoDb/mongocrypt.dll and /dev/null differ diff --git a/MapoDb/packages.config b/MapoDb/packages.config index 534cad8c..5dcc0eb2 100644 --- a/MapoDb/packages.config +++ b/MapoDb/packages.config @@ -22,7 +22,7 @@ - + diff --git a/MapoDb/snappy32.dll b/MapoDb/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MapoDb/snappy32.dll and /dev/null differ diff --git a/MapoDb/snappy64.dll b/MapoDb/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MapoDb/snappy64.dll and /dev/null differ diff --git a/MapoSDK/Enums.cs b/MapoSDK/Enums.cs index 009cdd6b..41535fca 100644 --- a/MapoSDK/Enums.cs +++ b/MapoSDK/Enums.cs @@ -1,258 +1,297 @@ namespace MapoSDK { + public enum DataItemCategory + { + CONDITION = 0, + EVENT = 1, + SAMPLE = 2 + } - /// - /// tipologia evento inviato - /// - public enum tipoInputEvento - { - barcode, - hw - } + /// + /// Tipo di esito (generico) + /// + public enum esitoExec + { + undone, + ok, + error + } - /// - /// Tipologia di elaborazione/funzione da applicare a VC - /// - public enum VC_func - { /// - /// Valore puntuale + /// Tipo di IOB /// - POINT = 0, - /// - /// Valore medio del periodo - /// - AVG, - /// - /// Valore massimo del periodo - /// - MAX, - /// - /// Valore minimo del periodo - /// - MIN - } - /// - /// Elenco dei tipi di valore gestiti da PLC (inizialmente SIEMENS) - /// - public enum plcDataType - { - /// - /// Tipo boolean - /// - Boolean, - /// - /// Tipo Int16 intero 16bit - /// - Int, - /// - /// Tipo Int32 intero 32bit - /// - DInt, - /// - /// Tipo UInt16, intero 16bit - /// - Word, - /// - /// Tipo UInt32, intero Unsigned 32bit - /// - DWord, - /// - /// Tipo REAL 32 bit - /// - Real, - /// - /// Tipo stringa - /// - String - } - /// - /// Finestra temporale di aggregazione dati VC - /// - public enum timeWindow - { - free, - hour, - day, - week, - month - } - /// - /// Tipo di esito (generico) - /// - public enum esitoExec - { - undone, - ok, - error - } + public enum IobType + { + /// + /// Non definito + /// + ND, - /// - /// Elenco task ammessi (x IOB-WIN da eseguire...) - /// - public enum taskType - { - /// - /// Task nullo / fake - /// - nihil, - /// - /// Rimanda a PLC eventuale segnale NON in setup (MA NON RESETTA) - /// - fixStopSetup, - /// - /// Indica al PLC di forzare il reset del contapezzi - /// - forceResetPzCount, - /// - /// Indica al PLC di forzare il NUOVO valore di contapezzi (impostato come value) - /// - forceSetPzCount, - /// - /// Imposta Articolo su PLC - /// - setArt, - /// - /// Imposta Commessa su PLC - /// - setComm, - /// - /// Set di un PARAMETRO su PLC (in value avremo un JSON object) - /// - setParameter, - /// - /// Set Programma CNC su PLC - /// - setProg, - /// - /// Indica al PLC di impostare il numero di pezzi da produrre per la commessa (impostato come value) - /// - setPzComm, - /// - /// Indica al PLC iniziato setup (e secondo casi ferma contapezzi /resetta) - /// - startSetup, - /// - /// Indica al PLC finito setup (e secondo casi ferma contapezzi /resetta) - /// - stopSetup, - /// - /// Richiesta invio watchdog a PLC - /// - sendWatchDogMes2Plc - } - /// - /// Tipologia di selettore - /// - public enum tipoSelettore - { - articoli - } - /// - /// Tipo di IOB - /// - public enum IobType - { - /// - /// Non definito - /// - ND, - /// - /// IOB rPI - /// - rPi, - /// - /// IOB Windows - /// - WIN - } + /// + /// IOB rPI + /// + rPi, - /// - /// tipologia di evento (generico) segnalato - /// - public enum tipoEvento - { - /// - /// evento di reset - /// - reset, - /// - /// richiesta editing - /// - edit, - /// - /// nuova selezione - /// - selection, - /// - /// eliminazione record(s) - /// - delete - } - public enum DataItemCategory - { - CONDITION = 0, - EVENT = 1, - SAMPLE = 2 - } + /// + /// IOB Windows + /// + WIN + } - public enum tipoBarcode - { /// - /// tipo non riconosciuto + /// Elenco dei tipi di valore gestiti da PLC (inizialmente SIEMENS) /// - nd, - /// - /// identifica una matricola operatore nel formato OPxxxxx (xxxxx è un intero che rappresenta la matricola, std fino a 8 cifre) - /// - matrOperatore, - /// - /// identifica un cartellino di tipo CodArticolo - /// - codArticolo, - /// - /// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione - /// - attrezzaggio, - /// - /// identifica un codice per le attività di conferma produzione/fermi - /// - confermaProduzione, - /// - /// identifica un cartellino di dichiarazione fermata nel formato FExxxx dove xxxx è idxEvento dichiarato... - /// - dichiaraFermata, - /// - /// indentifica un codice di modifica turno - /// - modificaTurno - } + public enum plcDataType + { + /// + /// Tipo boolean + /// + Boolean, + + /// + /// Tipo Int16 intero 16bit + /// + Int, + + /// + /// Tipo Int32 intero 32bit + /// + DInt, + + /// + /// Tipo UInt16, intero 16bit + /// + Word, + + /// + /// Tipo UInt32, intero Unsigned 32bit + /// + DWord, + + /// + /// Tipo REAL 32 bit + /// + Real, + + /// + /// Tipo stringa + /// + String + } - /// - /// Enumerazione tipi di semaforo - /// - public enum Semaforo - { /// - /// Stato non definito + /// Enumerazione tipi di semaforo /// - ND, + public enum Semaforo + { + /// + /// Stato non definito + /// + ND, + + /// + /// Verde + /// + SV, + + /// + /// Giallo + /// + SG, + + /// + /// Rosso + /// + SR, + + /// + /// Grigio/Spento + /// + SS + } + /// - /// Verde + /// Elenco task ammessi (x IOB-WIN da eseguire...) /// - SV, + public enum taskType + { + /// + /// Task nullo / fake + /// + nihil, + + /// + /// Rimanda a PLC eventuale segnale NON in setup (MA NON RESETTA) + /// + fixStopSetup, + + /// + /// Indica al PLC di forzare il reset del contapezzi + /// + forceResetPzCount, + + /// + /// Indica al PLC di forzare il NUOVO valore di contapezzi (impostato come value) + /// + forceSetPzCount, + + /// + /// Imposta Articolo su PLC + /// + setArt, + + /// + /// Imposta Commessa su PLC + /// + setComm, + + /// + /// Set di un PARAMETRO su PLC (in value avremo un JSON object) + /// + setParameter, + + /// + /// Set Programma CNC su PLC + /// + setProg, + + /// + /// Indica al PLC di impostare il numero di pezzi da produrre per la commessa (impostato come value) + /// + setPzComm, + + /// + /// Indica al PLC iniziato setup (e secondo casi ferma contapezzi /resetta) + /// + startSetup, + + /// + /// Indica al PLC finito setup (e secondo casi ferma contapezzi /resetta) + /// + stopSetup, + + /// + /// Richiesta invio watchdog a PLC + /// + sendWatchDogMes2Plc + } + /// - /// Giallo + /// Finestra temporale di aggregazione dati VC /// - SG, + public enum timeWindow + { + free, + hour, + day, + week, + month + } + + public enum tipoBarcode + { + /// + /// tipo non riconosciuto + /// + nd, + + /// + /// identifica una matricola operatore nel formato OPxxxxx (xxxxx è un intero che rappresenta la matricola, std fino a 8 cifre) + /// + matrOperatore, + + /// + /// identifica un cartellino di tipo CodArticolo + /// + codArticolo, + + /// + /// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione + /// + attrezzaggio, + + /// + /// identifica un codice per le attività di conferma produzione/fermi + /// + confermaProduzione, + + /// + /// identifica un cartellino di dichiarazione fermata nel formato FExxxx dove xxxx è idxEvento dichiarato... + /// + dichiaraFermata, + + /// + /// indentifica un codice di modifica turno + /// + modificaTurno + } + /// - /// Rosso + /// tipologia di evento (generico) segnalato /// - SR, + public enum tipoEvento + { + /// + /// evento di reset + /// + reset, + + /// + /// richiesta editing + /// + edit, + + /// + /// nuova selezione + /// + selection, + + /// + /// eliminazione record(s) + /// + delete + } + /// - /// Grigio/Spento + /// tipologia evento inviato /// - SS - } - -} + public enum tipoInputEvento + { + barcode, + hw + } + + /// + /// Tipologia di selettore + /// + public enum tipoSelettore + { + articoli + } + + /// + /// Tipologia di elaborazione/funzione da applicare a VC + /// + public enum VC_func + { + /// + /// Valore puntuale + /// + POINT = 0, + + /// + /// Valore medio del periodo + /// + AVG, + + /// + /// Valore massimo del periodo + /// + MAX, + + /// + /// Valore minimo del periodo + /// + MIN + } +} \ No newline at end of file diff --git a/MapoSDK/GlobalSuppressions.cs b/MapoSDK/GlobalSuppressions.cs new file mode 100644 index 00000000..6289bdd0 --- /dev/null +++ b/MapoSDK/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("Naming", "CA1707:Gli identificatori non devono contenere caratteri di sottolineatura", Justification = "", Scope = "type", Target = "~T:MapoSDK.VC_func")] diff --git a/MapoSDK/MapoSDK.csproj b/MapoSDK/MapoSDK.csproj index 5e0642a4..77287d09 100644 --- a/MapoSDK/MapoSDK.csproj +++ b/MapoSDK/MapoSDK.csproj @@ -54,6 +54,7 @@ MoonPro.cs +