From 6889b3ca4e01b18383be96184ea91651f50b7c2c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 17:18:31 +0200 Subject: [PATCH 1/9] fix visualizzazione preview (NO se errore) --- NKC_WF/WebUserControls/cmp_batchList.ascx.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 7daf9b7..e1215ac 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -148,7 +148,8 @@ namespace NKC_WF.WebUserControls bool answ = false; int status = -1; int.TryParse(_status.ToString(), out status); - if (status > 3 && status < 8) + // solo stati 4 (nesting done), 5 (approvato), 6 (eliminazione logica) + if (status > 3 && status < 7) { answ = true; } From fd4887ecf0efa3a0e09b77bc9c4350c2d838660a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 17:18:43 +0200 Subject: [PATCH 2/9] rimozione pagina utility x SIM --- NKC_WF/site/Utility.aspx | 30 ------- NKC_WF/site/Utility.aspx.cs | 114 --------------------------- NKC_WF/site/Utility.aspx.designer.cs | 60 -------------- 3 files changed, 204 deletions(-) delete mode 100644 NKC_WF/site/Utility.aspx delete mode 100644 NKC_WF/site/Utility.aspx.cs delete mode 100644 NKC_WF/site/Utility.aspx.designer.cs diff --git a/NKC_WF/site/Utility.aspx b/NKC_WF/site/Utility.aspx deleted file mode 100644 index 1aae83a..0000000 --- a/NKC_WF/site/Utility.aspx +++ /dev/null @@ -1,30 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Utility.aspx.cs" Inherits="NKC_WF.Utility" %> - - -
-

Utility

