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/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; } 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/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/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}') diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e4c3d5e..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 @@ + @@ -433,10 +434,8 @@ - - @@ -731,6 +730,13 @@ DevUtils.aspx + + ErrorPage.aspx + ASPXCodeBehind + + + ErrorPage.aspx + ErrorsLog.aspx ASPXCodeBehind @@ -931,13 +937,6 @@ StackManager.aspx - - SyncData.aspx - ASPXCodeBehind - - - SyncData.aspx - Unauth.aspx ASPXCodeBehind @@ -959,13 +958,6 @@ UpdMan.aspx - - Utility.aspx - ASPXCodeBehind - - - Utility.aspx - vocabolario.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. --> - + - + - +