From 5a2b3e1c3fc2c3783ab9baabd98c653c09689c4e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 16:09:45 +0200 Subject: [PATCH 1/5] start new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 552f92c..bc5d3ca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=341']) { + withEnv(['NEXT_BUILD_NUMBER=342']) { // 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 dc30a6a4b796e24cbdd309bc96389e37ece743b8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:07:01 +0200 Subject: [PATCH 2/5] Review gestione coda invio NEST tra BATH + Offline --- AppData/ComLib.cs | 9 ++ AppData/DS_App.Designer.cs | 38 +++++-- AppData/DS_App.xsd | 104 ++++++++++-------- AppData/DS_App.xss | 2 +- NKC_WF/NKC_WF.csproj | 40 +++++++ .../WebUserControls/cmp_batchDetail.ascx.cs | 17 ++- .../WebUserControls/cmp_offOrderDetail.ascx | 8 +- .../cmp_offOrderDetail.ascx.cs | 39 +++++++ 8 files changed, 188 insertions(+), 69 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 11dd421..4492913 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -662,7 +662,16 @@ namespace AppData // restituisco ok return answ; } + /// + /// Annulla (Svuota) richiesta di esecuzione di CAM + /// + /// + public static bool resetRequestToNest() + { + bool answ = false; + return answ; + } /// /// Invia una richiesta di esecuzione di CAM x un ordine offline /// diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index cb30b8e..848d217 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -29227,7 +29227,7 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_OOL"; @@ -29246,24 +29246,29 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxOrdStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_OOL_insert"; + this._commandCollection[3].CommandText = "dbo.stp_OOL_getRunning"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_OOL_updateDrawing"; + this._commandCollection[4].CommandText = "dbo.stp_OOL_insert"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrawFilePath", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CncFilePath", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_OOL_updateStatus"; + this._commandCollection[5].CommandText = "dbo.stp_OOL_updateDrawing"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrawFilePath", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CncFilePath", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "dbo.stp_OOL_updateStatus"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -29328,18 +29333,29 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_App.OfflineOrderListDataTable insertNew() { + public virtual DS_App.OfflineOrderListDataTable getRunning() { this.Adapter.SelectCommand = this.CommandCollection[3]; DS_App.OfflineOrderListDataTable dataTable = new DS_App.OfflineOrderListDataTable(); this.Adapter.Fill(dataTable); return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_App.OfflineOrderListDataTable insertNew() { + this.Adapter.SelectCommand = this.CommandCollection[4]; + DS_App.OfflineOrderListDataTable dataTable = new DS_App.OfflineOrderListDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateDrawing(global::System.Nullable Original_OrdID, string DrawFilePath, string CncFilePath) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((Original_OrdID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_OrdID.Value)); } @@ -29379,7 +29395,7 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateStatus(global::System.Nullable Original_OrdID, global::System.Nullable OrdStatus) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((Original_OrdID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_OrdID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index d75ba38..08dacba 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1391,6 +1391,16 @@ FROM v_OOL + + + + dbo.stp_OOL_getRunning + + + + + + @@ -2990,7 +3000,7 @@ FROM v_OKIB - + @@ -3040,7 +3050,7 @@ FROM v_OKIB - + @@ -3065,7 +3075,7 @@ FROM v_OKIB - + @@ -3120,7 +3130,7 @@ FROM v_OKIB - + @@ -3193,7 +3203,7 @@ FROM v_OKIB - + @@ -3201,7 +3211,7 @@ FROM v_OKIB - + @@ -3270,7 +3280,7 @@ FROM v_OKIB - + @@ -3303,7 +3313,7 @@ FROM v_OKIB - + @@ -3344,7 +3354,7 @@ FROM v_OKIB - + @@ -3363,7 +3373,7 @@ FROM v_OKIB - + @@ -3394,7 +3404,7 @@ FROM v_OKIB - + @@ -3402,7 +3412,7 @@ FROM v_OKIB - + @@ -3419,7 +3429,7 @@ FROM v_OKIB - + @@ -3428,7 +3438,7 @@ FROM v_OKIB - + @@ -3459,7 +3469,7 @@ FROM v_OKIB - + @@ -3467,7 +3477,7 @@ FROM v_OKIB - + @@ -3483,7 +3493,7 @@ FROM v_OKIB - + @@ -3491,7 +3501,7 @@ FROM v_OKIB - + @@ -3519,7 +3529,7 @@ FROM v_OKIB - + @@ -3555,7 +3565,7 @@ FROM v_OKIB - + @@ -3571,7 +3581,7 @@ FROM v_OKIB - + @@ -3581,7 +3591,7 @@ FROM v_OKIB - + @@ -3598,7 +3608,7 @@ FROM v_OKIB - + @@ -3611,7 +3621,7 @@ FROM v_OKIB - + @@ -3660,7 +3670,7 @@ FROM v_OKIB - + @@ -3689,7 +3699,7 @@ FROM v_OKIB - + @@ -3731,7 +3741,7 @@ FROM v_OKIB - + @@ -3840,7 +3850,7 @@ FROM v_OKIB - + @@ -3903,7 +3913,7 @@ FROM v_OKIB - + @@ -3948,7 +3958,7 @@ FROM v_OKIB - + @@ -3974,7 +3984,7 @@ FROM v_OKIB - + @@ -4067,7 +4077,7 @@ FROM v_OKIB - + @@ -4130,7 +4140,7 @@ FROM v_OKIB - + @@ -4189,7 +4199,7 @@ FROM v_OKIB - + @@ -4238,7 +4248,7 @@ FROM v_OKIB - + @@ -4397,18 +4407,18 @@ FROM v_OKIB - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 9428204..c4fdd0e 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 43d5aa6..ddb144d 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -288,7 +288,12 @@ + + + + + @@ -655,6 +660,27 @@ Empty.Master + + 400.aspx + ASPXCodeBehind + + + 400.aspx + + + 401.aspx + ASPXCodeBehind + + + 401.aspx + + + 403.aspx + ASPXCodeBehind + + + 403.aspx + 404.aspx ASPXCodeBehind @@ -662,6 +688,20 @@ 404.aspx + + 500.aspx + ASPXCodeBehind + + + 500.aspx + + + 503.aspx + ASPXCodeBehind + + + 503.aspx + Oops.aspx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 9ba201e..5025067 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -235,13 +235,20 @@ namespace NKC_WF.WebUserControls answ = (status == (int)statusReq); return answ; } + /// + /// verifica possibilità avvio TASK x presenza task NON chiusi + /// + /// public bool canStartNew() { bool answ = false; // in primis controllo SE ci siano task running, nel qual caso è false e basta... int numEst = DataLayer.man.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", 0).Count; int numNest = DataLayer.man.taBL.getByStatus((int)BatchStatus.NestRequested, "", 0).Count; - answ = ((numEst + numNest) == 0); + // ora controllo anche offline orders... + int numOffOrd = DataLayer.man.taOffOL.getRunning().Count; + // ora la somma di tutti DEVE essere zero... + answ = ((numEst + numNest + numOffOrd) == 0); return answ; } /// @@ -264,8 +271,8 @@ namespace NKC_WF.WebUserControls protected void lbtStopEstim_Click(object sender, EventArgs e) { - // !!!FIXME!!! inviare a redis... - + // resetto richiesta + ComLib.resetBatchReq(); // registro su DB nesting iniziato... DataLayer.man.taBL.updateStatus(BatchId, (int)BatchStatus.Imported, "", -1); raiseEvent(); @@ -283,8 +290,8 @@ namespace NKC_WF.WebUserControls } protected void lbtStopNesting_Click(object sender, EventArgs e) { - // !!!FIXME!!! inviare a redis... - + // resetto richiesta + ComLib.resetBatchReq(); // registro su DB nesting iniziato... DataLayer.man.taBL.updateStatus(BatchId, (int)BatchStatus.EstimationDone, "", -1); raiseEvent(); diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index 7cdcaf3..1c77b0f 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -11,8 +11,6 @@
<%: traduci ("NotYetProcessed") %> - <%-- - --%>
@@ -29,11 +27,11 @@
- <%: traduci ("MakeCncProg") %> + <%: traduci ("MakeCncProg") %> + <%: traduci ("StopCncReq") %>
- <%-- PRINT LABELS--%> - <%-- ITEM DONE--%> + <%: traduci ("ItemDone") %>
diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs index 45d5931..47d19ac 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -63,6 +63,28 @@ namespace NKC_WF.WebUserControls frmView.DataBind(); raiseEvent(); } + protected void lbtStopCnc_Click(object sender, EventArgs e) + { + bool allOk = true; + // invio tramite redis... + try + { + // invio chiusura richiesta + ComLib.resetBatchReq(); + } + catch (Exception exc) + { + logger.lg.scriviLog($"Eccezione in tentativo chiusura richiesta CNC da ordine offline{Environment.NewLine}{exc}"); + } + + if (allOk) + { + // registro che riporto a 0! + DataLayer.man.taOffOL.updateStatus(OffOrdId, 0); + } + frmView.DataBind(); + raiseEvent(); + } protected void lbtPrintLabels_Click(object sender, EventArgs e) { @@ -94,5 +116,22 @@ namespace NKC_WF.WebUserControls raiseReset(); } + /// + /// verifica possibilità avvio TASK x presenza task NON chiusi + /// + /// + public bool canStartNew() + { + bool answ = false; + // in primis controllo SE ci siano task running, nel qual caso è false e basta... + int numEst = DataLayer.man.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", 0).Count; + int numNest = DataLayer.man.taBL.getByStatus((int)BatchStatus.NestRequested, "", 0).Count; + // ora controllo anche offline orders... + int numOffOrd = DataLayer.man.taOffOL.getRunning().Count; + // ora la somma di tutti DEVE essere zero... + answ = ((numEst + numNest + numOffOrd) == 0); + return answ; + } + } } \ No newline at end of file From 70b991fd67a1302a727c328b5f9ce131743915cf Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:07:13 +0200 Subject: [PATCH 3/5] add pagine errore 400/401 --- NKC_WF/ErrorPages/400.aspx | 3 +++ NKC_WF/ErrorPages/400.aspx.cs | 25 +++++++++++++++++++++++++ NKC_WF/ErrorPages/400.aspx.designer.cs | 26 ++++++++++++++++++++++++++ NKC_WF/ErrorPages/401.aspx | 7 +++++++ NKC_WF/ErrorPages/401.aspx.cs | 25 +++++++++++++++++++++++++ NKC_WF/ErrorPages/401.aspx.designer.cs | 26 ++++++++++++++++++++++++++ 6 files changed, 112 insertions(+) create mode 100644 NKC_WF/ErrorPages/400.aspx create mode 100644 NKC_WF/ErrorPages/400.aspx.cs create mode 100644 NKC_WF/ErrorPages/400.aspx.designer.cs create mode 100644 NKC_WF/ErrorPages/401.aspx create mode 100644 NKC_WF/ErrorPages/401.aspx.cs create mode 100644 NKC_WF/ErrorPages/401.aspx.designer.cs diff --git a/NKC_WF/ErrorPages/400.aspx b/NKC_WF/ErrorPages/400.aspx new file mode 100644 index 0000000..390e939 --- /dev/null +++ b/NKC_WF/ErrorPages/400.aspx @@ -0,0 +1,3 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="400.aspx.cs" Inherits="NKC_WF.ErrorPages._400" %> + + diff --git a/NKC_WF/ErrorPages/400.aspx.cs b/NKC_WF/ErrorPages/400.aspx.cs new file mode 100644 index 0000000..8b3f9ee --- /dev/null +++ b/NKC_WF/ErrorPages/400.aspx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.ErrorPages +{ + public partial class _400 : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + var thisMaster = ((SiteContent)this.Master); + thisMaster.showSearch = false; + thisMaster.enableAnonym = true; + } + cmp_errorDetail.ErrorTitle = traduci("Err_400"); + cmp_errorDetail.ErrorExpl = traduci("Err400Expl"); + cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name; + } + } +} \ No newline at end of file diff --git a/NKC_WF/ErrorPages/400.aspx.designer.cs b/NKC_WF/ErrorPages/400.aspx.designer.cs new file mode 100644 index 0000000..a82aa05 --- /dev/null +++ b/NKC_WF/ErrorPages/400.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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.ErrorPages +{ + + + public partial class _400 + { + + /// + /// Controllo cmp_errorDetail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_errorDetail cmp_errorDetail; + } +} diff --git a/NKC_WF/ErrorPages/401.aspx b/NKC_WF/ErrorPages/401.aspx new file mode 100644 index 0000000..cde18f0 --- /dev/null +++ b/NKC_WF/ErrorPages/401.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="401.aspx.cs" Inherits="NKC_WF.ErrorPages._401" %> + +<%@ Register Src="~/WebUserControls/cmp_errorDetail.ascx" TagPrefix="uc1" TagName="cmp_errorDetail" %> + + + + diff --git a/NKC_WF/ErrorPages/401.aspx.cs b/NKC_WF/ErrorPages/401.aspx.cs new file mode 100644 index 0000000..545fc12 --- /dev/null +++ b/NKC_WF/ErrorPages/401.aspx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.ErrorPages +{ + public partial class _401 : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + var thisMaster = ((SiteContent)this.Master); + thisMaster.showSearch = false; + thisMaster.enableAnonym = true; + } + cmp_errorDetail.ErrorTitle = traduci("Err_401"); + cmp_errorDetail.ErrorExpl = traduci("Err401Expl"); + cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name; + } + } +} \ No newline at end of file diff --git a/NKC_WF/ErrorPages/401.aspx.designer.cs b/NKC_WF/ErrorPages/401.aspx.designer.cs new file mode 100644 index 0000000..db5a0c7 --- /dev/null +++ b/NKC_WF/ErrorPages/401.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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.ErrorPages +{ + + + public partial class _401 + { + + /// + /// Controllo cmp_errorDetail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_errorDetail cmp_errorDetail; + } +} From 39c21b1fd18bca781aa43954be02ceb0f5879634 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:11:27 +0200 Subject: [PATCH 4/5] Add altre pagine errori --- NKC_WF/ErrorPages/400.aspx | 4 ++++ NKC_WF/ErrorPages/403.aspx | 7 +++++++ NKC_WF/ErrorPages/403.aspx.cs | 25 +++++++++++++++++++++++++ NKC_WF/ErrorPages/403.aspx.designer.cs | 26 ++++++++++++++++++++++++++ NKC_WF/ErrorPages/500.aspx | 7 +++++++ NKC_WF/ErrorPages/500.aspx.cs | 25 +++++++++++++++++++++++++ NKC_WF/ErrorPages/500.aspx.designer.cs | 26 ++++++++++++++++++++++++++ NKC_WF/ErrorPages/503.aspx | 7 +++++++ NKC_WF/ErrorPages/503.aspx.cs | 25 +++++++++++++++++++++++++ NKC_WF/ErrorPages/503.aspx.designer.cs | 26 ++++++++++++++++++++++++++ 10 files changed, 178 insertions(+) create mode 100644 NKC_WF/ErrorPages/403.aspx create mode 100644 NKC_WF/ErrorPages/403.aspx.cs create mode 100644 NKC_WF/ErrorPages/403.aspx.designer.cs create mode 100644 NKC_WF/ErrorPages/500.aspx create mode 100644 NKC_WF/ErrorPages/500.aspx.cs create mode 100644 NKC_WF/ErrorPages/500.aspx.designer.cs create mode 100644 NKC_WF/ErrorPages/503.aspx create mode 100644 NKC_WF/ErrorPages/503.aspx.cs create mode 100644 NKC_WF/ErrorPages/503.aspx.designer.cs diff --git a/NKC_WF/ErrorPages/400.aspx b/NKC_WF/ErrorPages/400.aspx index 390e939..ca069ce 100644 --- a/NKC_WF/ErrorPages/400.aspx +++ b/NKC_WF/ErrorPages/400.aspx @@ -1,3 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="400.aspx.cs" Inherits="NKC_WF.ErrorPages._400" %> + +<%@ Register Src="~/WebUserControls/cmp_errorDetail.ascx" TagPrefix="uc1" TagName="cmp_errorDetail" %> + + diff --git a/NKC_WF/ErrorPages/403.aspx b/NKC_WF/ErrorPages/403.aspx new file mode 100644 index 0000000..47eb860 --- /dev/null +++ b/NKC_WF/ErrorPages/403.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="403.aspx.cs" Inherits="NKC_WF.ErrorPages._403" %> + +<%@ Register Src="~/WebUserControls/cmp_errorDetail.ascx" TagPrefix="uc1" TagName="cmp_errorDetail" %> + + + + diff --git a/NKC_WF/ErrorPages/403.aspx.cs b/NKC_WF/ErrorPages/403.aspx.cs new file mode 100644 index 0000000..fa7052d --- /dev/null +++ b/NKC_WF/ErrorPages/403.aspx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.ErrorPages +{ + public partial class _403 : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + var thisMaster = ((SiteContent)this.Master); + thisMaster.showSearch = false; + thisMaster.enableAnonym = true; + } + cmp_errorDetail.ErrorTitle = traduci("Err_403"); + cmp_errorDetail.ErrorExpl = traduci("Err403Expl"); + cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name; + } + } +} \ No newline at end of file diff --git a/NKC_WF/ErrorPages/403.aspx.designer.cs b/NKC_WF/ErrorPages/403.aspx.designer.cs new file mode 100644 index 0000000..486c28f --- /dev/null +++ b/NKC_WF/ErrorPages/403.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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.ErrorPages +{ + + + public partial class _403 + { + + /// + /// Controllo cmp_errorDetail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_errorDetail cmp_errorDetail; + } +} diff --git a/NKC_WF/ErrorPages/500.aspx b/NKC_WF/ErrorPages/500.aspx new file mode 100644 index 0000000..f0bfee2 --- /dev/null +++ b/NKC_WF/ErrorPages/500.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="500.aspx.cs" Inherits="NKC_WF.ErrorPages._500" %> + +<%@ Register Src="~/WebUserControls/cmp_errorDetail.ascx" TagPrefix="uc1" TagName="cmp_errorDetail" %> + + + + diff --git a/NKC_WF/ErrorPages/500.aspx.cs b/NKC_WF/ErrorPages/500.aspx.cs new file mode 100644 index 0000000..da0fdb7 --- /dev/null +++ b/NKC_WF/ErrorPages/500.aspx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.ErrorPages +{ + public partial class _500 : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + var thisMaster = ((SiteContent)this.Master); + thisMaster.showSearch = false; + thisMaster.enableAnonym = true; + } + cmp_errorDetail.ErrorTitle = traduci("Err_500"); + cmp_errorDetail.ErrorExpl = traduci("Err500Expl"); + cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name; + } + } +} \ No newline at end of file diff --git a/NKC_WF/ErrorPages/500.aspx.designer.cs b/NKC_WF/ErrorPages/500.aspx.designer.cs new file mode 100644 index 0000000..f1bee0a --- /dev/null +++ b/NKC_WF/ErrorPages/500.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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.ErrorPages +{ + + + public partial class _500 + { + + /// + /// Controllo cmp_errorDetail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_errorDetail cmp_errorDetail; + } +} diff --git a/NKC_WF/ErrorPages/503.aspx b/NKC_WF/ErrorPages/503.aspx new file mode 100644 index 0000000..6563645 --- /dev/null +++ b/NKC_WF/ErrorPages/503.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="503.aspx.cs" Inherits="NKC_WF.ErrorPages._503" %> + +<%@ Register Src="~/WebUserControls/cmp_errorDetail.ascx" TagPrefix="uc1" TagName="cmp_errorDetail" %> + + + + diff --git a/NKC_WF/ErrorPages/503.aspx.cs b/NKC_WF/ErrorPages/503.aspx.cs new file mode 100644 index 0000000..753c8ab --- /dev/null +++ b/NKC_WF/ErrorPages/503.aspx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.ErrorPages +{ + public partial class _503 : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + var thisMaster = ((SiteContent)this.Master); + thisMaster.showSearch = false; + thisMaster.enableAnonym = true; + } + cmp_errorDetail.ErrorTitle = traduci("Err_503"); + cmp_errorDetail.ErrorExpl = traduci("Err503Expl"); + cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name; + } + } +} \ No newline at end of file diff --git a/NKC_WF/ErrorPages/503.aspx.designer.cs b/NKC_WF/ErrorPages/503.aspx.designer.cs new file mode 100644 index 0000000..60c5a8d --- /dev/null +++ b/NKC_WF/ErrorPages/503.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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.ErrorPages +{ + + + public partial class _503 + { + + /// + /// Controllo cmp_errorDetail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_errorDetail cmp_errorDetail; + } +} From 113518b4738c53a8959437457cae677ed401f3b0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:12:37 +0200 Subject: [PATCH 5/5] Fix redirect conf x errori --- NKC_WF/Web.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 179a7e4..5cac0a3 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -39,7 +39,12 @@ + + + + +