diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj index 5acafb5..fbb4308 100644 --- a/AppData/AppData.csproj +++ b/AppData/AppData.csproj @@ -176,7 +176,6 @@ DS_Report.xsd - True True diff --git a/AppData/Objects.cs b/AppData/Objects.cs deleted file mode 100644 index ee94b26..0000000 --- a/AppData/Objects.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppData -{ - - /// - /// Struttura delel statistiche mostrate - /// - public class stats - { - /// - /// Variabili (red / yellow / green) - /// - public List vars { get; set; } - } - /// - /// Oggetto variabile da mostrare - /// - public class varData - { - /// - /// Nome variabile - /// - public string name { get; set; } = "A"; - /// - /// Valore variabile - /// - public string value { get; set; } = "0"; - } -} diff --git a/Jenkinsfile b/Jenkinsfile index 2eca4fb..47b08b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=203']) { + withEnv(['NEXT_BUILD_NUMBER=205']) { // env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/Content/SheetColor.css b/NKC_WF/Content/SheetColor.css index c89c8ce..fb3a967 100644 --- a/NKC_WF/Content/SheetColor.css +++ b/NKC_WF/Content/SheetColor.css @@ -1,6 +1,6 @@ /* ANIMAZIONE */ .strokeThick { - stroke-width: 10px !important; + stroke-width: 15px !important; } /* Animazione per richiamo attenzione*/ .flashStroke { @@ -49,10 +49,10 @@ fill: #ACACAC; } .VERDE { - fill: #28a745; + fill: #21CD39; } .BLU { - fill: #007bff; + fill: #0000FF; } .ARANCIO { fill: orange; @@ -63,9 +63,15 @@ .PURPLE { fill: purple; } +.ROSSO { + fill: red; +} .TESTO { fill: white; } +.NERO { + fill: black; +} /* Classi da sostituire dinamicamente*/ #BLK-BCK { /*background-image: url("../Images/MT0006110.jpg"); @@ -77,7 +83,7 @@ fill: #ACACAC; } #BLK-SEL { - fill: orange; + fill: yellow; stroke: yellow; /* Safari 4.0 - 8.0 */ -webkit-animation-name: doFlash; @@ -93,14 +99,14 @@ animation-delay: 0s; animation-iteration-count: infinite; animation-direction: alternate; - stroke-width: 10px !important; + stroke-width: 15px !important; } #BLK-BIN { - fill: #28a745; + fill: #0000FF; } #BLK-CART { - fill: #007bff; + fill: #21CD39; } #BLK-SEC-OP { - fill: purple; + fill: red; } \ No newline at end of file diff --git a/NKC_WF/Content/SheetColor.less b/NKC_WF/Content/SheetColor.less index f6ef8f1..7a1d39d 100644 --- a/NKC_WF/Content/SheetColor.less +++ b/NKC_WF/Content/SheetColor.less @@ -1,5 +1,5 @@ /* ANIMAZIONE */ -@borderThick: 10px; +@borderThick: 15px; .strokeThick { stroke-width: @borderThick !important; @@ -57,10 +57,10 @@ fill: #ACACAC; } .VERDE { - fill: #28a745; + fill: #21CD39; } .BLU { - fill: #007bff; + fill: #0000FF; } .ARANCIO { fill: orange; @@ -71,9 +71,15 @@ .PURPLE { fill: purple; } +.ROSSO { + fill: red; +} .TESTO { fill: white; } +.NERO { + fill: black; +} /* Classi da sostituire dinamicamente*/ #BLK-BCK { @@ -83,17 +89,17 @@ .GRIGIO; } #BLK-SEL { - .ARANCIO; + .GIALLO; .flashStroke; .strokeThick; } #BLK-BIN { - .VERDE; + .BLU; } #BLK-CART { - .BLU; + .VERDE; } #BLK-SEC-OP { - .PURPLE; + .ROSSO; } diff --git a/NKC_WF/Content/SheetColor.min.css b/NKC_WF/Content/SheetColor.min.css index 20847e4..f8ee14a 100644 --- a/NKC_WF/Content/SheetColor.min.css +++ b/NKC_WF/Content/SheetColor.min.css @@ -1 +1 @@ -.strokeThick{stroke-width:10px !important;}.flashStroke{stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes doFlash{0%{stroke:#f8fbff;}25%{stroke:#ff0;}50%{stroke:#f2f200;}75%{stroke:#d8d800;}100%{stroke:#bebe00;}}.SFONDO{fill:#dedede;}.GRIGIO{fill:#acacac;}.VERDE{fill:#28a745;}.BLU{fill:#007bff;}.ARANCIO{fill:orange;}.GIALLO{fill:yellow;}.PURPLE{fill:purple;}.TESTO{fill:white;}#BLK-BCK{fill:#dedede;}#BLK-CUT{fill:#acacac;}#BLK-SEL{fill:orange;stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;stroke-width:10px !important;}#BLK-BIN{fill:#28a745;}#BLK-CART{fill:#007bff;}#BLK-SEC-OP{fill:purple;} \ No newline at end of file +.strokeThick{stroke-width:15px !important;}.flashStroke{stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes doFlash{0%{stroke:#f8fbff;}25%{stroke:#ff0;}50%{stroke:#f2f200;}75%{stroke:#d8d800;}100%{stroke:#bebe00;}}.SFONDO{fill:#dedede;}.GRIGIO{fill:#acacac;}.VERDE{fill:#21cd39;}.BLU{fill:#00f;}.ARANCIO{fill:orange;}.GIALLO{fill:yellow;}.PURPLE{fill:purple;}.ROSSO{fill:red;}.TESTO{fill:white;}.NERO{fill:black;}#BLK-BCK{fill:#dedede;}#BLK-CUT{fill:#acacac;}#BLK-SEL{fill:yellow;stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;stroke-width:15px !important;}#BLK-BIN{fill:#00f;}#BLK-CART{fill:#21cd39;}#BLK-SEC-OP{fill:red;} \ No newline at end of file diff --git a/NKC_WF/Controllers/getMUCssController.cs b/NKC_WF/Controllers/getMUCssController.cs index 84dd481..05f36d0 100644 --- a/NKC_WF/Controllers/getMUCssController.cs +++ b/NKC_WF/Controllers/getMUCssController.cs @@ -29,10 +29,17 @@ namespace NKC_WF.Controllers string filename = HttpContext.Current.Server.MapPath("~/Content/SheetColor.css"); answ = File.ReadAllText(filename); - // imposto sfondo ... + // imposto sfondo ... NON usato answ = answ.Replace("#BLK-BCK", "#Sheet"); + + // All'inizio --> tutti colorati secondo destinazione (cart, bin, secop) + + // eventualmente sec-op è SECONDO css aggiuntivo opzionale x indicare tratteggiato e/o tratteggiato + flashing... + + // ...e primi 3 items... - answ = answ.Replace("#BLK-CUT", "#IT00008594, #IT000085AC, #IT000085AD, #IT000085AE, #IT000085AF"); + answ = answ.Replace("#BLK-CUT", "#IT00008594, #IT000085AC, #IT000085AD, #IT000085AE"); + answ = answ.Replace("#BLK-SEC-OP", "#IT000085AF"); answ = answ.Replace("#BLK-SEL", "#IT000085C2"); answ = answ.Replace("#BLK-BIN", "#IT000085BE"); answ = answ.Replace("#BLK-CART", "#IT000085AB"); diff --git a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx index f067822..5e60ee7 100644 --- a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx @@ -1,38 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_singleStat.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_singleStat" %> -
-
-
-
- - - - - - - - - - - - - - - -
- - -
- - -
-
-
- - +
-
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs index 463c1e0..6c2dcb7 100644 --- a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs @@ -44,63 +44,19 @@ namespace NKC_WF.WebUserControls } } - protected void Page_Load(object sender, EventArgs e) { } /// /// Css titolo /// - public string titleCss = "bg-dark text-light"; - /// - /// Css titolo - /// - public string title = "NONE"; - + public string titleCss { get; set; } = "bg-dark text-light"; /// /// Valirizzazione variabili /// public void doUpdate() { - h5Title.Attributes.Remove("class"); - h5Title.Attributes.Add("class", $"card-header py-1 {titleCss}"); - lblTitle.Text = title; -#if true - // titoli - try - { - lblTitRed.Text = currStat.vars[0].name; - lblTitYel.Text = currStat.vars[1].name; - lblTitGre.Text = currStat.vars[2].name; - // valori - lblValRed.Text = currStat.vars[0].value; - lblValYel.Text = currStat.vars[1].value; - lblValGre.Text = currStat.vars[2].value; - } - catch - { } -#endif + frmView.DataBind(); } - - /// - /// Statistiche salvate (locali) - /// - protected stats _currStat { get; set; } - /// - /// Statistiche da mostrare - /// - public stats currStat - { - get - { - return _currStat; - } - set - { - _currStat = value; - doUpdate(); - } - } - } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.designer.cs index 36aa0c9..c635b58 100644 --- a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.designer.cs @@ -14,78 +14,6 @@ namespace NKC_WF.WebUserControls public partial class cmp_MU_singleStat { - /// - /// Controllo h5Title. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl h5Title; - - /// - /// Controllo lblTitle. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblTitle; - - /// - /// Controllo lblTitRed. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblTitRed; - - /// - /// Controllo lblTitYel. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblTitYel; - - /// - /// Controllo lblTitGre. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblTitGre; - - /// - /// Controllo lblValRed. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblValRed; - - /// - /// Controllo lblValYel. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblValYel; - - /// - /// Controllo lblValGre. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblValGre; - /// /// Controllo frmView. /// diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx b/NKC_WF/WebUserControls/cmp_MU_stats.ascx index dcc178e..cff9501 100644 --- a/NKC_WF/WebUserControls/cmp_MU_stats.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx @@ -6,123 +6,22 @@
-
-
BINS
-
-
- - - - - - - - - - - - - - -
WAITWIPDONE
1235
-
-
- -
-
-
SHIFT B20190916.0
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
2540%
-
-
+
- - <%--
-
BUNK ST00000A2
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
31225%
-
-
--%> + +
+
+ +
+
+
-
-
SHEET SH00000123
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
52520%
-
-
-
-
-
-
CARTS
-
- - - - - - - - - - - - - - - -
WAITWIPDONE
2426
-
-
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs index d0375d8..38f5b3a 100644 --- a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs @@ -33,24 +33,34 @@ namespace NKC_WF.WebUserControls } public void doUpdate() { - // leggo stats e compongo - List variabili = new List(); - variabili.Add(new varData { name = "WAIT", value = "2" }); - variabili.Add(new varData { name = "WIP", value = "1" }); - variabili.Add(new varData { name = "DONE", value = "3" }); - stats bunkStsat = new stats - { - vars = variabili - }; - cmp_MU_singleStatBunk.titleCss = "bg-secondary text-light"; + // fix x BIN + cmp_MU_singleStatBin.BatchId = BatchId; + cmp_MU_singleStatBin.statLevel = (int)StatType.BIN; + cmp_MU_singleStatBin.titleCss = "bg-primary text-light"; + + + // fix x BATCH + cmp_MU_singleStatBatch.BatchId = BatchId; + cmp_MU_singleStatBatch.statLevel = (int)StatType.BATCH; + cmp_MU_singleStatBatch.titleCss = "bg-info"; + + // fix x BUNK cmp_MU_singleStatBunk.BatchId = BatchId; - cmp_MU_singleStatBunk.statLevel= (int)StatType.BUNK; + cmp_MU_singleStatBunk.statLevel = (int)StatType.BUNK; + cmp_MU_singleStatBunk.titleCss = "bg-secondary text-light"; + // fix x SHEET + cmp_MU_singleStatSheet.BatchId = BatchId; + cmp_MU_singleStatSheet.statLevel = (int)StatType.SHEET; + cmp_MU_singleStatSheet.titleCss = "bg-warning"; + + // fix x CART + cmp_MU_singleStatCart.BatchId = BatchId; + cmp_MU_singleStatCart.statLevel = (int)StatType.CART; + cmp_MU_singleStatCart.titleCss = "bg-success"; - cmp_MU_singleStatBunk.title = "BUNK"; - cmp_MU_singleStatBunk.currStat = bunkStsat; } /// /// Calcola il rapporto tra 2 valori diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs index 2763d2c..ff455c4 100644 --- a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs @@ -23,6 +23,24 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + /// + /// Controllo cmp_MU_singleStatBin. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_singleStat cmp_MU_singleStatBin; + + /// + /// Controllo cmp_MU_singleStatBatch. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_singleStat cmp_MU_singleStatBatch; + /// /// Controllo cmp_MU_singleStatBunk. /// @@ -31,5 +49,23 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_MU_singleStat cmp_MU_singleStatBunk; + + /// + /// Controllo cmp_MU_singleStatSheet. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_singleStat cmp_MU_singleStatSheet; + + /// + /// Controllo cmp_MU_singleStatCart. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_singleStat cmp_MU_singleStatCart; } }