diff --git a/Jenkinsfile b/Jenkinsfile index 7f78fc1..f840ea5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=222']) { + withEnv(['NEXT_BUILD_NUMBER=223']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index eef82dc..83246ea 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -375,7 +375,7 @@ - + @@ -780,12 +780,12 @@ cmp_BP_bunkList.ascx - - cmp_BU_sheetList.ascx + + cmp_BP_sheetList.ascx ASPXCodeBehind - - cmp_BU_sheetList.ascx + + cmp_BP_sheetList.ascx cmp_devUtils.ascx diff --git a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs index 056be76..8970f04 100644 --- a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs @@ -92,7 +92,7 @@ namespace NKC_WF.WebUserControls /// /// StackId selezionato /// - public int StackIdSel + public int BunkIdSel { get { diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx new file mode 100644 index 0000000..48ae5c5 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_BP_sheetList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_BP_sheetList" %> + + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs new file mode 100644 index 0000000..63f4aa0 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_BP_sheetList : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Batch corrente... + /// + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } + /// + /// Bunk corrente... + /// + public int BunkId + { + set + { + hfStackID.Value = value.ToString(); + } + get + { + int answ = 0; + int.TryParse(hfStackID.Value, out answ); + return answ; + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.designer.cs new file mode 100644 index 0000000..1a75f88 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_BP_sheetList + { + + /// + /// Controllo hfBatchID. + /// + /// + /// 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.HiddenField hfBatchID; + + /// + /// Controllo hfStackID. + /// + /// + /// 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.HiddenField hfStackID; + } +} diff --git a/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx b/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx deleted file mode 100644 index 5f69f22..0000000 --- a/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx +++ /dev/null @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_BU_sheetList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_BU_sheetList" %> diff --git a/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.cs b/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.cs deleted file mode 100644 index 1942e51..0000000 --- a/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace NKC_WF.WebUserControls -{ - public partial class cmp_BU_sheetList : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.designer.cs deleted file mode 100644 index f5855ae..0000000 --- a/NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.designer.cs +++ /dev/null @@ -1,17 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. -// -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// -//------------------------------------------------------------------------------ - -namespace NKC_WF.WebUserControls -{ - - - public partial class cmp_BU_sheetList - { - } -} diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx index 35c0bb7..8d1ca50 100644 --- a/NKC_WF/site/BatchPreview.aspx +++ b/NKC_WF/site/BatchPreview.aspx @@ -1,7 +1,10 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="BatchPreview.aspx.cs" Inherits="NKC_WF.site.BatchPreview" %> <%@ Register Src="~/WebUserControls/cmp_BP_bunkList.ascx" TagPrefix="uc1" TagName="cmp_BP_bunkList" %> -<%@ Register Src="~/WebUserControls/cmp_BU_sheetList.ascx" TagPrefix="uc1" TagName="cmp_BU_sheetList" %> +<%@ Register Src="~/WebUserControls/cmp_MU_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_MU_svgViewer" %> +<%@ Register Src="~/WebUserControls/cmp_BP_sheetList.ascx" TagPrefix="uc1" TagName="cmp_BP_sheetList" %> + + @@ -9,14 +12,14 @@
- +

Batch preview - start | pause | stop

- Immagine corrente +
- +
diff --git a/NKC_WF/site/BatchPreview.aspx.cs b/NKC_WF/site/BatchPreview.aspx.cs index e3b95c0..ca8c7a1 100644 --- a/NKC_WF/site/BatchPreview.aspx.cs +++ b/NKC_WF/site/BatchPreview.aspx.cs @@ -39,13 +39,15 @@ namespace NKC_WF.site { get { - return cmp_BP_bunkList.StackIdSel; + return cmp_BP_bunkList.BunkIdSel; } } private void doUpdate() { cmp_BP_bunkList.BatchId = BatchId; + cmp_BP_sheetList.BatchId = BatchId; + cmp_BP_sheetList.BunkId = cmp_BP_bunkList.BunkIdSel; } /// diff --git a/NKC_WF/site/BatchPreview.aspx.designer.cs b/NKC_WF/site/BatchPreview.aspx.designer.cs index 78dc727..6395e3f 100644 --- a/NKC_WF/site/BatchPreview.aspx.designer.cs +++ b/NKC_WF/site/BatchPreview.aspx.designer.cs @@ -33,12 +33,21 @@ namespace NKC_WF.site protected global::NKC_WF.WebUserControls.cmp_BP_bunkList cmp_BP_bunkList; /// - /// Controllo cmp_BU_sheetList. + /// Controllo cmp_MU_svgViewer. /// /// /// 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_BU_sheetList cmp_BU_sheetList; + protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer; + + /// + /// Controllo cmp_BP_sheetList. + /// + /// + /// 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_BP_sheetList cmp_BP_sheetList; } }