From f7c5044cc65451259f01e5c46c5c640bfb690904 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 13 Jul 2020 13:03:08 +0200 Subject: [PATCH] Aggiunta apgina x schedulazione ORD/KIT --- Jenkinsfile | 2 +- NKC_WF/NKC_WF.csproj | 16 ++++++++++++++++ NKC_WF/site/KitRequestSched.aspx | 3 +++ NKC_WF/site/KitRequestSched.aspx.cs | 17 +++++++++++++++++ NKC_WF/site/KitRequestSched.aspx.designer.cs | 17 +++++++++++++++++ NKC_WF/site/OrderScheduler.aspx | 3 +++ NKC_WF/site/OrderScheduler.aspx.cs | 17 +++++++++++++++++ NKC_WF/site/OrderScheduler.aspx.designer.cs | 17 +++++++++++++++++ 8 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 NKC_WF/site/KitRequestSched.aspx create mode 100644 NKC_WF/site/KitRequestSched.aspx.cs create mode 100644 NKC_WF/site/KitRequestSched.aspx.designer.cs create mode 100644 NKC_WF/site/OrderScheduler.aspx create mode 100644 NKC_WF/site/OrderScheduler.aspx.cs create mode 100644 NKC_WF/site/OrderScheduler.aspx.designer.cs diff --git a/Jenkinsfile b/Jenkinsfile index 8256819..9be3301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=275']) { + withEnv(['NEXT_BUILD_NUMBER=276']) { // 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}') diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 030ac94..90946af 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -361,6 +361,7 @@ + @@ -370,6 +371,7 @@ + @@ -642,6 +644,13 @@ KitRequestImporter.aspx + + KitRequestSched.aspx + ASPXCodeBehind + + + KitRequestSched.aspx + Kitting.aspx ASPXCodeBehind @@ -705,6 +714,13 @@ OrderManager.aspx + + OrderScheduler.aspx + ASPXCodeBehind + + + OrderScheduler.aspx + Painting.aspx ASPXCodeBehind diff --git a/NKC_WF/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx new file mode 100644 index 0000000..b2e6d74 --- /dev/null +++ b/NKC_WF/site/KitRequestSched.aspx @@ -0,0 +1,3 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="KitRequestSched.aspx.cs" Inherits="NKC_WF.site.KitRequestSched" %> + + diff --git a/NKC_WF/site/KitRequestSched.aspx.cs b/NKC_WF/site/KitRequestSched.aspx.cs new file mode 100644 index 0000000..c4e452b --- /dev/null +++ b/NKC_WF/site/KitRequestSched.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class KitRequestSched : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/KitRequestSched.aspx.designer.cs b/NKC_WF/site/KitRequestSched.aspx.designer.cs new file mode 100644 index 0000000..1d91728 --- /dev/null +++ b/NKC_WF/site/KitRequestSched.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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.site +{ + + + public partial class KitRequestSched + { + } +} diff --git a/NKC_WF/site/OrderScheduler.aspx b/NKC_WF/site/OrderScheduler.aspx new file mode 100644 index 0000000..bdbe271 --- /dev/null +++ b/NKC_WF/site/OrderScheduler.aspx @@ -0,0 +1,3 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="OrderScheduler.aspx.cs" Inherits="NKC_WF.site.OrderScheduler" %> + + diff --git a/NKC_WF/site/OrderScheduler.aspx.cs b/NKC_WF/site/OrderScheduler.aspx.cs new file mode 100644 index 0000000..f43e3dc --- /dev/null +++ b/NKC_WF/site/OrderScheduler.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class OrderScheduler : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/OrderScheduler.aspx.designer.cs b/NKC_WF/site/OrderScheduler.aspx.designer.cs new file mode 100644 index 0000000..6dc56cf --- /dev/null +++ b/NKC_WF/site/OrderScheduler.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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.site +{ + + + public partial class OrderScheduler + { + } +}