diff --git a/C2P/Import.aspx b/C2P/Import.aspx index 7529446..af15a67 100644 --- a/C2P/Import.aspx +++ b/C2P/Import.aspx @@ -12,7 +12,12 @@

<%: traduci("ImportData") %>

-
+
+
+ <%: traduci("tmp.stp_All_Process") %> +
+
+
Step 1 - <%: traduci("tmp.stp_All_ImportFile_Process") %>
@@ -127,26 +132,26 @@
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/C2P/Import.aspx.cs b/C2P/Import.aspx.cs index b171430..4921a4e 100644 --- a/C2P/Import.aspx.cs +++ b/C2P/Import.aspx.cs @@ -16,6 +16,7 @@ namespace C2P if (!Page.IsPostBack) { grViewLog.Visible = false; + divThreeSteps.Visible = userIsSuperAdmin; } } @@ -116,17 +117,30 @@ namespace C2P /// protected void lbtImport_Click(object sender, EventArgs e) { - insertStepTicket("step01"); + insertStepTicket("step01", 0, DateTime.Now); } /// /// fa la chiamata di inserimento step richeisto e aggiorna /// /// - private void insertStepTicket(string stepCode) + /// + /// + /// NumTicket generato + private int insertStepTicket(string stepCode, int prevNumTicket, DateTime dataRich) { - DtProxy.man.taImpTL.InsertQuery(memLayer.ML.confReadString(stepCode + "_stp"), memLayer.ML.confReadString(stepCode + "_par"), DateTime.Now); + int answ = 0; + DS_Utility.Import_TicketListRow riga; + try + { + string param = string.Format(memLayer.ML.confReadString(stepCode + "_par"), prevNumTicket); + riga = (DS_Utility.Import_TicketListRow)DtProxy.man.taImpTL.InsertQuery(memLayer.ML.confReadString(stepCode + "_stp"), param, DateTime.Now)[0]; + answ = riga.NumTicket; + } + catch + { } grViewTicket.SelectedIndex = -1; grViewTicket.DataBind(); + return answ; } /// /// chiamata procedura di convert tracciati @@ -135,7 +149,7 @@ namespace C2P /// protected void lbtConvert_Click(object sender, EventArgs e) { - insertStepTicket("step02"); + insertStepTicket("step02", 0, DateTime.Now); } /// /// chiamata procedura di merge dati @@ -144,8 +158,22 @@ namespace C2P /// protected void lbtMerge_Click(object sender, EventArgs e) { - insertStepTicket("step03"); + insertStepTicket("step03", 0, DateTime.Now); } + /// + /// chiamata a TUTTE LE procedure x import dati + /// + /// + /// + protected void lbtAllSteps_Click(object sender, EventArgs e) + { + int NumTicket = 0; + DateTime adesso = DateTime.Now; + NumTicket = insertStepTicket("step01", NumTicket, adesso); + NumTicket = insertStepTicket("step02", NumTicket, adesso.AddMinutes(1)); + NumTicket = insertStepTicket("step03", NumTicket, adesso.AddMinutes(2)); + } + } } \ No newline at end of file diff --git a/C2P/Import.aspx.designer.cs b/C2P/Import.aspx.designer.cs index 0014bb0..c1a0a69 100644 --- a/C2P/Import.aspx.designer.cs +++ b/C2P/Import.aspx.designer.cs @@ -12,6 +12,33 @@ namespace C2P { public partial class Import { + /// + /// divAllSteps control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAllSteps; + + /// + /// lbtAllSteps control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtAllSteps; + + /// + /// divThreeSteps control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divThreeSteps; + /// /// lbtImport control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 3aded0e..5add0aa 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/NLog.dll b/C2P/bin/NLog.dll index 11a5469..5a2f145 100644 Binary files a/C2P/bin/NLog.dll and b/C2P/bin/NLog.dll differ diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.vshost.application b/C2P_CronJob/bin/Release/C2P_CronJob.vshost.application index 2653179..a09f706 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.vshost.application +++ b/C2P_CronJob/bin/Release/C2P_CronJob.vshost.application @@ -11,7 +11,7 @@ - 6iQyCv+iua1rI4R+lLmzhRwZC6Y= + YQ9vr3cTIRCbuYBLM1J1GjhHcz8= diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.vshost.exe.manifest b/C2P_CronJob/bin/Release/C2P_CronJob.vshost.exe.manifest index ce95452..a1a1ce2 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.vshost.exe.manifest +++ b/C2P_CronJob/bin/Release/C2P_CronJob.vshost.exe.manifest @@ -77,26 +77,26 @@ - + - HI6syZpBGnOpgEq9YCCayHOgZ2o= + TY/JBFMXj/h++cvWRSn6pqOrt9s= - + - 4paIJqwB+KZOXfXfoWCvgzSqYSg= + cyyhEL70VPntDlHHF11UaZpnr6M= diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 4ecf9b7..832cf00 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.153.355")] -[assembly: AssemblyFileVersion("2.2.153.355")] +[assembly: AssemblyVersion("2.2.154.355")] +[assembly: AssemblyFileVersion("2.2.154.355")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index b2f2d9c..795ed70 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.153.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.2.153.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.154.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.2.154.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+