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-01-25 10:05:33 +01:00
parent 509c504c33 1196534dc2
commit a0af485c1f
16 changed files with 414 additions and 2 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=220']) {
withEnv(['NEXT_BUILD_NUMBER=221']) {
// 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
+16
View File
@@ -343,6 +343,7 @@
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="site\DBG_QRCode_Unload.aspx" />
<Content Include="site\DevUtils.aspx" />
<Content Include="site\ErrorsLog.aspx" />
<Content Include="site\GlobalSearch.aspx" />
@@ -380,6 +381,7 @@
<Content Include="WebUserControls\cmp_login.ascx" />
<Content Include="WebUserControls\cmp_ML_ShDet.ascx" />
<Content Include="WebUserControls\cmp_MU_carts.ascx" />
<Content Include="WebUserControls\cmp_MU_Items.ascx" />
<Content Include="WebUserControls\cmp_MU_singleStat.ascx" />
<Content Include="WebUserControls\cmp_MU_stats.ascx" />
<Content Include="WebUserControls\cmp_MU_bins.ascx" />
@@ -540,6 +542,13 @@
<Compile Include="Controllers\getMUCssController.cs" />
<Compile Include="Controllers\BunkController.cs" />
<Compile Include="Controllers\MaterialController.cs" />
<Compile Include="site\DBG_QRCode_Unload.aspx.cs">
<DependentUpon>DBG_QRCode_Unload.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\DBG_QRCode_Unload.aspx.designer.cs">
<DependentUpon>DBG_QRCode_Unload.aspx</DependentUpon>
</Compile>
<Compile Include="site\Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -830,6 +839,13 @@
<Compile Include="WebUserControls\cmp_MU_carts.ascx.designer.cs">
<DependentUpon>cmp_MU_carts.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_MU_Items.ascx.cs">
<DependentUpon>cmp_MU_Items.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_MU_Items.ascx.designer.cs">
<DependentUpon>cmp_MU_Items.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_MU_singleStat.ascx.cs">
<DependentUpon>cmp_MU_singleStat.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/Site.Master
+7 -1
View File
@@ -11,8 +11,14 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%: Page.Title %> - Applicazione ASP.NET</title>
<meta name="mobile-web-app-capable" content="yes" />
<meta name="description" content="NKC Solution" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title>NKC <%: Page.Title %></title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
NKC_WF/WebUserControls/cmp_MU_Items.ascx
+37
View File
@@ -0,0 +1,37 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_Items.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_Items" %>
<div class="card text-center mb-2" style="width: 100%;">
<h5 class="card-header bg-warning text-light">ITEMS</h5>
<div class="card-body py-1">
<div class="row">
<div class="col-12 px-0">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" CssClass="table table-striped table-sm small">
<Columns>
<asp:TemplateField HeaderText="QR">
<ItemTemplate>
<asp:Image runat="server" Height="64" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="ItemID" HeaderText="ItemID" InsertVisible="False" ReadOnly="True" SortExpression="ItemID" />
<asp:BoundField DataField="KitID" HeaderText="KitID" SortExpression="KitID" />
<asp:BoundField DataField="ItemDtmx" HeaderText="ItemDtmx" SortExpression="ItemDtmx" />
<asp:BoundField DataField="ItemExtCode" HeaderText="ItemExtCode" SortExpression="ItemExtCode" />
<asp:BoundField DataField="ItemDesc" HeaderText="ItemDesc" SortExpression="ItemDesc" />
<asp:BoundField DataField="PostProcList" HeaderText="PostProcList" SortExpression="PostProcList" />
<asp:BoundField DataField="ProcessesReq" HeaderText="ProcessesReq" SortExpression="ProcessesReq" />
<asp:BoundField DataField="OnCartDate" HeaderText="OnCartDate" SortExpression="OnCartDate" />
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getBySheet" TypeName="AppData.DS_AppTableAdapters.ItemListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfSheetID" DefaultValue="0" Name="SheetID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfSheetID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
</div>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs
+66
View File
@@ -0,0 +1,66 @@
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_MU_Items : System.Web.UI.UserControl
{
/// <summary>
/// Sheet corrente...
/// </summary>
public int SheetID
{
set
{
hfSheetID.Value = value.ToString();
doUpdate();
}
get
{
int answ = 0;
int.TryParse(hfSheetID.Value, out answ);
return answ;
}
}
/// <summary>
/// Indica se mostrare o meno QRCode
/// </summary>
public bool ShowQr
{
set
{
hfShowQr.Value = value.ToString();
}
get
{
bool answ = false;
bool.TryParse(hfShowQr.Value, out answ);
return answ;
}
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <param name="currId"></param>
/// <returns></returns>
public string getImgUrl(object currId)
{
string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val=";
string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
}
protected void Page_Load(object sender, EventArgs e)
{
}
public void doUpdate()
{
grView.DataBind();
}
}
}
NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs
Generated
+53
View File
@@ -0,0 +1,53 @@
//------------------------------------------------------------------------------
// <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_MU_Items
{
/// <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;
/// <summary>
/// Controllo hfSheetID.
/// </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 hfSheetID;
/// <summary>
/// Controllo hfShowQr.
/// </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 hfShowQr;
}
}
NKC_WF/WebUserControls/cmp_MU_bins.ascx
+2
View File
@@ -16,6 +16,7 @@
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="BinDtmx">
<ItemTemplate>
<asp:Image runat="server" Height="64" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("BinDtmx")) %>' />
<b><asp:Label ID="Label1" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
</ItemTemplate>
</asp:TemplateField>
@@ -37,6 +38,7 @@
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs
+28
View File
@@ -26,6 +26,34 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
/// <summary>
/// Indica se mostrare o meno QRCode
/// </summary>
public bool ShowQr
{
set
{
hfShowQr.Value = value.ToString();
}
get
{
bool answ = false;
bool.TryParse(hfShowQr.Value, out answ);
return answ;
}
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <param name="currId"></param>
/// <returns></returns>
public string getImgUrl(object currId)
{
string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val=";
string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
}
protected void Page_Load(object sender, EventArgs e)
{
NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs
Generated
+9
View File
@@ -40,5 +40,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 hfBatchID;
/// <summary>
/// Controllo hfShowQr.
/// </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 hfShowQr;
}
}
NKC_WF/WebUserControls/cmp_MU_carts.ascx
+2
View File
@@ -16,6 +16,7 @@
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="CartDtmx">
<ItemTemplate>
<asp:Image runat="server" Height="64" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("CartDtmx")) %>' />
<b><asp:Label ID="Label1" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
</ItemTemplate>
</asp:TemplateField>
@@ -37,6 +38,7 @@
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs
+28
View File
@@ -26,6 +26,34 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
/// <summary>
/// Indica se mostrare o meno QRCode
/// </summary>
public bool ShowQr
{
set
{
hfShowQr.Value = value.ToString();
}
get
{
bool answ = false;
bool.TryParse(hfShowQr.Value, out answ);
return answ;
}
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <param name="currId"></param>
/// <returns></returns>
public string getImgUrl(object currId)
{
string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val=";
string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
}
protected void Page_Load(object sender, EventArgs e)
{
NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs
Generated
+9
View File
@@ -40,5 +40,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 hfBatchID;
/// <summary>
/// Controllo hfShowQr.
/// </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 hfShowQr;
}
}
NKC_WF/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

