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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-25 17:10:37 +02:00
parent e08bde68e3 f2a24318ca
commit 9d48d876c2
9 changed files with 224 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=293']) {
withEnv(['NEXT_BUILD_NUMBER=295']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/NKC_WF.csproj
+8
View File
@@ -430,6 +430,7 @@
<Content Include="WebUserControls\cmp_scrapList.ascx" />
<Content Include="WebUserControls\cmp_searchItems.ascx" />
<Content Include="WebUserControls\cmp_slider.ascx" />
<Content Include="WebUserControls\cmp_StackBuildDetail.ascx" />
<Content Include="WebUserControls\cmp_stackBuilding.ascx" />
<Content Include="WebUserControls\cmp_stackList.ascx" />
<Content Include="WebUserControls\cmp_stackLoading.ascx" />
@@ -1194,6 +1195,13 @@
<Compile Include="WebUserControls\cmp_slider.ascx.designer.cs">
<DependentUpon>cmp_slider.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_StackBuildDetail.ascx.cs">
<DependentUpon>cmp_StackBuildDetail.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_StackBuildDetail.ascx.designer.cs">
<DependentUpon>cmp_StackBuildDetail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_stackBuilding.ascx.cs">
<DependentUpon>cmp_stackBuilding.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/WebUserControls/cmp_StackBuildDetail.ascx
+44
View File
@@ -0,0 +1,44 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_StackBuildDetail.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_StackBuildDetail" %>
<%--<asp:UpdatePanel ID="updBunk" runat="server">
<ContentTemplate>--%>
<asp:CheckBox runat="server" ID="chkRedux" Checked="true" Text="Summary" AutoPostBack="true" />
<asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="row text-center my-1">
<div class="col-1 px-0 col-lg-3 px-lg-2 text-right">
<asp:Label runat="server" ID="lblNext" CssClass="text-primary px-1" Width="100%" Visible='<%# Eval("IsNext").ToString()=="1" %>'><span class="d-none d-lg-inline">NEXT </span><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:Label>
<asp:Label runat="server" ID="lblDone" CssClass="text-success px-1" Visible='<%# Eval("Prepared").ToString()!="" %>'><span class="d-none d-lg-inline"><%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %></span><i class="fa fa-check-circle" aria-hidden="true"></i></asp:Label>
</div>
<div runat="server" id="divMain" class='<%# "col-11 col-lg-9 " + cssByPrepared(Eval("Prepared"),Eval("IsNext")) %>'>
<div class="row">
<div class="col-1 px-0 col-md-2 px-md-2 font-weight-bold"><%# Eval("SheetIndex") %></div>
<div class="col-8 col-md-8 px-md-2 text-truncate"><%# Eval("MatDesc") %></div>
<div class="col-3 col-md-2 small text-right text-truncate"><b><%# Eval("MatExtCode") %></b></div>
</div>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:HiddenField ID="hfStackId" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStackRedux" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="chkRedux" DefaultValue="0" Name="Redux" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Repeater ID="repProgress" runat="server" DataSourceID="odsAdvance">
<ItemTemplate>
<div class="progress">
<div class="progress-bar" style='<%# getProgressStyle(Eval("NumSheetsPrepared"), Eval("NumSheets")) %>'></div>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource runat="server" ID="odsAdvance" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<%--<asp:Timer runat="server" Interval="1000" OnTick="Unnamed1_Tick"></asp:Timer>
</ContentTemplate>
</asp:UpdatePanel>--%>
NKC_WF/WebUserControls/cmp_StackBuildDetail.ascx.cs
+84
View File
@@ -0,0 +1,84 @@
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_StackBuildDetail : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
public string cssFlashNext(object _isNext)
{
string answ = "";
if (_isNext.ToString() == "1")
{
answ = " flashColor";
}
return answ;
}
public string cssByPrepared(object _prepared, object _isNext)
{
string answ = "table-secondary border border-secondary border-thick rounded";
if (_isNext.ToString() == "1")
{
answ = "table-primary flashColor rounded";
}
else
{
if (!string.IsNullOrEmpty(_prepared.ToString()))
{
answ = "table-success border border-success border-thick rounded";
}
}
return answ;
}
public string getProgressStyle(object _num, object _den)
{
string answ = "width: 10%";
int num = 0;
int den = 1;
int.TryParse(_num.ToString(), out num);
int.TryParse(_den.ToString(), out den);
answ = $"width: {num * 100 / den}%";
return answ;
}
#if false
protected void Unnamed1_Tick(object sender, EventArgs e)
{
doUpdate();
}
#endif
public void doUpdate()
{
repCtrl.DataBind();
repProgress.DataBind();
}
public int StackId
{
set
{
hfStackId.Value = value.ToString();
doUpdate();
}
get
{
int answ = 0;
int.TryParse(hfStackId.Value, out answ);
return answ;
}
}
}
}
NKC_WF/WebUserControls/cmp_StackBuildDetail.ascx.designer.cs
Generated
+71
View File
@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <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_StackBuildDetail
{
/// <summary>
/// Controllo chkRedux.
/// </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.CheckBox chkRedux;
/// <summary>
/// Controllo repCtrl.
/// </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.Repeater repCtrl;
/// <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;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
/// <summary>
/// Controllo repProgress.
/// </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.Repeater repProgress;
/// <summary>
/// Controllo odsAdvance.
/// </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.ObjectDataSource odsAdvance;
}
}
NKC_WF/WebUserControls/cmp_barcode.ascx.cs
+4 -5
View File
@@ -12,10 +12,10 @@ namespace NKC_WF.WebUserControls
resetInput();
resetMessage();
}
else if (string.IsNullOrEmpty(inputAcquired))
{
checkRaiseEv();
}
//else if (string.IsNullOrEmpty(inputAcquired))
//{
// checkRaiseEv();
//}
}
/// <summary>
/// evento modifica testo
@@ -85,7 +85,6 @@ namespace NKC_WF.WebUserControls
/// <returns></returns>
public void resetInput()
{
//inputAcquired = "";
valueRead = "";
txtBarcode.Focus();
}
NKC_WF/WebUserControls/cmp_stackBuilding.ascx
+3 -42
View File
@@ -1,5 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_stackBuilding.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_stackBuilding" %>
<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %>
<%@ Register Src="~/WebUserControls/cmp_StackBuildDetail.ascx" TagPrefix="uc1" TagName="cmp_StackBuildDetail" %>
<div class="row">
@@ -22,48 +24,7 @@
<asp:HiddenField runat="server" ID="hfLastBCode" />
</div>
<div class="col-12 mb-2">
<asp:UpdatePanel ID="updBunk" runat="server">
<ContentTemplate>
<asp:CheckBox runat="server" ID="chkRedux" Checked="true" Text="Summary" AutoPostBack="true" />
<asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="row text-center my-1">
<div class="col-1 px-0 col-lg-3 px-lg-2 text-right">
<asp:Label runat="server" ID="lblNext" CssClass="text-primary px-1" Width="100%" Visible='<%# Eval("IsNext").ToString()=="1" %>'><span class="d-none d-lg-inline">NEXT </span><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:Label>
<asp:Label runat="server" ID="lblDone" CssClass="text-success px-1" Visible='<%# Eval("Prepared").ToString()!="" %>'><span class="d-none d-lg-inline"><%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %></span><i class="fa fa-check-circle" aria-hidden="true"></i></asp:Label>
</div>
<div runat="server" id="divMain" class='<%# "col-11 col-lg-9 " + cssByPrepared(Eval("Prepared"),Eval("IsNext")) %>'>
<div class="row">
<div class="col-1 px-0 col-md-2 px-md-2 font-weight-bold"><%# Eval("SheetIndex") %></div>
<div class="col-8 col-md-8 px-md-2 text-truncate"><%# Eval("MatDesc") %></div>
<div class="col-3 col-md-2 small text-right text-truncate"><b><%# Eval("MatExtCode") %></b></div>
</div>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:HiddenField ID="hfStackId" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStackRedux" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="chkRedux" DefaultValue="0" Name="Redux" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Repeater ID="repProgress" runat="server" DataSourceID="odsAdvance">
<ItemTemplate>
<div class="progress">
<div class="progress-bar" style='<%# getProgressStyle(Eval("NumSheetsPrepared"), Eval("NumSheets")) %>'></div>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource runat="server" ID="odsAdvance" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Timer runat="server" Interval="1000" OnTick="Unnamed1_Tick"></asp:Timer>
</ContentTemplate>
</asp:UpdatePanel>
<uc1:cmp_StackBuildDetail runat="server" ID="cmp_StackBuildDetail" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
+7 -47
View File
@@ -45,6 +45,7 @@ namespace NKC_WF.WebUserControls
private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
{
bool doRaiseEv = false;
lastCmd = cmp_barcode.inputAcquired.ToUpper();
processLastCmd(doRaiseEv);
@@ -85,7 +86,6 @@ namespace NKC_WF.WebUserControls
cmp_barcode.showOutput("badge badge-success", $"SHEET RECORDED: {decoData.description}");
// chiamo stored x indicare preparato
DataLayer.man.taSHL.setPrepared(nextTbl[0].SheetID);
cmp_barcode.resetInput();
}
else
{
@@ -108,13 +108,15 @@ namespace NKC_WF.WebUserControls
default:
break;
}
lastCmd = "";
cmp_barcode.inputAcquired = "";
cmp_barcode.resetInput();
return doRaiseEv;
}
public void doUpdate()
{
repCtrl.DataBind();
repProgress.DataBind();
cmp_StackBuildDetail.doUpdate();
checkPrint();
}
@@ -122,7 +124,7 @@ namespace NKC_WF.WebUserControls
{
set
{
hfStackId.Value = value.ToString();
cmp_StackBuildDetail.StackId = value;
lastCmd = "";
cmp_barcode.resetMessage();
ComLib.updateBatchPositionByBunk(value);
@@ -130,37 +132,10 @@ namespace NKC_WF.WebUserControls
}
get
{
int answ = 0;
int.TryParse(hfStackId.Value, out answ);
return answ;
return cmp_StackBuildDetail.StackId;
}
}
public string cssFlashNext(object _isNext)
{
string answ = "";
if (_isNext.ToString() == "1")
{
answ = " flashColor";
}
return answ;
}
public string cssByPrepared(object _prepared, object _isNext)
{
string answ = "table-secondary border border-secondary border-thick rounded";
if (_isNext.ToString() == "1")
{
answ = "table-primary flashColor rounded";
}
else
{
if (!string.IsNullOrEmpty(_prepared.ToString()))
{
answ = "table-success border border-success border-thick rounded";
}
}
return answ;
}
/// <summary>
/// Chiesta stampa stack corrente
/// </summary>
@@ -175,20 +150,5 @@ namespace NKC_WF.WebUserControls
ComLib.updateBatchPositionByBunk(StackId);
}
public string getProgressStyle(object _num, object _den)
{
string answ = "width: 10%";
int num = 0;
int den = 1;
int.TryParse(_num.ToString(), out num);
int.TryParse(_den.ToString(), out den);
answ = $"width: {num * 100 / den}%";
return answ;
}
protected void Unnamed1_Tick(object sender, EventArgs e)
{
doUpdate();
}
}
}
NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs
Generated
+2 -56
View File
@@ -51,66 +51,12 @@ namespace NKC_WF.WebUserControls
protected global::System.Web.UI.WebControls.HiddenField hfLastBCode;
/// <summary>
/// Controllo updBunk.
/// Controllo cmp_StackBuildDetail.
/// </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.UpdatePanel updBunk;
/// <summary>
/// Controllo chkRedux.
/// </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.CheckBox chkRedux;
/// <summary>
/// Controllo repCtrl.
/// </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.Repeater repCtrl;
/// <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;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
/// <summary>
/// Controllo repProgress.
/// </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.Repeater repProgress;
/// <summary>
/// Controllo odsAdvance.
/// </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.ObjectDataSource odsAdvance;
protected global::NKC_WF.WebUserControls.cmp_StackBuildDetail cmp_StackBuildDetail;
}
}