Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continuo aggiunta componenti blocco preview

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-25 16:27:46 +01:00
parent c9aeb349b4
commit e73905753d
12 changed files with 116 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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}')
NKC_WF/NKC_WF.csproj
+5 -5
View File
@@ -375,7 +375,7 @@
<Content Include="WebUserControls\cmp_batchDetail.ascx" />
<Content Include="WebUserControls\cmp_batchList.ascx" />
<Content Include="WebUserControls\cmp_BP_bunkList.ascx" />
<Content Include="WebUserControls\cmp_BU_sheetList.ascx" />
<Content Include="WebUserControls\cmp_BP_sheetList.ascx" />
<Content Include="WebUserControls\cmp_devUtils.ascx" />
<Content Include="WebUserControls\cmp_ErrorsLog.ascx" />
<Content Include="WebUserControls\cmp_fileUpload.ascx" />
@@ -780,12 +780,12 @@
<Compile Include="WebUserControls\cmp_BP_bunkList.ascx.designer.cs">
<DependentUpon>cmp_BP_bunkList.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_BU_sheetList.ascx.cs">
<DependentUpon>cmp_BU_sheetList.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_BP_sheetList.ascx.cs">
<DependentUpon>cmp_BP_sheetList.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_BU_sheetList.ascx.designer.cs">
<DependentUpon>cmp_BU_sheetList.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_BP_sheetList.ascx.designer.cs">
<DependentUpon>cmp_BP_sheetList.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_devUtils.ascx.cs">
<DependentUpon>cmp_devUtils.ascx</DependentUpon>
NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace NKC_WF.WebUserControls
/// <summary>
/// StackId selezionato
/// </summary>
public int StackIdSel
public int BunkIdSel
{
get
{
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx
+4
View File
@@ -0,0 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_BP_sheetList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_BP_sheetList" %>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfStackID" runat="server" />
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
+49
View File
@@ -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)
{
}
/// <summary>
/// Batch corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
/// <summary>
/// Bunk corrente...
/// </summary>
public int BunkId
{
set
{
hfStackID.Value = value.ToString();
}
get
{
int answ = 0;
int.TryParse(hfStackID.Value, out answ);
return answ;
}
}
}
}
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.designer.cs
Generated
+35
View File
@@ -0,0 +1,35 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_BP_sheetList
{
/// <summary>
/// Controllo hfBatchID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
/// <summary>
/// Controllo hfStackID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfStackID;
}
}
NKC_WF/WebUserControls/cmp_BU_sheetList.ascx
-1
View File
@@ -1 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_BU_sheetList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_BU_sheetList" %>
NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.cs
-17
View File
@@ -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)
{
}
}
}
NKC_WF/WebUserControls/cmp_BU_sheetList.ascx.designer.cs
Generated
-17
View File
@@ -1,17 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_BU_sheetList
{
}
}
NKC_WF/site/BatchPreview.aspx
+7 -4
View File
@@ -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 @@
<asp:HiddenField ID="hfBatchID" runat="server" />
<div class="row text-center">
<div class="col-2">
<uc1:cmp_bp_bunklist runat="server" id="cmp_BP_bunkList" />
<uc1:cmp_BP_bunkList runat="server" id="cmp_BP_bunkList" />
</div>
<div class="col-8">
<h3>Batch preview - start | pause | stop</h3>
Immagine corrente
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
</div>
<div class="col-2">
<uc1:cmp_BU_sheetList runat="server" id="cmp_BU_sheetList" />
<uc1:cmp_BP_sheetList runat="server" id="cmp_BP_sheetList" />
</div>
</div>
</asp:Content>
NKC_WF/site/BatchPreview.aspx.cs
+3 -1
View File
@@ -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;
}
/// <summary>
NKC_WF/site/BatchPreview.aspx.designer.cs
Generated
+11 -2
View File
@@ -33,12 +33,21 @@ namespace NKC_WF.site
protected global::NKC_WF.WebUserControls.cmp_BP_bunkList cmp_BP_bunkList;
/// <summary>
/// Controllo cmp_BU_sheetList.
/// Controllo cmp_MU_svgViewer.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_BU_sheetList cmp_BU_sheetList;
protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer;
/// <summary>
/// Controllo cmp_BP_sheetList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_BP_sheetList cmp_BP_sheetList;
}
}