diff --git a/MP-MON/Content/Site.css b/MP-MON/Content/Site.css index 8342ec80..5a0fd30f 100644 --- a/MP-MON/Content/Site.css +++ b/MP-MON/Content/Site.css @@ -2,229 +2,300 @@ @import url('fonts.min.css'); /* Gestione blocchi base */ 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; + 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; + 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; - } - body { - font-size: 0.8em; - } - .logoImg { - height: 30px; - } + .mainHead { + font-size: 1.3em; + } + + body { + font-size: 0.8em; + } + + .logoImg { + height: 30px; + } } + @media all and (min-width: 768px) { - .mainHead { - font-size: 1.4em; - } - body { - font-size: 1em; - } - .logoImg { - height: 35px; - } + .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; - } + .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; - } + .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; - } + .mainHead { + font-size: 1.6em; + } + + body { + font-size: 1.6em; + } + + .logoImg { + height: 60px; + } } + +@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: 0.7em; - } - .logoImg { - height: 25px; - } + .mainHead { + font-size: 1em; + } + + body { + font-size: 0.7em; + } + + .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 { - padding-left: 0.2em; - padding-right: 0.2em; + padding-left: 0.2em; + padding-right: 0.2em; } + .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; } /*------------------------------------------------------------------ [ Shortcuts / .shortcuts ] */ .shortcuts { - text-align: center; + 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(#ffffff), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); - background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); - background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 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(#ffffff), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); - background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); - background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 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, 0.125); -} -.shortcuts .shortcut-sm:active { - box-shadow: inset 0 3px 5px rgba(0, 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 + + .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(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 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(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 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, 0.125); + } + + .shortcuts .shortcut-sm:active { + box-shadow: inset 0 3px 5px rgba(0, 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/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/MP-MON.csproj b/MP-MON/MP-MON.csproj index 5687c511..319abc4e 100644 --- a/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON.csproj @@ -671,9 +671,11 @@ + + \ No newline at end of file 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/compilerconfig.json b/MP-MON/compilerconfig.json index 76d055c8..d29ff5c5 100644 --- a/MP-MON/compilerconfig.json +++ b/MP-MON/compilerconfig.json @@ -1,14 +1,13 @@ -[ - { - "outputFile": "Content/Site.css", - "inputFile": "Content/Site.less" - }, - { - "outputFile": "Content/fonts.css", - "inputFile": "Content/fonts.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/packages.config b/MP-MON/packages.config index a982ec9b..0460c74f 100644 --- a/MP-MON/packages.config +++ b/MP-MON/packages.config @@ -4,6 +4,7 @@ + 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 +