From a60bb7a4afcd57efce8dd2a3c1101103f2257037 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 8 Sep 2020 16:37:10 +0200 Subject: [PATCH 1/2] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index da65076..eb27644 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=364']) { + withEnv(['NEXT_BUILD_NUMBER=365']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From 872e016964bd164ef518f22d71ef71b47d829704 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 8 Sep 2020 16:37:26 +0200 Subject: [PATCH 2/2] Fix visualizzazione dettaglio sheets in BUNK --- NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs | 9 ++++++++- NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs index d3e4422..6ccdca2 100644 --- a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs @@ -85,6 +85,7 @@ namespace NKC_WF.WebUserControls set { grView.SelectedIndex = value; + grView.DataBind(); } } /// @@ -97,7 +98,13 @@ namespace NKC_WF.WebUserControls int answ = 0; try { - int.TryParse(grView.SelectedValue.ToString(), out answ); + if (grView != null) + { + if (grView.SelectedValue != null) + { + int.TryParse(grView.SelectedValue.ToString(), out answ); + } + } } catch { } diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs index f433ec7..6e56d1f 100644 --- a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs @@ -37,6 +37,7 @@ namespace NKC_WF.WebUserControls set { grView.SelectedIndex = value; + grView.DataBind(); } } /// @@ -49,7 +50,13 @@ namespace NKC_WF.WebUserControls int answ = 0; try { - int.TryParse(grView.SelectedValue.ToString(), out answ); + if (grView != null) + { + if (grView.SelectedValue != null) + { + int.TryParse(grView.SelectedValue.ToString(), out answ); + } + } } catch { }