-
-
- Cod Takt:
- -
-
- Num Stacks:
- -
-
- Num Panels per stack:
- -
-
-
- Crea dati -
-
-
-
- -
-
-
- diff --git a/NKC_WF/site/Utility.aspx.cs b/NKC_WF/site/Utility.aspx.cs deleted file mode 100644 index 734620f..0000000 --- a/NKC_WF/site/Utility.aspx.cs +++ /dev/null @@ -1,114 +0,0 @@ -using AppData; -using NKC_SDK; -using System; -using System.Collections.Generic; -using System.Web.UI; - -namespace NKC_WF -{ - public partial class Utility : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - txtCodTakt.Text = $"{DateTime.Now:yyyyMMdd}.1"; - txtNumStaks.Text = "3"; - txtNumPanels.Text = "5"; - } - } - - protected int numStackReq - { - get - { - int answ = 0; - Int32.TryParse(txtNumStaks.Text, out answ); - return answ; - } - } - protected int numPanels - { - get - { - int answ = 0; - Int32.TryParse(txtNumPanels.Text, out answ); - return answ; - } - } - - - protected void lbtMakeSim_Click(object sender, EventArgs e) - { - // creazione degli stack e dei pannelli... - List stackList = new List(); - List panelList; - ProdBunk currStack; - ProdSheet currPanel; - MaterialData currMaterial; - WorkData currPrintData; - WorkData currMachiningData; - WorkData currUnloadData; - for (int i = 1; i <= numStackReq; i++) - { - // devo creare fino a maxNumPanels - panelList = new List(); - for (int j = 1; j <= numPanels; j++) - { - currMaterial = new MaterialData() - { - MaterialId = 1, - MaterialPN = "6120", - MaterialDescription = "BOARD, WAFER, 1/4 X 48 X 96" - }; - currPrintData = new WorkData() - { - ProgramPath = @"c:\temp\PrintProgram.cnc" - }; - currMachiningData = new WorkData() - { - ProgramPath = @"c:\temp\MachiningProgram.cnc" - }; - currUnloadData = new WorkData() - { - ProgramPath = @"" - }; - currPanel = new ProdSheet() - { - SheetId = j, - Status = PStatus.Programmed, - Material = currMaterial, - Printing = currPrintData, - Machining = currMachiningData, - Unloading = currUnloadData - }; - panelList.Add(currPanel); - } - - currStack = new ProdBunk() - { - DataMatrix = $"DM{txtCodTakt.Text}.{i}", - BunkId = i, - Status = CStatus.Programmed, - SheetList = panelList - }; - stackList.Add(currStack); - } - // creazione oggetto takt - ComLib.Takt currTakt = new ComLib.Takt() - { - TaktId = txtCodTakt.Text, - Status = CStatus.Programmed, - StackList = stackList - }; - // serializzo - //string jsonData = JsonConvert.SerializeObject(currTakt); - string jsonData = ComLib.serializeTakt(currTakt); - - // scrivo su label - lblOut.Text = jsonData; - // salvo in redis / DB - ComLib.saveTakt("SERV", currTakt); - } - } -} \ No newline at end of file diff --git a/NKC_WF/site/Utility.aspx.designer.cs b/NKC_WF/site/Utility.aspx.designer.cs deleted file mode 100644 index 6d228ac..0000000 --- a/NKC_WF/site/Utility.aspx.designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 Utility { - - /// - /// Controllo txtCodTakt. - /// - /// - /// 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.TextBox txtCodTakt; - - /// - /// Controllo txtNumStaks. - /// - /// - /// 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.TextBox txtNumStaks; - - /// - /// Controllo txtNumPanels. - /// - /// - /// 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.TextBox txtNumPanels; - - /// - /// Controllo lbtMakeSim. - /// - /// - /// 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.LinkButton lbtMakeSim; - - /// - /// Controllo lblOut. - /// - /// - /// 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.Label lblOut; - } -} From 4a046393b582ad78a48754480a6072595413e662 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 17:19:01 +0200 Subject: [PATCH 3/9] start new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1270fc1..3104ba9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=331']) { + withEnv(['NEXT_BUILD_NUMBER=332']) { // 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}') From 5f1f06e0ce3c775e0f7aceac516c9623c0ba3636 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 17:20:23 +0200 Subject: [PATCH 4/9] traduzioni e code cleanup --- NKC_WF/NKC_WF.csproj | 8 ------ NKC_WF/site/PaintingSmart.aspx.cs | 42 ------------------------------- NKC_WF/site/UpdMan.aspx | 10 ++++---- 3 files changed, 5 insertions(+), 55 deletions(-) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e4c3d5e..3a90e95 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -436,7 +436,6 @@ - @@ -959,13 +958,6 @@ UpdMan.aspx - - Utility.aspx - ASPXCodeBehind - - - Utility.aspx - vocabolario.aspx ASPXCodeBehind diff --git a/NKC_WF/site/PaintingSmart.aspx.cs b/NKC_WF/site/PaintingSmart.aspx.cs index 6180106..a7907e0 100644 --- a/NKC_WF/site/PaintingSmart.aspx.cs +++ b/NKC_WF/site/PaintingSmart.aspx.cs @@ -14,49 +14,7 @@ namespace NKC_WF.site if (!Page.IsPostBack) { ((SiteMaster)this.Master).showSearch = false; -#if false - doUpdate(); -#endif } } -#if false - /// - /// Batch corrente... - /// - public int BatchId - { - set - { - hfBatchID.Value = value.ToString(); - } - get - { - int answ = 0; - int.TryParse(hfBatchID.Value, out answ); - return answ; - } - } - /// - /// Aggiorna componente principale e child components - /// - private void doUpdate() - { - setCurrData(); - // aggiorno child - cmp_unloadSmart.BatchId = BatchId; - } - /// - /// Imposta dati correnti (Bunk / Sheet) - /// - private void setCurrData() - { - // recupero bunk corrente... - DS_App.StackListRow currBunk = ComLib.getCurrBunk(); - if (currBunk != null) - { - BatchId = currBunk.BatchID; - } - } -#endif } } \ No newline at end of file diff --git a/NKC_WF/site/UpdMan.aspx b/NKC_WF/site/UpdMan.aspx index 64ca2f6..0c3509a 100644 --- a/NKC_WF/site/UpdMan.aspx +++ b/NKC_WF/site/UpdMan.aspx @@ -7,21 +7,21 @@
-

SteamWare's Updater

+

<%: traduci("SteamwareUpdManTitle") %>

-

Gestione Update pacchetti - Ultime release applicazioni.

+

<%: traduci("SteamwareUpdManDescr") %>

-

ALL

+

<%: traduci("All") %>

- LATEST VERS + <%: traduci("LatestVers") %>
@@ -51,7 +51,7 @@

LPA

- STABLE + <%: traduci("stable") %>
From 82ef7eabf9ee8175cc5b3a461bd971c5557df674 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 19:11:51 +0200 Subject: [PATCH 5/9] Alcuni controlli in fase di loginx evitare errori (forse) --- NKC_WF/WebUserControls/cmp_login.ascx.cs | 71 +++++++++++++++--------- 1 file changed, 46 insertions(+), 25 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_login.ascx.cs b/NKC_WF/WebUserControls/cmp_login.ascx.cs index 522953f..a8b05de 100644 --- a/NKC_WF/WebUserControls/cmp_login.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_login.ascx.cs @@ -28,38 +28,59 @@ namespace NKC_WF.WebUserControls { //recupera user windows se c'è... string ad_name = Page.User.Identity.Name; - string delimStr = "\\"; - char[] delimiter = delimStr.ToCharArray(); - string[] dom_user = ad_name.Split(delimiter, 2); - // passo al controllo di verifica ADuserOk... - user_std _utente = new user_std(); - if (_utente.ADuserOk(dom_user[0], dom_user[1])) + if (string.IsNullOrEmpty(ad_name)) { - bool fatto = _utente.startUpUtente(dom_user[0], dom_user[1]); - if (fatto) + lblMessage.Text = user_std.UtSn.Traduci("AccessFail") + user_std.UtSn.Traduci("EmptyAdName"); + logger.lg.scriviLog(String.Format("Accesso fallito, ad_name vuoto"), SteamWare.tipoLog.ERROR); + if (Login_Error != null) { - logger.lg.scriviLog(string.Format("L'utente {0} ({1}) ha effettuato il login correttamente", _utente.CognomeNome, _utente.userNameAD), SteamWare.tipoLog.INFO); - if (Login_ok != null) - { - Login_ok(this, new EventArgs()); - } - } - else - { - lblMessage.Text = String.Format("{0}
There are some problems instatiating user: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]); - logger.lg.scriviLog(String.Format("Accesso fallito, problemi ad istanziare l'utente {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.ERROR); - if (Login_Error != null) - { - Login_Error(this, new EventArgs()); - } + Login_Error(this, new EventArgs()); } } else { - lblMessage.Text = String.Format("{0}
user not allowed: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]); - logger.lg.scriviLog(String.Format("Utente non autorizzato: {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.WARNING); - if (Login_Error != null) + string delimStr = "\\"; + char[] delimiter = delimStr.ToCharArray(); + string[] dom_user = ad_name.Split(delimiter, 2); + // loggo PRE richiesta + try { + // passo al controllo di verifica ADuserOk... + user_std _utente = new user_std(); + if (_utente.ADuserOk(dom_user[0], dom_user[1])) + { + bool fatto = _utente.startUpUtente(dom_user[0], dom_user[1]); + if (fatto) + { + logger.lg.scriviLog(string.Format("L'utente {0} ({1}) ha effettuato il login correttamente", _utente.CognomeNome, _utente.userNameAD), SteamWare.tipoLog.INFO); + if (Login_ok != null) + { + Login_ok(this, new EventArgs()); + } + } + else + { + lblMessage.Text = String.Format("{0}
There are some problems instatiating user: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]); + logger.lg.scriviLog(String.Format("Accesso fallito, problemi ad istanziare l'utente {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.ERROR); + if (Login_Error != null) + { + Login_Error(this, new EventArgs()); + } + } + } + else + { + lblMessage.Text = String.Format("{0}
user not allowed: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]); + logger.lg.scriviLog(String.Format("Utente non autorizzato: {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.WARNING); + if (Login_Error != null) + { + Login_Error(this, new EventArgs()); + } + } + } + catch (Exception exc) + { + logger.lg.scriviLog($"Errore in AdLogin per {ad_name}{Environment.NewLine}{exc}"); Login_Error(this, new EventArgs()); } } From 854b03062bc71a8bfde8cbb069236b9b00cd5774 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 19:12:08 +0200 Subject: [PATCH 6/9] Ancora traduzione messaggi --- AppData/ComLib.cs | 55 ++++++++++---------------------------------- AppData/DataLayer.cs | 16 ++++++++----- 2 files changed, 22 insertions(+), 49 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 87292e7..4b02a2c 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -249,40 +249,40 @@ namespace AppData switch (bStatus) { case BatchStatus.Imported: - answ = "Imported"; + answ = traduci("Imported"); break; case BatchStatus.EstimationRequested: - answ = "Estimation Requested"; + answ = traduci("EstimationRequested"); break; case BatchStatus.EstimationDone: - answ = "Estimation Completed"; + answ = traduci("EstimationCompleted"); break; case BatchStatus.NestRequested: - answ = "Nesting Requested"; + answ = traduci("NestingRequested"); break; case BatchStatus.NestDone: - answ = "Nesting Completed"; + answ = traduci("NestingCompleted"); break; case BatchStatus.Approved: - answ = "Nesting Approved"; + answ = traduci("NestingApproved"); break; case BatchStatus.Discarded: - answ = "Nesting Discarded"; + answ = traduci("NestingDiscarded"); break; case BatchStatus.Errors: - answ = "Nesting Impossibile (data errors)"; + answ = traduci("NestingPrelimErrors"); break; case BatchStatus.PartEval: - answ = "Part/Item under evaluation"; + answ = traduci("NestPartEvaluating"); break; case BatchStatus.PartOk: - answ = "Part/Item Validated"; + answ = traduci("NestPartValidated"); break; case BatchStatus.PartKo: - answ = "Part/Item NOT Validated"; + answ = traduci("NestPartNotValidated"); break; default: - answ = $"Status unknown: {bStatus}"; + answ = traduci("NestStateUnk"); break; } } @@ -344,37 +344,6 @@ namespace AppData public string CadFilePath { get; set; } public int Qty { get; set; } } - -#if false - public class BatchData - { - /// - /// ID del batch in esecuzione - /// - public int BatchId { get; set; } - /// - /// tempo amssimo eprmesso x nesting (minuti) - /// - public int maxTime { get; set; } - /// - /// Tipo di processing richiesto - /// 1 = stima - /// 2 = nesting - /// - //[JsonConverter(typeof(StringEnumConverter))] - public int procType { get; set; } - /// - /// Codice della amcchina x cui si effettua richeista - /// - [JsonConverter(typeof(StringEnumConverter))] - public mType machineType { get; set; } - /// - /// Tipo di ordine richeisto - /// - //[JsonConverter(typeof(StringEnumConverter))] - public oType orderType { get; set; } - } -#endif /// /// Salva su redis l'oggetto dei materiali serializzato /// diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index 3323c67..31380df 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -159,7 +159,11 @@ namespace AppData return "Mario Rossi"; } } - + /// + /// Main BCode decoding function + /// + /// + /// public decodedData decodeBcode(string bcValue) { decodedData answ = new decodedData(); @@ -207,7 +211,7 @@ namespace AppData int codeInt = 0; int.TryParse(answ.code, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = codeInt; - answ.description = $"Other Item: {answ.code}"; + answ.description = $"{ComLib.traduci("OtherPart")}: {answ.code}"; } else if (bcValue.StartsWith("IT")) { @@ -216,7 +220,7 @@ namespace AppData int codeInt = 0; int.TryParse(answ.code, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = codeInt; - answ.description = $"Item: {answ.code}"; + answ.description = $"{ComLib.traduci("Part")}: {answ.code}"; } else if (bcValue.StartsWith("CR")) { @@ -225,7 +229,7 @@ namespace AppData int codeInt = 0; int.TryParse(answ.code, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = codeInt; - answ.description = $"Cart: {answ.code}"; + answ.description = $"{ComLib.traduci("Cart")}: {answ.code}"; } else if (bcValue.StartsWith("BN")) { @@ -234,7 +238,7 @@ namespace AppData int codeInt = 0; int.TryParse(answ.code, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = codeInt; - answ.description = $"Bin: {answ.code}"; + answ.description = $"{ComLib.traduci("Bin")}: {answ.code}"; } else if (bcValue.StartsWith("BP")) { @@ -243,7 +247,7 @@ namespace AppData int codeInt = 0; int.TryParse(answ.code, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = codeInt; - answ.description = $"Processed Bin: {answ.code}"; + answ.description = $"{ComLib.traduci("BinPaint")}: {answ.code}"; } return answ; } From 85b7d19df5183a4512d63eeacafecad36cd23dfb Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 19:12:19 +0200 Subject: [PATCH 7/9] eliminazione classi inutilizzate --- AppData/DbLib.cs | 6 ------ AppData/SyncLib.cs | 21 --------------------- NKC_WF/site/SyncData.aspx | 17 ----------------- NKC_WF/site/SyncData.aspx.cs | 23 ----------------------- NKC_WF/site/SyncData.aspx.designer.cs | 26 -------------------------- 5 files changed, 93 deletions(-) delete mode 100644 AppData/DbLib.cs delete mode 100644 AppData/SyncLib.cs delete mode 100644 NKC_WF/site/SyncData.aspx delete mode 100644 NKC_WF/site/SyncData.aspx.cs delete mode 100644 NKC_WF/site/SyncData.aspx.designer.cs diff --git a/AppData/DbLib.cs b/AppData/DbLib.cs deleted file mode 100644 index bf5bf89..0000000 --- a/AppData/DbLib.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace AppData -{ - public class DbLib - { - } -} diff --git a/AppData/SyncLib.cs b/AppData/SyncLib.cs deleted file mode 100644 index 91f42f3..0000000 --- a/AppData/SyncLib.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace AppData -{ - public class SyncLib - { - - /// - /// Esegue richieste lettura da PROD - /// - public static void procProdReadReq() - { - // !!!FIXME!!! - } - /// - /// Esegue richieste lettura da PROD - /// - public static void procProdWriteReq() - { - // !!!FIXME!!! - } - } -} diff --git a/NKC_WF/site/SyncData.aspx b/NKC_WF/site/SyncData.aspx deleted file mode 100644 index 693f3ff..0000000 --- a/NKC_WF/site/SyncData.aspx +++ /dev/null @@ -1,17 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SyncData.aspx.cs" Inherits="NKC_WF.SyncData" %> - - - - - - - - - -
-
- OK -
-
- - diff --git a/NKC_WF/site/SyncData.aspx.cs b/NKC_WF/site/SyncData.aspx.cs deleted file mode 100644 index 176ff82..0000000 --- a/NKC_WF/site/SyncData.aspx.cs +++ /dev/null @@ -1,23 +0,0 @@ -using AppData; -using System; - -namespace NKC_WF -{ - public partial class SyncData : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - processRedisRequest(); - } - /// - /// Effettua le operaizoni di SYNC tra REDIS e DB - /// - private void processRedisRequest() - { - // processa richieste lettura del PROD - SyncLib.procProdReadReq(); - // processa richieste scrittura del PROD - SyncLib.procProdWriteReq(); - } - } -} \ No newline at end of file diff --git a/NKC_WF/site/SyncData.aspx.designer.cs b/NKC_WF/site/SyncData.aspx.designer.cs deleted file mode 100644 index 4c4fddf..0000000 --- a/NKC_WF/site/SyncData.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 SyncData - { - - /// - /// 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; - } -} From b11073f4f6d6f23045d26b56314d0da4e25f1661 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Aug 2020 19:12:26 +0200 Subject: [PATCH 8/9] refresh vari traduzioni --- AppData/AppData.csproj | 2 -- AppData/Utils.cs | 2 +- NKC_WF/NKC_WF.csproj | 8 -------- NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs | 3 +++ 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj index 911a3fc..f25c2ad 100644 --- a/AppData/AppData.csproj +++ b/AppData/AppData.csproj @@ -161,7 +161,6 @@ - DS_App.xsd @@ -183,7 +182,6 @@ - diff --git a/AppData/Utils.cs b/AppData/Utils.cs index 19287d5..3c70d54 100644 --- a/AppData/Utils.cs +++ b/AppData/Utils.cs @@ -20,7 +20,7 @@ namespace AppData } catch (Exception exc) { - logger.lg.scriviLog($"Eccezione in decodifica path in persorso relativo all'app:{Environment.NewLine}{exc}", tipoLog.EXCEPTION); + logger.lg.scriviLog($"{ComLib.traduci("UtilsErrorMapPath")}:{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } return answ; } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 3a90e95..2df3e19 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -433,7 +433,6 @@ - @@ -930,13 +929,6 @@ StackManager.aspx - - SyncData.aspx - ASPXCodeBehind - - - SyncData.aspx - Unauth.aspx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs index 9c4c21a..72ac3fc 100644 --- a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs @@ -421,8 +421,11 @@ namespace NKC_WF.WebUserControls protected void lbtCancel_Click(object sender, EventArgs e) { + // FIXME TODO va eliminata?!?!?!? // resetto item selezionato... DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + + resetDisplay(true); showItemDetail(false, null, false); } From 7987ec6adf76a32cf8f62d644cadf5509ff32869 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 17 Aug 2020 09:01:07 +0200 Subject: [PATCH 9/9] Update package steamware x login + revisione login/ errorPage --- NKC_WF/NKC_WF.csproj | 12 +- NKC_WF/Web.config | 427 +++++++++++------------ NKC_WF/WebUserControls/cmp_login.ascx.cs | 62 ++-- NKC_WF/packages.config | 2 +- NKC_WF/site/ErrorPage.aspx | 37 ++ NKC_WF/site/ErrorPage.aspx.cs | 49 +++ NKC_WF/site/ErrorPage.aspx.designer.cs | 35 ++ NKC_WF/site/Login.aspx.cs | 2 +- 8 files changed, 377 insertions(+), 249 deletions(-) create mode 100644 NKC_WF/site/ErrorPage.aspx create mode 100644 NKC_WF/site/ErrorPage.aspx.cs create mode 100644 NKC_WF/site/ErrorPage.aspx.designer.cs diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 2df3e19..0749357 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -128,8 +128,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.4.1.2008.735\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -405,6 +405,7 @@ + @@ -729,6 +730,13 @@ DevUtils.aspx + + ErrorPage.aspx + ASPXCodeBehind + + + ErrorPage.aspx + ErrorsLog.aspx ASPXCodeBehind diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 097e881..78879a8 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -6,410 +6,397 @@ -
-
-
-
+
+
+
+
- - + + - + - - + + - + - - - + + + - + - - - - - - - + + + + + + + - - + + - - - - - - + + + + + + - - - + + + - + - - - + + + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - - + + + + - - - - - + + + + + @@ -417,20 +404,20 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - +