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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-07 17:57:10 +01:00
parent 599910b0fe eeb34a41ec
commit f58469a9c8
9 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/DS_App.Designer.cs
Generated
+8 -1
View File
@@ -12466,6 +12466,7 @@ namespace AppData.DS_AppTableAdapters {
this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BasePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[9].Connection = this.Connection;
this._commandCollection[9].CommandText = "dbo.stp_Batch_resetNesting";
@@ -12657,7 +12658,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int redoPartValid(string BasePath) {
public virtual int redoPartValid(string BasePath, string Takt) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8];
if ((BasePath == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -12665,6 +12666,12 @@ namespace AppData.DS_AppTableAdapters {
else {
command.Parameters[1].Value = ((string)(BasePath));
}
if ((Takt == null)) {
command.Parameters[2].Value = global::System.DBNull.Value;
}
else {
command.Parameters[2].Value = ((string)(Takt));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
AppData/DS_App.xsd
+1
View File
@@ -123,6 +123,7 @@
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@BasePath" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Takt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
AppData/DS_App.xss
+3 -3
View File
@@ -6,7 +6,7 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-9" ViewPortY="9" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:BatchList" ZOrder="3" X="251" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BatchList" ZOrder="1" X="251" Y="375" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:StackList" ZOrder="13" X="584" Y="890" Height="343" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:SheetList" ZOrder="5" X="240" Y="793" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OrderList" ZOrder="23" X="352" Y="29" Height="324" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -25,8 +25,8 @@
<Shape ID="DesignTable:Order2FinalKit" ZOrder="10" X="13" Y="240" Height="134" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:Counters" ZOrder="6" X="16" Y="706" Height="172" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ErrorsLog" ZOrder="4" X="-6" Y="928" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ItemValidation" ZOrder="2" X="83" Y="1185" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:PartValidPareto" ZOrder="1" X="339" Y="1189" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ItemValidation" ZOrder="3" X="83" Y="1185" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:PartValidPareto" ZOrder="2" X="339" Y="1189" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_BatchReqList_OrderList" ZOrder="32" LineWidth="11">
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=155']) {
withEnv(['NEXT_BUILD_NUMBER=159']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'NKC'
NKC_WF/PartValidation.aspx.cs
+6
View File
@@ -7,6 +7,12 @@ namespace NKC_WF
protected void Page_Load(object sender, EventArgs e)
{
cmp_validationSummary.eh_doRefresh += Cmp_validationSummary_eh_doRefresh;
cmp_batchList.eh_doReset += Cmp_batchList_eh_doReset;
}
private void Cmp_batchList_eh_doReset(object sender, EventArgs e)
{
cmp_validationSummary.doUpdate(false);
}
private void Cmp_validationSummary_eh_doRefresh(object sender, EventArgs e)
NKC_WF/WebUserControls/cmp_batchList.ascx
+4 -5
View File
@@ -36,7 +36,6 @@
</asp:DropDownList>
&nbsp;
<uc1:cmp_numRow runat="server" ID="cmp_numRow" numRow="10" />
</div>
</div>
</div>
<div class="col-12">
@@ -54,7 +53,8 @@
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbRedoEval" runat="server" CausesValidation="False" CommandName="Cancel" CommandArgument='<%# Eval("Takt") %>' CssClass="btn btn-sm btn-info" Visible='<%# listMode== NKC_SDK.BatchListMode.PartsEval %>' ToolTip="Re-Validate single ITEM" OnClick="lbRedoEval_Click"><i class="fa fa-check-circle-o" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="" CssClass="btn btn-sm btn-primary" Visible='<%# listMode== NKC_SDK.BatchListMode.Standard %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Takt" HeaderText="#" InsertVisible="False" ReadOnly="True" SortExpression="Takt" />
@@ -65,9 +65,8 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Errors" SortExpression="Errors">
<ItemTemplate>
<asp:Label runat="server" ID="lblErrors" Text='<%# Eval("Errors") %>'></asp:Label>
<asp:HyperLink runat="server" ID="hlShowErr" NavigateUrl='<%# $"~/ErrorsLog?PUID=B.{Eval("BatchID")}" %>' CssClass="text-warning" Visible='<%# Eval("NumErrPre").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# Eval("NumErrPre") %> err</asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink1" NavigateUrl='<%# $"~/ErrorsLog?PUID={Eval("EnvNum")}" %>' CssClass="text-danger" Visible='<%# Eval("NumErr").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# Eval("NumErr") %> err</asp:HyperLink>
<asp:HyperLink runat="server" ID="hlShowErr" NavigateUrl='<%# $"~/ErrorsLog?PUID=B.{Eval("BatchID")}" %>' CssClass="text-warning" Visible='<%# Eval("NumErrPre").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %></asp:HyperLink>
<asp:HyperLink runat="server" ID="HyperLink1" NavigateUrl='<%# $"~/ErrorsLog?PUID={Eval("EnvNum")}" %>' CssClass="text-danger" Visible='<%# Eval("NumErr").ToString()!="0" %>' Target="_blank" ToolTip="Show errors"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %></asp:HyperLink>
</ItemTemplate>
<ItemStyle CssClass="text-right" />
</asp:TemplateField>
NKC_WF/WebUserControls/cmp_batchList.ascx.cs
+14
View File
@@ -1,5 +1,6 @@
using AppData;
using NKC_SDK;
using SteamWare;
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
@@ -168,6 +169,7 @@ namespace NKC_WF.WebUserControls
grView.SelectedIndex = -1;
grView.DataBind();
divDetail.Visible = false;
raiseReset();
}
/// <summary>
@@ -207,5 +209,17 @@ namespace NKC_WF.WebUserControls
{
checkFixOds();
}
protected void lbRedoEval_Click(object sender, EventArgs e)
{
LinkButton lbt = (LinkButton)sender;
if (!string.IsNullOrEmpty(lbt.CommandArgument))
{
// eseguo richiesta reset
DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"), lbt.CommandArgument);
// refresh!
resetSelezione();
}
}
}
}
NKC_WF/WebUserControls/cmp_validationSummary.ascx
+1 -1
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_validationSummary.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_validationSummary" %>
<div class="row">
<div class="col-3">
<h3>Validation Summary</h3>
<h4>Validation Summary</h4>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtForceRevali" CssClass="btn btn-sm btn-success btn-block" OnClientClick='return confirm("Are you sure you want to re-evaluate ALL items?")' OnClick="lbtForceRevali_Click"><i class="fa fa-bell" aria-hidden="true"></i> FORCE REVALIDATE </asp:LinkButton>
NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+10 -4
View File
@@ -57,11 +57,17 @@ namespace NKC_WF.WebUserControls
// update!
doUpdate();
}
private void doUpdate()
/// <summary>
/// Update forzato
/// </summary>
public void doUpdate(bool reportEvent = true)
{
fixVisibility();
frmView.DataBind();
raiseEvent();
if (reportEvent)
{
raiseEvent();
}
}
protected void lbtRevalAll_Click(object sender, EventArgs e)
@@ -83,7 +89,7 @@ namespace NKC_WF.WebUserControls
// rimetto da validare tramite stored
try
{
DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"));
DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"), "*");
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
}