diff --git a/Jenkinsfile b/Jenkinsfile index 527ee6e..1270fc1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}') diff --git a/NKC_WF/Empty.Master b/NKC_WF/Empty.Master new file mode 100644 index 0000000..af5392f --- /dev/null +++ b/NKC_WF/Empty.Master @@ -0,0 +1,33 @@ +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Empty.master.cs" Inherits="NKC_WF.Empty" %> + + + + + + + + + + + + + + + NKC <%: Page.Title %> + + + <%: Scripts.Render("~/bundles/modernizr") %> + + + + + + +
+
+ + +
+
+ + diff --git a/NKC_WF/Empty.Master.cs b/NKC_WF/Empty.Master.cs new file mode 100644 index 0000000..275b713 --- /dev/null +++ b/NKC_WF/Empty.Master.cs @@ -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) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/Empty.Master.designer.cs b/NKC_WF/Empty.Master.designer.cs new file mode 100644 index 0000000..c488f95 --- /dev/null +++ b/NKC_WF/Empty.Master.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF +{ + + + public partial class Empty + { + + /// + /// Controllo form1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// Controllo MainContent. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + } +} diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index cba8a56..e4c3d5e 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -567,6 +567,7 @@ Always + @@ -646,6 +647,13 @@ Default.aspx + + Empty.Master + ASPXCodeBehind + + + Empty.Master + Oops.aspx ASPXCodeBehind diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index ecbf5f2..9a9b6ac 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -7,7 +7,7 @@ - + diff --git a/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs index b0f39c0..882c62d 100644 --- a/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs @@ -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 elencoDisegni = new List(); - // 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 elencoDisegni = new List(); + // 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 diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index 17654c2..736fbfc 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -10,7 +10,7 @@
- # <%: traduci ("NotYetProcessed") %> + <%: traduci ("NotYetProcessed") %> <%-- --%>
@@ -21,12 +21,12 @@
- # <%: traduci ("MakeCncProg") %> + <%: traduci ("MakeCncProg") %>
<%-- PRINT LABELS--%> <%-- ITEM DONE--%> - # <%: traduci ("ItemDone") %> + <%: traduci ("ItemDone") %>
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx index 8afa91b..8527084 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx @@ -18,12 +18,12 @@
- <%: traduci("Previous") %> # <%: traduci("Bunk") %> + <%: traduci("Previous") %> <%: traduci("Bunk") %> ()
- <%: traduci("Current") %># <%: traduci("Bunk") %> + <%: traduci("Current") %> <%: traduci("Bunk") %> ()
diff --git a/NKC_WF/WebUserControls/cmp_svgFull.ascx b/NKC_WF/WebUserControls/cmp_svgFull.ascx index 3bffc39..c8ee327 100644 --- a/NKC_WF/WebUserControls/cmp_svgFull.ascx +++ b/NKC_WF/WebUserControls/cmp_svgFull.ascx @@ -2,6 +2,6 @@ -
- +
+
diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx index 6d80774..3692c5c 100644 --- a/NKC_WF/site/BatchPreview.aspx +++ b/NKC_WF/site/BatchPreview.aspx @@ -13,7 +13,7 @@
-

Batch preview

+

<%# traduci("BatchPreview") %>

diff --git a/NKC_WF/site/BatchPreview.aspx.cs b/NKC_WF/site/BatchPreview.aspx.cs index 3ff5158..f907766 100644 --- a/NKC_WF/site/BatchPreview.aspx.cs +++ b/NKC_WF/site/BatchPreview.aspx.cs @@ -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 { /// /// Batch corrente... diff --git a/NKC_WF/site/Contact.aspx b/NKC_WF/site/Contact.aspx index acef28f..bb0b838 100644 --- a/NKC_WF/site/Contact.aspx +++ b/NKC_WF/site/Contact.aspx @@ -1,8 +1,6 @@ <%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="NKC_WF.Contact" %> - -
@@ -46,6 +44,4 @@
- - diff --git a/NKC_WF/site/ErrorsLog.aspx b/NKC_WF/site/ErrorsLog.aspx index 2f5b179..a83e76c 100644 --- a/NKC_WF/site/ErrorsLog.aspx +++ b/NKC_WF/site/ErrorsLog.aspx @@ -6,7 +6,7 @@
- Errors List + <%: traduci("ErrorsList") %>
diff --git a/NKC_WF/site/ErrorsLog.aspx.cs b/NKC_WF/site/ErrorsLog.aspx.cs index f6dc24b..161d2ac 100644 --- a/NKC_WF/site/ErrorsLog.aspx.cs +++ b/NKC_WF/site/ErrorsLog.aspx.cs @@ -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)) { diff --git a/NKC_WF/site/KitRequestImporter.aspx.cs b/NKC_WF/site/KitRequestImporter.aspx.cs index 5e78b13..7569f73 100644 --- a/NKC_WF/site/KitRequestImporter.aspx.cs +++ b/NKC_WF/site/KitRequestImporter.aspx.cs @@ -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; diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs index 6f68457..e54e0e7 100644 --- a/NKC_WF/site/OrderManager.aspx.cs +++ b/NKC_WF/site/OrderManager.aspx.cs @@ -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); } diff --git a/NKC_WF/site/SvgFull.aspx b/NKC_WF/site/SvgFull.aspx index ab676f8..b156a55 100644 --- a/NKC_WF/site/SvgFull.aspx +++ b/NKC_WF/site/SvgFull.aspx @@ -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" %> diff --git a/NKC_WF/site/SvgFull.aspx.cs b/NKC_WF/site/SvgFull.aspx.cs index 3607a22..aaf9057 100644 --- a/NKC_WF/site/SvgFull.aspx.cs +++ b/NKC_WF/site/SvgFull.aspx.cs @@ -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");