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-08-14 14:29:17 +02:00
parent b095f05693 e87016499f
commit 7fefbca193
19 changed files with 140 additions and 45 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=330']) {
withEnv(['NEXT_BUILD_NUMBER=331']) {
// 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}')
NKC_WF/Empty.Master
+33
View File
@@ -0,0 +1,33 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Empty.master.cs" Inherits="NKC_WF.Empty" %>
<!DOCTYPE html>
<html lang="en">
<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" />
<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") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
</head>
<body class="p-0">
<form id="form1" runat="server">
<div class="container-flow px-0 mx-0 bg-dark">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>
</form>
</body>
</html>
NKC_WF/Empty.Master.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF
{
public partial class Empty : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
NKC_WF/Empty.Master.designer.cs
Generated
+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
{
public partial class Empty
{
/// <summary>
/// Controllo form1.
/// </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.HtmlForm form1;
/// <summary>
/// Controllo MainContent.
/// </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.ContentPlaceHolder MainContent;
}
}
NKC_WF/NKC_WF.csproj
+8
View File
@@ -567,6 +567,7 @@
<Content Include="PartsImg\.PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Empty.Master" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Properties\PublishProfiles\IIS02.pubxml" />
<Content Include="Scripts\bootstrap.min.js.map" />
@@ -646,6 +647,13 @@
<Compile Include="Default.aspx.designer.cs">
<DependentUpon>Default.aspx</DependentUpon>
</Compile>
<Compile Include="Empty.Master.cs">
<DependentUpon>Empty.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Empty.Master.designer.cs">
<DependentUpon>Empty.Master</DependentUpon>
</Compile>
<Compile Include="ErrorPages\Oops.aspx.cs">
<DependentUpon>Oops.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/Site.Master
+1 -1
View File
@@ -7,7 +7,7 @@
<!DOCTYPE html>
<html lang="it">
<html lang="en">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8" />
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs
+26 -21
View File
@@ -34,35 +34,40 @@ namespace NKC_WF.WebUserControls
private void fixDataBind()
{
string currPath = DrawingPath;
// in primis: fix directory
// visibile SOLO SE valore != null...
if (string.IsNullOrEmpty(currPath))
try
{
divDrawings.Visible = false;
}
else
{
divDrawings.Visible = true;
List<imgData> elencoDisegni = new List<imgData>();
// verifico path assoluto...
if (!Path.IsPathRooted(currPath))
// in primis: fix directory
// visibile SOLO SE valore != null...
if (string.IsNullOrEmpty(currPath))
{
currPath = Server.MapPath(currPath);
divDrawings.Visible = false;
}
// leggo da filesystem...
string[] elencoFiles = Directory.GetFiles(currPath, "*.svg");
if (elencoFiles != null)
else
{
foreach (var item in elencoFiles)
divDrawings.Visible = true;
List<imgData> elencoDisegni = new List<imgData>();
// verifico path assoluto...
if (!Path.IsPathRooted(currPath))
{
elencoDisegni.Add(new imgData { imgName = Path.GetFileName(item), DrawPath = item.Replace(@"/",@"\") });
currPath = Server.MapPath(currPath);
}
// leggo da filesystem...
string[] elencoFiles = Directory.GetFiles(currPath, "*.svg");
if (elencoFiles != null)
{
foreach (var item in elencoFiles)
{
elencoDisegni.Add(new imgData { imgName = Path.GetFileName(item), DrawPath = item.Replace(@"/", @"\") });
}
}
// sistemo repeater
repDraw.DataSource = elencoDisegni;
repDraw.DataBind();
}
// sistemo repeater
repDraw.DataSource = elencoDisegni;
repDraw.DataBind();
}
catch
{ }
}
public class imgData
NKC_WF/WebUserControls/cmp_offOrderDetail.ascx
+3 -3
View File
@@ -10,7 +10,7 @@
<ItemTemplate>
<div class="row">
<div class="col-12">
<asp:Label runat="server" ID="lblWarning" CssClass="text-danger lead font-weight-bold" Visible='<%# Eval("DrawFilePath").ToString() == "" %>'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> # <%: traduci ("NotYetProcessed") %></asp:Label>
<asp:Label runat="server" ID="lblWarning" CssClass="text-danger lead font-weight-bold" Visible='<%# Eval("DrawFilePath").ToString() == "" %>'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <%: traduci ("NotYetProcessed") %></asp:Label>
<%--<svg width="710" height="305" viewBox='0 0 1420 710' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" Visible='<%# Eval("DrawFilePath").ToString() != "" %>'>
</svg>--%>
</div>
@@ -21,12 +21,12 @@
</div>
<div class="row my-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtMakeCnc" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="0" %>' OnClick="lbtMakeCnc_Click" OnClientClick='return confirm("Send to CAM?")'><i class="fa fa-laptop" aria-hidden="true"></i># <%: traduci ("MakeCncProg") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtMakeCnc" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="0" %>' OnClick="lbtMakeCnc_Click" OnClientClick='return confirm("Send to CAM?")'><i class="fa fa-laptop" aria-hidden="true"></i> <%: traduci ("MakeCncProg") %></asp:LinkButton>
</div>
<div class="col">
<%--<asp:LinkButton runat="server" ID="lbtPrintLabels" CssClass="btn btn-info btn-block" Visible='<%# Eval("OrdStatus").ToString()!="0" %>' OnClick="lbtPrintLabels_Click"><i class="fa fa-print" aria-hidden="true"></i> PRINT LABELS</asp:LinkButton>--%>
<%--<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> ITEM DONE</asp:LinkButton>--%>
<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# (Eval("OrdStatus").ToString()=="1" && Eval("DrawFilePath").ToString()!="") || Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> # <%: traduci ("ItemDone") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# (Eval("OrdStatus").ToString()=="1" && Eval("DrawFilePath").ToString()!="") || Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> <%: traduci ("ItemDone") %></asp:LinkButton>
</div>
</div>
<div class="row">
NKC_WF/WebUserControls/cmp_stackNextloading.ascx
+2 -2
View File
@@ -18,12 +18,12 @@
<ItemTemplate>
<div class="row border border-success rounded">
<div class="col-12 col-lg-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
<b> <%: traduci("Previous") %></b> # <%: traduci("Bunk") %> <b>
<b> <%: traduci("Previous") %></b> <%: traduci("Bunk") %> <b>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
(<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />)
</div>
<div class="col-12 col-lg-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
<b> <%: traduci("Current") %></b># <%: traduci("Bunk") %> <b>
<b> <%: traduci("Current") %></b> <%: traduci("Bunk") %> <b>
<asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
(<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
</div>
NKC_WF/WebUserControls/cmp_svgFull.ascx
+2 -2
View File
@@ -2,6 +2,6 @@
<asp:HiddenField ID="hfSheetId" runat="server" Value="0" />
<asp:HiddenField ID="hfFilename" runat="server" Value="" />
<div runat="server" id="divCurrSheet">
<svg xmlns='http://www.w3.org/2000/svg' width="16000" height="8000" runat="server" id="svgTable" class="img-fluid"></svg>
<div runat="server" id="divCurrSheet" class="text-center">
<svg xmlns='http://www.w3.org/2000/svg' width="1900" height="950" runat="server" id="svgTable" class="img-fluid-no"></svg>
</div>
NKC_WF/site/BatchPreview.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<uc1:cmp_BP_bunkList runat="server" ID="cmp_BP_bunkList" />
</div>
<div class="col-8 px-0">
<h3>Batch preview</h3>
<h3><%# traduci("BatchPreview") %></h3>
<uc1:cmp_slider runat="server" ID="cmp_slider" />
<uc1:cmp_MU_svgViewer runat="server" ID="cmp_MU_svgViewer" />
</div>
NKC_WF/site/BatchPreview.aspx.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using System.Web.UI;
namespace NKC_WF.site
{
public partial class BatchPreview : System.Web.UI.Page
public partial class BatchPreview : BasePage
{
/// <summary>
/// Batch corrente...
NKC_WF/site/Contact.aspx
-4
View File
@@ -1,8 +1,6 @@
<%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="NKC_WF.Contact" %>
<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
<div class="container mt-2">
<div class="card">
<div class="card-header">
@@ -46,6 +44,4 @@
</div>
</div>
</div>
</asp:Content>
NKC_WF/site/ErrorsLog.aspx
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="card mt-2">
<div class="card-header">
<b>Errors List</b>
<b><%: traduci("ErrorsList") %></b>
</div>
<div class="card-body">
<uc1:cmp_ErrorsLog runat="server" ID="cmp_ErrorsLog" />
NKC_WF/site/ErrorsLog.aspx.cs
+2 -1
View File
@@ -4,12 +4,13 @@ using System.Web.UI;
namespace NKC_WF
{
public partial class ErrorsLog : System.Web.UI.Page
public partial class ErrorsLog : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
string PUID = memLayer.ML.QSS("PUID");
if (!string.IsNullOrEmpty(PUID))
{
NKC_WF/site/KitRequestImporter.aspx.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace NKC_WF
}
catch (Exception exc)
{
logger.lg.scriviLog($"KitCsvMan: Eccezione in Copia SQL file:{Environment.NewLine}{exc}");
logger.lg.scriviLog($"{traduci("ErrKitReqImpCopyError")}:{Environment.NewLine}{exc}");
}
// salvo dati
cmp_kitImpCheck.fileName = e.FileName;
NKC_WF/site/OrderManager.aspx.cs
+4 -4
View File
@@ -113,7 +113,7 @@ namespace NKC_WF
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in Copia SQL file:{Environment.NewLine}{exc}");
logger.lg.scriviLog($"{traduci("ErrOrderCsvImp01")}:{Environment.NewLine}{exc}");
DataLayer.man.taEL.insertQuery(DateTime.Now, "Copy CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}");
}
// chiamo stored caricamento
@@ -125,7 +125,7 @@ namespace NKC_WF
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in IMPORT file:{Environment.NewLine}{exc}");
logger.lg.scriviLog($"{traduci("ErrOrderCsvImp02")}:{Environment.NewLine}{exc}");
// salvo log errore...
DataLayer.man.taEL.insertQuery(DateTime.Now, "Upload CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}");
dataValidated = false;
@@ -146,7 +146,7 @@ namespace NKC_WF
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in verifica file:{Environment.NewLine}{exc}");
logger.lg.scriviLog($"{traduci("ErrOrderCsvImp03")}:{Environment.NewLine}{exc}");
dataValidated = false;
}
if (dataValidated && batchID > 0)
@@ -200,7 +200,7 @@ namespace NKC_WF
fileOk = System.IO.File.Exists(localPath);
if (!fileOk)
{
DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"DXF File not found {localPath} | part {item.ItemExtCode} | {item.ItemDesc}");
DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"{traduci("ErrOrderDxfNotFound")} {localPath} | part {item.ItemExtCode} | {item.ItemDesc}");
allOk = false;
missingDxfList.Add(item.ItemExtCode);
}
NKC_WF/site/SvgFull.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="SvgFull.aspx.cs" Inherits="NKC_WF.site.SvgFull" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Empty.Master" AutoEventWireup="true" CodeBehind="SvgFull.aspx.cs" Inherits="NKC_WF.site.SvgFull" %>
<%@ Register Src="~/WebUserControls/cmp_svgFull.ascx" TagPrefix="uc1" TagName="cmp_svgFull" %>
NKC_WF/site/SvgFull.aspx.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace NKC_WF.site
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
//((SiteMaster)this.Master).showSearch = false;
// recupero valore URL ed imposto...
int sheetId = memLayer.ML.QSI("sheetId");
string ImgPath = memLayer.ML.QSS("ImgPath");