diff --git a/Jenkinsfile b/Jenkinsfile index b90d105..af0b0e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=317']) { + withEnv(['NEXT_BUILD_NUMBER=318']) { // 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/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 33c29d4..2012476 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -293,8 +293,11 @@ namespace NKC_WF.Controllers } else { + string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower(); + string servBasePath = memLayer.ML.CRS("servBasePath").ToLower(); + string fixPath = rispNest.DrawingPath.ToLower().Replace(nestBasePath, servBasePath); // segno offline order come processato registrando il disegno e segno ogni PART come lavorata da OffOrd2Item (status 992) - DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispNest.BatchID), rispNest.DrawingPath); + DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispNest.BatchID), fixPath); } } } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e30ed68..e29fd86 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -473,6 +473,7 @@ + @@ -1259,6 +1260,13 @@ cmp_offOrderDetail.ascx + + cmp_OOIL_drawings.ascx + ASPXCodeBehind + + + cmp_OOIL_drawings.ascx + cmp_OOLI_detail.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx new file mode 100644 index 0000000..9885983 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx @@ -0,0 +1,17 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_OOIL_drawings.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_OOIL_drawings" %> + + +
+
+
<%: traduci("Drawings") %>
+
+ + +
+ + <%# Eval("imgName") %> + +
+ + +
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs new file mode 100644 index 0000000..b0f39c0 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs @@ -0,0 +1,74 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_OOIL_drawings : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + public string DrawingPath + { + get + { + return hfDrawingPath.Value; + } + set + { + string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower(); + string servBasePath = memLayer.ML.CRS("servBasePath").ToLower(); + string fixPath = value.Replace(nestBasePath, servBasePath); + hfDrawingPath.Value = fixPath; + fixDataBind(); + } + } + + private void fixDataBind() + { + string currPath = DrawingPath; + // in primis: fix directory + // visibile SOLO SE valore != null... + if (string.IsNullOrEmpty(currPath)) + { + divDrawings.Visible = false; + } + else + { + divDrawings.Visible = true; + List elencoDisegni = new List(); + // verifico path assoluto... + if (!Path.IsPathRooted(currPath)) + { + 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(); + } + } + + public class imgData + { + public string imgName { get; set; } = ""; + public string DrawPath { get; set; } = ""; + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.designer.cs new file mode 100644 index 0000000..f297d0d --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// 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.WebUserControls +{ + + + public partial class cmp_OOIL_drawings + { + + /// + /// Controllo hfDrawingPath. + /// + /// + /// 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.HiddenField hfDrawingPath; + + /// + /// Controllo divDrawings. + /// + /// + /// 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.HtmlGenericControl divDrawings; + + /// + /// Controllo repDraw. + /// + /// + /// 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.Repeater repDraw; + } +} diff --git a/NKC_WF/WebUserControls/cmp_kitList.ascx b/NKC_WF/WebUserControls/cmp_kitList.ascx index 37c036f..fe6588e 100644 --- a/NKC_WF/WebUserControls/cmp_kitList.ascx +++ b/NKC_WF/WebUserControls/cmp_kitList.ascx @@ -2,34 +2,34 @@ - - - - - - - -
- -
- - - - - - - - - - - -
- - -
- - - + + + + + + + +
+ +
+ + + + + + + + + + + +
+ + +
+ + + diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index cb7f921..1c88ba5 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -1,38 +1,45 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_offOrderDetail.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_offOrderDetail" %> <%@ Register Src="~/WebUserControls/cmp_OOLI_detail.ascx" TagPrefix="uc1" TagName="cmp_OOLI_detail" %> +<%@ Register Src="~/WebUserControls/cmp_OOIL_drawings.ascx" TagPrefix="uc1" TagName="cmp_OOIL_drawings" %> +
- - -
-
- NOT YET PROCESSED - - - -
-
-
-
- MAKE CNC PROG -
-
- PRINT LABELS - ITEM DONE -
-
-
-
- -
-
- - - - - - - - + + + +
+
+ NOT YET PROCESSED + <%-- + --%> +
+
+ + +
+
+
+
+ MAKE CNC PROG +
+
+ PRINT LABELS + ITEM DONE +
+
+
+
+ +
+
+ + + + + + + + +
diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs index 9e860c8..9df63d6 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -37,22 +37,6 @@ namespace NKC_WF.WebUserControls protected void frmView_DataBound(object sender, EventArgs e) { - try - { - Label filePath = (Label)frmView.FindControl("DrawFilePathLabel"); - // se ho una stringa valida mostro svg, altrimenti NOT PROCESSED... - if (!string.IsNullOrEmpty(filePath.Text)) - { - string filename = Server.MapPath(filePath.Text); - string svgRawData = File.ReadAllText(filename); - HtmlGenericControl svgControl = (HtmlGenericControl)frmView.FindControl("svgTable"); - svgControl.InnerHtml = svgRawData; - } - } - catch (Exception exc) - { - logger.lg.scriviLog($"Eccezione in tentativo display file svg da ordine offline{Environment.NewLine}{exc}"); - } } protected void lbtMakeCnc_Click(object sender, EventArgs e) @@ -103,7 +87,7 @@ namespace NKC_WF.WebUserControls protected void lblDone_Click(object sender, EventArgs e) { - // registro che ho COMPLETATO... 3! + // registro che ho COMPLETATO... 3! (e di conseguenza aggiorna gli items...) DataLayer.man.taOffOL.updateStatus(OffOrdId, 3); raiseReset(); } diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs index 491a087..c784e36 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs @@ -4,7 +4,7 @@ using System.Web.UI; namespace NKC_WF.WebUserControls { - public partial class cmp_offlineOrders : System.Web.UI.UserControl + public partial class cmp_offlineOrders : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { @@ -47,6 +47,7 @@ namespace NKC_WF.WebUserControls grView.SelectedIndex = -1; grView.DataBind(); cmp_offOrderDetail.Visible = false; + raiseReset(); } protected int selOrdId diff --git a/NKC_WF/WebUserControls/cmp_scrapList.ascx b/NKC_WF/WebUserControls/cmp_scrapList.ascx index e4dfff5..8221bf4 100644 --- a/NKC_WF/WebUserControls/cmp_scrapList.ascx +++ b/NKC_WF/WebUserControls/cmp_scrapList.ascx @@ -3,59 +3,47 @@
-
-

Scrap List (Items to process)

-
-
- - - <%-- - - - --%> - - - - - - - - - - - - - - - <%-- - --%> - <%-- - - - --%> - - - - - - - - - - - - - - - - - - - <%----%> - <%----%> - Create Order -
-
-
- +
+

Scrap List (Items to process)

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create Order +
+
+ +
diff --git a/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs b/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs index c999655..638f93a 100644 --- a/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs @@ -59,18 +59,28 @@ namespace NKC_WF.WebUserControls string baseCurr = memLayer.ML.CRS("servBasePath").ToLower(); try { - var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); - if (tabSheets.Count > 0) + if (SheetId > 0) { - filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); - // la versioen da usare è la "_qr.svg", x cui faccio replace... tolgo ultimi 4 char e sostituisco... - int repPos = filename.LastIndexOf(".svg"); - filename = filename.Remove(repPos) + "_qr.svg"; - if (memLayer.ML.CRB("userVirtDir")) + var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); + if (tabSheets.Count > 0) { - filename = Server.MapPath(filename); + filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); + // la versioen da usare è la "_qr.svg", x cui faccio replace... tolgo ultimi 4 char e sostituisco... + int repPos = filename.LastIndexOf(".svg"); + filename = filename.Remove(repPos) + "_qr.svg"; + if (memLayer.ML.CRB("userVirtDir")) + { + filename = Server.MapPath(filename); + } + answ = File.ReadAllText(filename); + } + } + else + { + if (File.Exists(filename)) + { + answ = File.ReadAllText(filename); } - answ = File.ReadAllText(filename); } } catch diff --git a/NKC_WF/site/MachineOffline.aspx b/NKC_WF/site/MachineOffline.aspx index f668bd6..e04e0c8 100644 --- a/NKC_WF/site/MachineOffline.aspx +++ b/NKC_WF/site/MachineOffline.aspx @@ -8,10 +8,10 @@
-
+
-
+
diff --git a/NKC_WF/site/MachineOffline.aspx.cs b/NKC_WF/site/MachineOffline.aspx.cs index d59bcca..52c6d84 100644 --- a/NKC_WF/site/MachineOffline.aspx.cs +++ b/NKC_WF/site/MachineOffline.aspx.cs @@ -1,4 +1,5 @@ -using System; +using NKC_WF.WebUserControls; +using System; namespace NKC_WF { @@ -7,6 +8,12 @@ namespace NKC_WF protected void Page_Load(object sender, EventArgs e) { cmp_scrapList.eh_doRefresh += Cmp_scrapList_eh_doRefresh; + cmp_offlineOrders.eh_doReset += cmp_offlineOrders_eh_doReset; + } + + private void cmp_offlineOrders_eh_doReset(object sender, EventArgs e) + { + cmp_scrapList.doUpdate(); } private void Cmp_scrapList_eh_doRefresh(object sender, EventArgs e) diff --git a/NKC_WF/site/SvgFull.aspx.cs b/NKC_WF/site/SvgFull.aspx.cs index 58c8e6f..3607a22 100644 --- a/NKC_WF/site/SvgFull.aspx.cs +++ b/NKC_WF/site/SvgFull.aspx.cs @@ -13,12 +13,21 @@ namespace NKC_WF.site { protected void Page_Load(object sender, EventArgs e) { - if(!Page.IsPostBack) + if (!Page.IsPostBack) { ((SiteMaster)this.Master).showSearch = false; // recupero valore URL ed imposto... int sheetId = memLayer.ML.QSI("sheetId"); - cmp_svgFull.SheetId = sheetId; + string ImgPath = memLayer.ML.QSS("ImgPath"); + if (sheetId > 0) + { + cmp_svgFull.SheetId = sheetId; + } + else if(!string.IsNullOrEmpty(ImgPath)) + { + cmp_svgFull.filename = ImgPath; + cmp_svgFull.updateSvg(); + } } } }