Merge branch 'develop' into SDK

This commit is contained in:
Samuele E. Locatelli
2020-08-25 11:17:23 +02:00
24 changed files with 1375 additions and 53 deletions
+870 -3
View File
File diff suppressed because it is too large Load Diff
+97 -2
View File
@@ -3030,8 +3030,9 @@ FROM v_OKIB</CommandText>
<MainSource>
<DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.v_Pack2Cart" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT PackListID, CartID, CartIndex, CartDtmx, Started, Completed FROM v_Pack2Cart</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT *
FROM v_Pack2Cart</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
@@ -3042,6 +3043,8 @@ FROM v_OKIB</CommandText>
<Mapping SourceColumn="CartID" DataSetColumn="CartID" />
<Mapping SourceColumn="CartIndex" DataSetColumn="CartIndex" />
<Mapping SourceColumn="CartDtmx" DataSetColumn="CartDtmx" />
<Mapping SourceColumn="OrderExtCode" DataSetColumn="OrderExtCode" />
<Mapping SourceColumn="FamilyCode" DataSetColumn="FamilyCode" />
<Mapping SourceColumn="Started" DataSetColumn="Started" />
<Mapping SourceColumn="Completed" DataSetColumn="Completed" />
</Mappings>
@@ -3059,6 +3062,33 @@ FROM v_OKIB</CommandText>
</DbSource>
</Sources>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="CartIRKTableAdapter" GeneratorDataComponentClassName="CartIRKTableAdapter" Name="CartIRK" UserDataComponentName="CartIRKTableAdapter">
<MainSource>
<DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_IRKSum_getByCart" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_IRKSum_getByCart</CommandText>
<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="int" DbType="Int32" Direction="Input" ParameterName="@CartID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="OrderExtCode" DataSetColumn="OrderExtCode" />
<Mapping SourceColumn="CartDtmx" DataSetColumn="CartDtmx" />
<Mapping SourceColumn="ItemExtCode" DataSetColumn="ItemExtCode" />
<Mapping SourceColumn="ItemDesc" DataSetColumn="ItemDesc" />
<Mapping SourceColumn="ItemNote" DataSetColumn="ItemNote" />
<Mapping SourceColumn="TotReq" DataSetColumn="TotReq" />
<Mapping SourceColumn="TotCur" DataSetColumn="TotCur" />
<Mapping SourceColumn="MatExtCode" DataSetColumn="MatExtCode" />
<Mapping SourceColumn="MatDesc" DataSetColumn="MatDesc" />
</Mappings>
<Sources />
</TableAdapter>
</Tables>
<Sources />
</DataSource>
@@ -4329,11 +4359,76 @@ FROM v_OKIB</CommandText>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="OrderExtCode" msprop:Generator_ColumnVarNameInTable="columnOrderExtCode" msprop:Generator_ColumnPropNameInRow="OrderExtCode" msprop:Generator_ColumnPropNameInTable="OrderExtCodeColumn" msprop:Generator_UserColumnName="OrderExtCode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="250" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="FamilyCode" msprop:Generator_ColumnVarNameInTable="columnFamilyCode" msprop:Generator_ColumnPropNameInRow="FamilyCode" msprop:Generator_ColumnPropNameInTable="FamilyCodeColumn" msprop:Generator_UserColumnName="FamilyCode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="250" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Started" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnStarted" msprop:Generator_ColumnPropNameInRow="Started" msprop:Generator_ColumnPropNameInTable="StartedColumn" msprop:Generator_UserColumnName="Started" type="xs:int" minOccurs="0" />
<xs:element name="Completed" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnCompleted" msprop:Generator_ColumnPropNameInRow="Completed" msprop:Generator_ColumnPropNameInTable="CompletedColumn" msprop:Generator_UserColumnName="Completed" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CartIRK" msprop:Generator_TableClassName="CartIRKDataTable" msprop:Generator_TableVarName="tableCartIRK" msprop:Generator_TablePropName="CartIRK" msprop:Generator_RowDeletingName="CartIRKRowDeleting" msprop:Generator_RowChangingName="CartIRKRowChanging" msprop:Generator_RowEvHandlerName="CartIRKRowChangeEventHandler" msprop:Generator_RowDeletedName="CartIRKRowDeleted" msprop:Generator_UserTableName="CartIRK" msprop:Generator_RowChangedName="CartIRKRowChanged" msprop:Generator_RowEvArgName="CartIRKRowChangeEvent" msprop:Generator_RowClassName="CartIRKRow">
<xs:complexType>
<xs:sequence>
<xs:element name="OrderExtCode" msprop:Generator_ColumnVarNameInTable="columnOrderExtCode" msprop:Generator_ColumnPropNameInRow="OrderExtCode" msprop:Generator_ColumnPropNameInTable="OrderExtCodeColumn" msprop:Generator_UserColumnName="OrderExtCode" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="250" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CartDtmx" msprop:Generator_ColumnVarNameInTable="columnCartDtmx" msprop:Generator_ColumnPropNameInRow="CartDtmx" msprop:Generator_ColumnPropNameInTable="CartDtmxColumn" msprop:Generator_UserColumnName="CartDtmx" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="250" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ItemDesc" msprop:Generator_ColumnVarNameInTable="columnItemDesc" msprop:Generator_ColumnPropNameInRow="ItemDesc" msprop:Generator_ColumnPropNameInTable="ItemDescColumn" msprop:Generator_UserColumnName="ItemDesc">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="500" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ItemNote" msprop:Generator_ColumnVarNameInTable="columnItemNote" msprop:Generator_ColumnPropNameInRow="ItemNote" msprop:Generator_ColumnPropNameInTable="ItemNoteColumn" msprop:Generator_UserColumnName="ItemNote">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="500" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="TotReq" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTotReq" msprop:Generator_ColumnPropNameInRow="TotReq" msprop:Generator_ColumnPropNameInTable="TotReqColumn" msprop:Generator_UserColumnName="TotReq" type="xs:int" minOccurs="0" />
<xs:element name="TotCur" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTotCur" msprop:Generator_ColumnPropNameInRow="TotCur" msprop:Generator_ColumnPropNameInTable="TotCurColumn" msprop:Generator_UserColumnName="TotCur" type="xs:int" minOccurs="0" />
<xs:element name="MatExtCode" msprop:Generator_ColumnVarNameInTable="columnMatExtCode" msprop:Generator_ColumnPropNameInRow="MatExtCode" msprop:Generator_ColumnPropNameInTable="MatExtCodeColumn" msprop:Generator_UserColumnName="MatExtCode" type="xs:int" />
<xs:element name="MatDesc" msprop:Generator_ColumnVarNameInTable="columnMatDesc" msprop:Generator_ColumnPropNameInRow="MatDesc" msprop:Generator_ColumnPropNameInTable="MatDescColumn" msprop:Generator_UserColumnName="MatDesc">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="500" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
+2 -2
View File
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="391" ViewPortY="960" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="411" ViewPortY="960" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:BatchList" ZOrder="14" X="291" 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="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -40,7 +40,7 @@
<Shape ID="DesignTable:OKIB_Sum" ZOrder="7" X="50" Y="1823" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI" ZOrder="4" X="342" Y="1417" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI_sum" ZOrder="3" X="338" Y="1822" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Pack2Cart" ZOrder="6" X="919" Y="1805" Height="210" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:Pack2Cart" ZOrder="6" X="919" Y="1805" Height="248" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_BatchReqList_OrderList" ZOrder="46" LineWidth="11">
Vendored
+4 -4
View File
@@ -11,10 +11,10 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=353']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
withEnv(['NEXT_BUILD_NUMBER=354']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'NKC'
}
}
+16
View File
@@ -400,6 +400,7 @@
<Content Include="site\About.aspx" />
<Content Include="App_Readme\Elmah.txt" />
<Content Include="site\BatchPreview.aspx" />
<Content Include="site\CartDetIRK.aspx" />
<Content Include="site\Contact.aspx" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
@@ -448,6 +449,7 @@
<Content Include="WebUserControls\cmp_batchList.ascx" />
<Content Include="WebUserControls\cmp_BP_bunkList.ascx" />
<Content Include="WebUserControls\cmp_BP_sheetList.ascx" />
<Content Include="WebUserControls\cmp_cartDetIRK.ascx" />
<Content Include="WebUserControls\cmp_devUtils.ascx" />
<Content Include="WebUserControls\cmp_errorDetail.ascx" />
<Content Include="WebUserControls\cmp_ErrorsLog.ascx" />
@@ -757,6 +759,13 @@
<Compile Include="site\BatchPreview.aspx.designer.cs">
<DependentUpon>BatchPreview.aspx</DependentUpon>
</Compile>
<Compile Include="site\CartDetIRK.aspx.cs">
<DependentUpon>CartDetIRK.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\CartDetIRK.aspx.designer.cs">
<DependentUpon>CartDetIRK.aspx</DependentUpon>
</Compile>
<Compile Include="site\Contact.aspx.cs">
<DependentUpon>Contact.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1067,6 +1076,13 @@
<Compile Include="WebUserControls\cmp_BP_sheetList.ascx.designer.cs">
<DependentUpon>cmp_BP_sheetList.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_cartDetIRK.ascx.cs">
<DependentUpon>cmp_cartDetIRK.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_cartDetIRK.ascx.designer.cs">
<DependentUpon>cmp_cartDetIRK.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_devUtils.ascx.cs">
<DependentUpon>cmp_devUtils.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+12
View File
@@ -1,12 +1,24 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KR_cart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KR_cart" %>
<asp:HiddenField id="hfPackListID" runat="server" />
<asp:HiddenField runat="server" ID="hfShowFull" Value="false" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="PackListID,CartID" DataSourceID="ods" Width="100%" CssClass="table table-sm table-striped">
<Columns>
<asp:BoundField DataField="CartIndex" HeaderText="#" SortExpression="CartIndex" />
<asp:BoundField DataField="CartDtmx" HeaderText="Cart" ReadOnly="True" SortExpression="CartDtmx" />
<asp:BoundField DataField="OrderExtCode" HeaderText="Order" SortExpression="OrderExtCode" />
<asp:BoundField DataField="FamilyCode" HeaderText="Art" SortExpression="FamilyCode" />
<asp:BoundField DataField="Started" HeaderText="Started" ReadOnly="True" SortExpression="Started" />
<asp:BoundField DataField="Completed" HeaderText="Completed" ReadOnly="True" SortExpression="Completed" />
<asp:TemplateField ShowHeader="False" ItemStyle-Width="2em">
<HeaderTemplate>
</HeaderTemplate>
<ItemTemplate>
<div class="text-left">
<asp:HyperLink runat="server" ID="hlShowDetail" Target="_blank" CssClass="btn btn-info" NavigateUrl='<%# $"~/site/CartDetIRK?CartID={Eval("CartID")}" %>' Visible="false"><i class="fa fa-list-ol" aria-hidden="true"></i></asp:HyperLink>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByPackListId" TypeName="AppData.DS_AppTableAdapters.Pack2CartTableAdapter">
+16 -1
View File
@@ -11,10 +11,24 @@ namespace NKC_WF.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
}
public bool showFull
{
get
{
bool answ = false;
bool.TryParse(hfShowFull.Value, out answ);
return answ;
}
set
{
hfShowFull.Value = value.ToString();
grView.DataBind();
}
}
/// <summary>
/// Cart selezionato
/// </summary>
@@ -37,5 +51,6 @@ namespace NKC_WF.WebUserControls
{
grView.DataBind();
}
}
}
+9
View File
@@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfPackListID;
/// <summary>
/// Controllo hfShowFull.
/// </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 hfShowFull;
/// <summary>
/// Controllo grView.
/// </summary>
@@ -0,0 +1,24 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_cartDetIRK.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_cartDetIRK" %>
<asp:HiddenField id="hfCartID" runat="server" />
<asp:GridView runat="server" ID="grView" CssClass="table table-sm table-striped small" AutoGenerateColumns="False" DataSourceID="ods">
<Columns>
<asp:BoundField DataField="OrderExtCode" HeaderText="OrderExtCode" SortExpression="OrderExtCode" />
<asp:BoundField DataField="CartDtmx" HeaderText="CartDtmx" SortExpression="CartDtmx" />
<asp:BoundField DataField="ItemExtCode" HeaderText="ItemExtCode" SortExpression="ItemExtCode" />
<asp:BoundField DataField="ItemDesc" HeaderText="ItemDesc" SortExpression="ItemDesc" />
<asp:BoundField DataField="ItemNote" HeaderText="ItemNote" SortExpression="ItemNote" />
<asp:BoundField DataField="TotReq" HeaderText="TotReq" ReadOnly="True" SortExpression="TotReq" />
<asp:BoundField DataField="TotCur" HeaderText="TotCur" ReadOnly="True" SortExpression="TotCur" />
<asp:BoundField DataField="MatExtCode" HeaderText="MatExtCode" SortExpression="MatExtCode" />
<asp:BoundField DataField="MatDesc" HeaderText="MatDesc" SortExpression="MatDesc" />
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.CartIRKTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfCartID" DefaultValue="0" Name="CartID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
@@ -0,0 +1,34 @@
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_cartDetIRK : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Cart selezionato
/// </summary>
public int CartID
{
get
{
int answ = 0;
int.TryParse(hfCartID.Value, out answ);
return answ;
}
set
{
hfCartID.Value = value.ToString();
//grView.DataBind();
}
}
}
}
+44
View File
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <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_cartDetIRK
{
/// <summary>
/// Controllo hfCartID.
/// </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 hfCartID;
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <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;
}
}
+20 -14
View File
@@ -1,7 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitReqRunning.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitReqRunning" %>
<%@ Register Src="~/WebUserControls/cmp_KR_cart.ascx" TagPrefix="uc1" TagName="cmp_KR_cart" %>
<h4><%: traduci("RunningKitReq") %></h4>
<div runat="server" id="divHeader">
<h4><%: traduci("RunningKitReq") %></h4>
</div>
<asp:HiddenField runat="server" ID="hfShowTitle" Value="false" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="PackListID" DataSourceID="odsKit" Width="100%" CssClass="table table-success table-striped table-sm" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
@@ -11,15 +14,7 @@
<%# traduci("NoKitReqRunning") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="#" SortExpression="PackListID">
<ItemTemplate>
<div class="text-left">
<asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>'></asp:Label>
<asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<asp:TemplateField ShowHeader="False" ItemStyle-Width="2em">
<HeaderTemplate>
<div class="text-left">
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible='<%# showFull %>' ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
@@ -31,10 +26,19 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="#" SortExpression="PackListID" ItemStyle-Width="5em">
<ItemTemplate>
<div class="text-left">
<asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>'></asp:Label>
<asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
</div>
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField DataField="PackListID" HeaderText="#" ReadOnly="True" SortExpression="PackListID" />--%>
<asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="Name" />
<asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
<%--<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />--%>
<asp:BoundField DataField="NumCart" HeaderText="Cart #" SortExpression="NumCart" />
<asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
<asp:TemplateField HeaderText="Parts n#" SortExpression="NumParts">
<HeaderTemplate>
@@ -46,20 +50,22 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Tot Qty #" SortExpression="TotQty">
<HeaderTemplate>
<asp:Label ID="TotNumLabel" runat="server" Text='<%# traduci("TotNum") %>' Visible='<%# showFull %>' />
<asp:Label ID="TotNumLabel" runat="server" Text='<%# traduci("RatioReadTot") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
<b><asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotConf") %>' Visible='<%# showFull %>' /></b> / <asp:Label ID="Label1" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="">
<ItemTemplate>
<asp:LinkButton ID="lbtSuspendJob" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("RetConfSuspendKit") %>' OnClick="lbtSuspendJob_Click"><i class="fa fa-pause" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbtSuspendJob" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("RetConfSuspendKit") %>' OnClick="lbtSuspendJob_Click" Visible='<%# enableSuspend %>'><i class="fa fa-pause" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsKit" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getRunning" TypeName="AppData.DS_AppTableAdapters.PackListTableAdapter"></asp:ObjectDataSource>
<uc1:cmp_KR_cart runat="server" ID="cmp_KR_cart" />
<asp:HiddenField runat="server" ID="hfShowFull" Value="false" />
<asp:HiddenField runat="server" ID="hfEnableSuspend" Value="false" />
<uc1:cmp_KR_cart runat="server" ID="cmp_KR_cart" showFull="true" />
@@ -16,6 +16,7 @@ namespace NKC_WF.WebUserControls
private void fixVisibility()
{
cmp_KR_cart.Visible = (grView.SelectedIndex >= 0);
divHeader.Visible = showTitle;
}
internal void doUpdate()
@@ -25,6 +26,20 @@ namespace NKC_WF.WebUserControls
cmp_KR_cart.doUpdate();
}
public bool showTitle
{
get
{
bool answ = false;
bool.TryParse(hfShowTitle.Value, out answ);
return answ;
}
set
{
hfShowTitle.Value = value.ToString();
fixVisibility();
}
}
public bool showFull
{
get
@@ -39,6 +54,20 @@ namespace NKC_WF.WebUserControls
grView.DataBind();
}
}
public bool enableSuspend
{
get
{
bool answ = false;
bool.TryParse(hfEnableSuspend.Value, out answ);
return answ;
}
set
{
hfEnableSuspend.Value = value.ToString();
grView.DataBind();
}
}
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
int PackListId = 0;
+36 -9
View File
@@ -14,6 +14,24 @@ namespace NKC_WF.WebUserControls
public partial class cmp_kitReqRunning
{
/// <summary>
/// Controllo divHeader.
/// </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.HtmlControls.HtmlGenericControl divHeader;
/// <summary>
/// Controllo hfShowTitle.
/// </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 hfShowTitle;
/// <summary>
/// Controllo grView.
/// </summary>
@@ -32,15 +50,6 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsKit;
/// <summary>
/// Controllo cmp_KR_cart.
/// </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_KR_cart cmp_KR_cart;
/// <summary>
/// Controllo hfShowFull.
/// </summary>
@@ -49,5 +58,23 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowFull;
/// <summary>
/// Controllo hfEnableSuspend.
/// </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 hfEnableSuspend;
/// <summary>
/// Controllo cmp_KR_cart.
/// </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_KR_cart cmp_KR_cart;
}
}
+26 -9
View File
@@ -1,8 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitReqSched.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitReqSched" %>
<%@ Register Src="~/WebUserControls/cmp_KR_cart.ascx" TagPrefix="uc1" TagName="cmp_KR_cart" %>
<h4><asp:Label runat="server" ID="lblTitle"><%: traduci("ScheduledKitReq") %></asp:Label></h4>
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="PackListID" DataSourceID="odsKit" Width="100%" CssClass="table table-striped table-sm">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="PackListID" DataSourceID="odsKit" Width="100%" CssClass="table table-striped table-sm" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -11,23 +13,37 @@
<%# traduci("NoKitReq") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="#" SortExpression="PackListID">
<asp:TemplateField ShowHeader="False" ItemStyle-Width="2em">
<HeaderTemplate>
<div class="text-left">
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible='<%# showFull %>' ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-left">
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info" Visible='<%# showFull %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="#" SortExpression="PackListID" ItemStyle-Width="5em">
<ItemTemplate>
<asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>'></asp:Label>
<asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
<asp:LinkButton ID="lbtStartJob" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-success" OnClick="lbtStartJob_Click" Visible='<%# checkStartEnabled("first", Eval("SchedPrior")) %>' OnClientClick='<%# SteamWare.jsUtils.getCBE("RetConfStartKit") %>'><i class="fa fa-play" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Priority" SortExpression="SchedPrior">
<asp:TemplateField HeaderText="Priority" SortExpression="SchedPrior" ItemStyle-Width="8em">
<ItemTemplate>
<asp:LinkButton ID="lbtUp" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-primary" OnClick="lbtUp_Click" Enabled='<%# checkVisible("first", Eval("SchedPrior")) %>'><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:LinkButton>
<asp:Label ID="lblSchedPrior" runat="server" Text='<%# Eval("SchedPrior") %>' CssClass="text-center" Width="3em"></asp:Label>
<asp:LinkButton ID="lbtDown" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-primary" OnClick="lbtDown_Click" Enabled='<%# checkVisible("last", Eval("SchedPrior")) %>'><i class="fa fa-arrow-down" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbtStartJob" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-success" OnClick="lbtStartJob_Click" Visible='<%# checkStartEnabled("first", Eval("SchedPrior")) %>' OnClientClick='<%# SteamWare.jsUtils.getCBE("RetConfStartKit") %>'><i class="fa fa-play" aria-hidden="true"></i></asp:LinkButton>
<asp:Label ID="lblPlaceholder" runat="server" Visible='<%# !checkVisible("first", Eval("SchedPrior")) && !checkStartEnabled("first", Eval("SchedPrior")) %>' Text="" Width="2em" />
<asp:LinkButton ID="lbtUp" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-primary" OnClick="lbtUp_Click" Enabled='<%# checkVisible("first", Eval("SchedPrior")) %>' Visible='<%# checkVisible("first", Eval("SchedPrior")) && !checkStartEnabled("first", Eval("SchedPrior")) %>'><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:LinkButton>
<asp:Label ID="lblSchedPrior" runat="server" Text='<%# Eval("SchedPrior") %>' CssClass="text-center" Width="2em"></asp:Label>
<asp:LinkButton ID="lbtDown" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-primary" OnClick="lbtDown_Click" Visible='<%# checkVisible("last", Eval("SchedPrior")) %>'><i class="fa fa-arrow-down" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="Name" />
<asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
<%--<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />--%>
<asp:BoundField DataField="NumCart" HeaderText="Cart #" SortExpression="NumCart" />
<asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
<asp:TemplateField HeaderText="Parts n#" SortExpression="NumParts">
<HeaderTemplate>
@@ -39,10 +55,10 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Tot Qty #" SortExpression="TotQty">
<HeaderTemplate>
<asp:Label ID="TotNumLabel" runat="server" Text='<%# traduci("TotNum") %>' Visible='<%# showFull %>' />
<asp:Label ID="Label1" runat="server" Text='<%# traduci("RatioReadTot") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
<b><asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotConf") %>' Visible='<%# showFull %>' /></b> / <asp:Label ID="Label1" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
@@ -51,3 +67,4 @@
<asp:ObjectDataSource ID="odsKit" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getToSchedule" TypeName="AppData.DS_AppTableAdapters.PackListTableAdapter"></asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfNumRows" Value="0" />
<asp:HiddenField runat="server" ID="hfShowFull" Value="false" />
<uc1:cmp_KR_cart runat="server" ID="cmp_KR_cart" showFull="true" />
+26 -1
View File
@@ -13,9 +13,14 @@ namespace NKC_WF.WebUserControls
if (!Page.IsPostBack)
{
fixSchedOrd();
fixVisibility();
}
}
private void fixVisibility()
{
cmp_KR_cart.Visible = (grView.SelectedIndex >= 0);
}
protected int numRows
{
get
@@ -46,8 +51,10 @@ namespace NKC_WF.WebUserControls
internal void doUpdate()
{
grView.SelectedIndex = -1;
fixSchedOrd();
grView.DataBind();
fixVisibility();
cmp_KR_cart.doUpdate();
lblTitle.Focus();
}
@@ -153,5 +160,23 @@ namespace NKC_WF.WebUserControls
return answ;
}
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
int PackListId = 0;
int.TryParse(grView.SelectedValue.ToString(), out PackListId);
// mostra dettaglio CART
cmp_KR_cart.PackListID = PackListId;
cmp_KR_cart.Visible = true;
}
/// <summary>
/// comando reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtReset_Click(object sender, EventArgs e)
{
grView.SelectedIndex = -1;
doUpdate();
}
}
}
+9
View File
@@ -58,5 +58,14 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowFull;
/// <summary>
/// Controllo cmp_KR_cart.
/// </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_KR_cart cmp_KR_cart;
}
}
+21
View File
@@ -0,0 +1,21 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="CartDetIRK.aspx.cs" Inherits="NKC_WF.site.CartDetIRK" %>
<%@ Register Src="~/WebUserControls/cmp_cartDetIRK.ascx" TagPrefix="uc1" TagName="cmp_cartDetIRK" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="card" style="width: 100%;">
<div class="card-header">
<div class="row">
<div class="col-10">
<h3 class=""><%: traduci("CartSummary") %></h3>
</div>
<div class="col-2 text-right">
<asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-block btn-info" OnClick="lbtPrint_Click"><i class="fa fa-print" aria-hidden="true"></i> <%: traduci("Print") %></asp:LinkButton>
</div>
</div>
</div>
<div class="card-body">
<uc1:cmp_cartDetIRK runat="server" ID="cmp_cartDetIRK" />
</div>
</div>
</asp:Content>
+39
View File
@@ -0,0 +1,39 @@
using NKC_SDK;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class CartDetIRK : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
cmp_cartDetIRK.CartID = memLayer.ML.QSI("CartID");
}
/// <summary>
/// Queue selezionata
/// </summary>
public string currQueue
{
get
{
return "queueIRKGroup";
}
}
protected void lbtPrint_Click(object sender, EventArgs e)
{
// invio SINGOLO record in stampa
DLMan.stampaDoc(cmp_cartDetIRK.CartID.ToString(), currQueue, tipoDocumento.docCartIRKSum, Request.UserHostName);
}
}
}
+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.site
{
public partial class CartDetIRK
{
/// <summary>
/// Controllo lbtPrint.
/// </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.LinkButton lbtPrint;
/// <summary>
/// Controllo cmp_cartDetIRK.
/// </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_cartDetIRK cmp_cartDetIRK;
}
}
+1 -1
View File
@@ -15,7 +15,7 @@
<asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
<ContentTemplate>
<asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
<uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" showFull="true" />
<uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" showFull="true" enableSuspend="true" showTitle="true" />
<uc1:cmp_kitReqSched runat="server" ID="cmp_kitReqSched" showFull="true" />
</ContentTemplate>
</asp:UpdatePanel>
+2 -4
View File
@@ -1,16 +1,14 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Kitting.aspx.cs" Inherits="NKC_WF.site.Kitting" %>
<%@ Register Src="~/WebUserControls/cmp_kitting.ascx" TagPrefix="uc1" TagName="cmp_kitting" %>
<%@ Register Src="~/WebUserControls/cmp_kitRunning.ascx" TagPrefix="uc1" TagName="cmp_kitRunning" %>
<%@ Register Src="~/WebUserControls/cmp_kitReqRunning.ascx" TagPrefix="uc1" TagName="cmp_kitReqRunning" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="UpdatePanel2" UpdateMode="Conditional">
<ContentTemplate>
<asp:Timer ID="timerKitting" runat="server" Interval="1000" OnTick="timerKitting_Tick"></asp:Timer>
<div class="m-2">
<uc1:cmp_kitRunning runat="server" ID="cmp_kitRunning" />
<uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" enableSuspend="true" showFull="true" showTitle="false"/>
<uc1:cmp_kitting runat="server" ID="cmp_kitting" />
</div>
</ContentTemplate>
+1 -1
View File
@@ -15,7 +15,7 @@ namespace NKC_WF.site
protected void timerKitting_Tick(object sender, EventArgs e)
{
cmp_kitRunning.doUpdate();
cmp_kitReqRunning.doUpdate();
cmp_kitting.doUpdate();
}
}
+2 -2
View File
@@ -33,13 +33,13 @@ namespace NKC_WF.site
protected global::System.Web.UI.Timer timerKitting;
/// <summary>
/// Controllo cmp_kitRunning.
/// Controllo cmp_kitReqRunning.
/// </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_kitRunning cmp_kitRunning;
protected global::NKC_WF.WebUserControls.cmp_kitReqRunning cmp_kitReqRunning;
/// <summary>
/// Controllo cmp_kitting.