From bcd0b27e5745259cf85f5addf507b54ca13f9084 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 9 Mar 2020 18:38:34 +0100 Subject: [PATCH 1/3] Update componenti css --- NKC_WF/Content/Site.css | 24 ++++++++++++------------ NKC_WF/compilerconfig.json | 4 ---- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/NKC_WF/Content/Site.css b/NKC_WF/Content/Site.css index 39becca..1c9e597 100644 --- a/NKC_WF/Content/Site.css +++ b/NKC_WF/Content/Site.css @@ -12,8 +12,8 @@ body { padding-right: 15px; } .textCondens { - font-family: 'Roboto Condensed', sans-serif; - /*font-family: 'Open Sans Condensed', sans-serif;*/ + /*font-family: 'Roboto Condensed', sans-serif;*/ + font-family: 'Open Sans Condensed', sans-serif; } .textNormal { font-family: 'Roboto', sans-serif; @@ -134,10 +134,10 @@ body { text-align: center; } .shortcuts .shortcut { - min-width: 180px; - min-height: 100px; + min-width: 9rem; + min-height: 5rem; display: inline-block; - padding: 13.33333333px 0; + padding: 0.66666667rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -150,13 +150,13 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 10px; + border-radius: 0.5rem; } .shortcuts .shortcut-sm { - min-width: 90px; - min-height: 60px; + min-width: 4.5rem; + min-height: 3rem; display: inline-block; - padding: 5px 0; + padding: 0.25rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -169,20 +169,20 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 10px; + border-radius: 0.5rem; } .shortcuts .shortcut .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 40px; + font-size: 2rem; color: #333; } .shortcuts .shortcut-sm .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 40px; + font-size: 2rem; color: #333; } .shortcuts .shortcut:hover { diff --git a/NKC_WF/compilerconfig.json b/NKC_WF/compilerconfig.json index 1643197..e230dda 100644 --- a/NKC_WF/compilerconfig.json +++ b/NKC_WF/compilerconfig.json @@ -3,10 +3,6 @@ "outputFile": "Content/Site.css", "inputFile": "Content/Site.less" }, - { - "outputFile": "Content/Site-old.css", - "inputFile": "Content/Site-old.less" - }, { "outputFile": "Content/fonts.css", "inputFile": "Content/fonts.less" From a2c16c58888379a7577b9e4c1e460edf5367d13f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 9 Mar 2020 18:39:49 +0100 Subject: [PATCH 2/3] Update x typo error Bath --> Path --- AppData/ComLib.cs | 20 +++++++++---------- NKC_WF/Controllers/BatchProcController.cs | 4 ++-- .../WebUserControls/cmp_MU_svgViewer.ascx.cs | 4 ++-- NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs | 2 +- .../cmp_validationSummary.ascx.cs | 4 ++-- NKC_WF/site/OrderManager.aspx.cs | 16 +++++++-------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index eda7489..237c65c 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -1342,9 +1342,9 @@ namespace AppData DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(currBunk.StackID); DateTime dataStart = DateTime.Now; ProdSheet currPanel; - string nestBaseBath = memLayer.ML.CRS("nestBaseBath").ToLower(); - string servBaseBath = memLayer.ML.CRS("servBaseBath").ToLower(); - string prodBaseBath = memLayer.ML.CRS("prodBaseBath").ToLower(); + string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower(); + string servBasePath = memLayer.ML.CRS("servBasePath").ToLower(); + string prodBasePath = memLayer.ML.CRS("prodBasePath").ToLower(); foreach (var item in tabSheets) { // converto i workData con check null sul campo data @@ -1352,13 +1352,13 @@ namespace AppData { DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart, DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd, - ProgramPath = item.PrintFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.PrintFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath) }; WorkData wdMachining = new WorkData() { DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart, DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd, - ProgramPath = item.CncFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.CncFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath) }; WorkData wdUnload = new WorkData() { @@ -1427,9 +1427,9 @@ namespace AppData DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(StackID); DateTime dataStart = DateTime.Now; ProdSheet currPanel; - string nestBaseBath = memLayer.ML.CRS("nestBaseBath").ToLower(); - string servBaseBath = memLayer.ML.CRS("servBaseBath").ToLower(); - string prodBaseBath = memLayer.ML.CRS("prodBaseBath").ToLower(); + string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower(); + string servBasePath = memLayer.ML.CRS("servBasePath").ToLower(); + string prodBasePath = memLayer.ML.CRS("prodBasePath").ToLower(); foreach (var item in tabSheets) { // converto i workData @@ -1437,13 +1437,13 @@ namespace AppData { DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart, DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd, - ProgramPath = item.PrintFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.PrintFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath) }; WorkData wdMachining = new WorkData() { DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart, DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd, - ProgramPath = item.CncFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath) + ProgramPath = item.CncFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath) }; WorkData wdUnload = new WorkData() { diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 9d4f42b..c60084a 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -209,8 +209,8 @@ namespace NKC_WF.Controllers // salvo udpate elenco ITEMS ComLib.updatePartsFromNesting(rispStima.PartList); // aggiorno cadPath x items che non abbiano valorizzato... - string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF"; - DataLayer.man.taIL.updateCadPath(cadBaseBath, rispStima.BatchID, false); + string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}"; + DataLayer.man.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false); // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella! if (bStatus > 7) { diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index f04ad2d..3e946b4 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -64,8 +64,8 @@ namespace NKC_WF.WebUserControls { // recupero ID del foglio corrente string answ = ""; - string baseOrig = memLayer.ML.CRS("nestBaseBath").ToLower(); - string baseCurr = memLayer.ML.CRS("servBaseBath").ToLower(); + string baseOrig = memLayer.ML.CRS("nestBasePath").ToLower(); + string baseCurr = memLayer.ML.CRS("servBasePath").ToLower(); try { var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); diff --git a/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs b/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs index 6ea68cf..2dfdc0f 100644 --- a/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs @@ -75,7 +75,7 @@ namespace NKC_WF.WebUserContols /// - /// permesso scrittura SE E' abilitato a aprtire dalla tab diritti... + /// permesso scrittura SE E' abilitato a partire dalla tab diritti... /// public bool userIsAuth { diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs index 0b96046..0a26c1c 100644 --- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs @@ -33,8 +33,8 @@ namespace NKC_WF.WebUserControls // chiamo stored x creazione NUOVI BATCH... try { - string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF"; - DataLayer.man.taBL.createPartValBatch(cadBaseBath); + string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}"; + DataLayer.man.taBL.createPartValBatch(cadBasePath); // eventualmente mando primo batch da validare... bool newValidSent = ComLib.sendFirstValidationBatch(); } diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs index 22374ca..8311981 100644 --- a/NKC_WF/site/OrderManager.aspx.cs +++ b/NKC_WF/site/OrderManager.aspx.cs @@ -19,11 +19,11 @@ namespace NKC_WF /// /// Path base x nesting /// - protected string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF"; + protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}"; /// /// Path base x server /// - protected string srvCadBaseBath = $"{memLayer.ML.CRS("servBaseBath")}/DXF"; + protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}/{memLayer.ML.CRS("drawingFolder")}"; protected void Page_Load(object sender, EventArgs e) { @@ -47,7 +47,7 @@ namespace NKC_WF * Note validazione: * - leggo cSV * - carico su DB - * - verifico (coem ora x DXF) TTTI i aprticolari + * - verifico (come ora x DXF) TUTTI i particolari * - cerco su tab ItemValidation * --> NON TROVATO --> creo record IV + record Batch stato 8, con KitID = OrdID = 0, DA VALUTARE!!! * - se valutazione tempo <= 1 sec --> NON VALIDO @@ -130,7 +130,7 @@ namespace NKC_WF dataValidated = false; } // FIX eventuali cadFilePath... - DataLayer.man.taIL.updateCadPath(cadBaseBath, 0, false); + DataLayer.man.taIL.updateCadPath(cadBasePath, 0, false); // recupero da batch la riga impostata... try { @@ -185,20 +185,20 @@ namespace NKC_WF // verifico SE già processato... if (!missingDxfList.Contains(item.ItemExtCode)) { - // cerco file! sostituisco cadBaseBath --> srvCadBaseBath + // cerco file! sostituisco cadBasePath --> srvCadBasePath if (string.IsNullOrEmpty(item.CadFilePath)) { - localPath = $"{srvCadBaseBath}{item.ItemExtCode}.dxf"; + localPath = $"{srvCadBasePath}{item.ItemExtCode}.dxf"; } else { - localPath = item.CadFilePath.Replace(cadBaseBath, srvCadBaseBath); + localPath = item.CadFilePath.Replace(cadBasePath, srvCadBasePath); } // verifico 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 for part {item.ItemExtCode} on {srvCadBaseBath} | {item.ItemDesc}"); + DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"DXF File not found for part {item.ItemExtCode} on {srvCadBasePath} | {item.ItemDesc}"); allOk = false; missingDxfList.Add(item.ItemExtCode); } From 1b0010952f3de3c3ce95f68c7880125e3c6d250c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 9 Mar 2020 18:39:58 +0100 Subject: [PATCH 3/3] nuova vers con fix x path DXF --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0d88588..95d4acd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=263']) { + withEnv(['NEXT_BUILD_NUMBER=264']) { // 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}')