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

Merge branch 'stable' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-25 16:23:06 +02:00
parent cf99ecdf85 9f6a4e62d1
commit d5c01a4475
7 changed files with 67 additions and 40 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=291']) {
withEnv(['NEXT_BUILD_NUMBER=292']) {
// 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/WebUserControls/cmp_batchDetail.ascx.cs
+6
View File
@@ -204,6 +204,12 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
internal void doUpdate()
{
frmView.DataBind();
}
/// <summary>
/// Effettua divisione evitando zeri a den...
/// </summary>
NKC_WF/WebUserControls/cmp_batchList.ascx
+4 -2
View File
@@ -78,8 +78,10 @@
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<asp:LinkButton ID="lbtEnableDel" runat="server" CssClass="btn btn-sm btn-danger" Visible='<%# listMode== NKC_SDK.BatchListMode.Standard && !deleteEnabled %>' ToolTip="Enable Delete ALL" OnClick="lbtEnableDel_Click"><i class="fa fa-eraser"></i></asp:LinkButton>
<asp:LinkButton ID="lbtDisableDel" runat="server" CssClass="btn btn-sm btn-success" Visible='<%# listMode== NKC_SDK.BatchListMode.Standard && deleteEnabled %>' ToolTip="Disable Delete ALL" OnClick="lbtDisableDel_Click"><i class="fa fa-eraser"></i></asp:LinkButton>
<div class="text-center">
<asp:LinkButton ID="lbtEnableDel" runat="server" CssClass="btn btn-sm btn-danger" Visible='<%# listMode== NKC_SDK.BatchListMode.Standard && !deleteEnabled %>' ToolTip="Enable Delete ALL" OnClick="lbtEnableDel_Click"><i class="fa fa-eraser"></i></asp:LinkButton>
<asp:LinkButton ID="lbtDisableDel" runat="server" CssClass="btn btn-sm btn-success" Visible='<%# listMode== NKC_SDK.BatchListMode.Standard && deleteEnabled %>' ToolTip="Disable Delete ALL" OnClick="lbtDisableDel_Click"><i class="fa fa-eraser"></i></asp:LinkButton>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-center">
NKC_WF/WebUserControls/cmp_batchList.ascx.cs
+1
View File
@@ -205,6 +205,7 @@ namespace NKC_WF.WebUserControls
public void doUpdate()
{
cmp_batchDetail.doUpdate();
grView.DataBind();
}
NKC_WF/WebUserControls/cmp_stackBuilding.ascx
+41 -37
View File
@@ -2,7 +2,6 @@
<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %>
<div class="row">
<div class="col-12">
<h3>BUNK BUILDING</h3>
@@ -23,43 +22,48 @@
<asp:HiddenField runat="server" ID="hfLastBCode" />
</div>
<div class="col-12 mb-2">
<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>
<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>
</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>
</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>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
+5
View File
@@ -184,5 +184,10 @@ namespace NKC_WF.WebUserControls
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
+9
View File
@@ -50,6 +50,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfLastBCode;
/// <summary>
/// Controllo updBunk.
/// </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>