NKC_WF/site/DBG_QRCode_Unload.aspx
+27
View File
@@ -0,0 +1,27 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="DBG_QRCode_Unload.aspx.cs" Inherits="NKC_WF.site.DBG_QRCode_Unload" %>
<%@ Register Src="~/WebUserControls/cmp_MU_carts.ascx" TagPrefix="uc1" TagName="cmp_MU_carts" %>
<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %>
<%@ Register Src="~/WebUserControls/cmp_MU_Items.ascx" TagPrefix="uc1" TagName="cmp_MU_Items" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<div class="row">
<div class="col-12">
<h1 class="text-center">DEBUG UNLOAD PAGE</h1>
</div>
<div class="col-12">
<uc1:cmp_MU_Items runat="server" ID="cmp_MU_Items" />
</div>
<div class="col-6">
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</div>
<div class="col-6">
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" />
</div>
</div>
</asp:Content>
NKC_WF/site/DBG_QRCode_Unload.aspx.cs
+67
View File
@@ -0,0 +1,67 @@
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 DBG_QRCode_Unload : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
doUpdate();
}
}
/// <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>
/// Sheet corrente...
/// </summary>
public int SheetID
{
set
{
hfSheetID.Value = value.ToString();
}
get
{
int answ = 0;
int.TryParse(hfSheetID.Value, out answ);
return answ;
}
}
/// <summary>
/// Aggiorna componente principale e child components
/// </summary>
private void doUpdate()
{
//!!!FIXME!!! fare calcolo del VERO batch corrente...
BatchId = 242; // fixed x test!
SheetID = 770;
// aggiorno child
cmp_MU_bins.ShowQr = true;
cmp_MU_bins.BatchId = BatchId;
cmp_MU_carts.ShowQr = true;
cmp_MU_carts.BatchId = BatchId;
cmp_MU_Items.ShowQr = true;
cmp_MU_Items.SheetID = SheetID;
}
}
}
NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs
Generated
+62
View File
@@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <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 DBG_QRCode_Unload
{
/// <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 hfSheetID.
/// </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 hfSheetID;
/// <summary>
/// Controllo cmp_MU_Items.
/// </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_MU_Items cmp_MU_Items;
/// <summary>
/// Controllo cmp_MU_carts.
/// </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_MU_carts cmp_MU_carts;
/// <summary>
/// Controllo cmp_MU_bins.
/// </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_MU_bins cmp_MU_bins;
}
}