diff --git a/C2P.sln b/C2P.sln index 5fd17dd..3fae1b5 100644 --- a/C2P.sln +++ b/C2P.sln @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2P_Report", "C2P_Report\C2P_Report.csproj", "{58147587-0B58-4EA6-8746-5A462BC6AA41}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2P_CronJob", "C2P_CronJob\C2P_CronJob.csproj", "{D84F8671-8550-48D8-A0CD-0D67B78E165A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -89,6 +91,16 @@ Global {58147587-0B58-4EA6-8746-5A462BC6AA41}.Release|Any CPU.Build.0 = Release|Any CPU {58147587-0B58-4EA6-8746-5A462BC6AA41}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU {58147587-0B58-4EA6-8746-5A462BC6AA41}.WinLab|Any CPU.Build.0 = WinLab|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.DEMO|Any CPU.Build.0 = Debug|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.deploy|Any CPU.ActiveCfg = Debug|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.deploy|Any CPU.Build.0 = Debug|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.Release|Any CPU.Build.0 = Release|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.WinLab|Any CPU.ActiveCfg = Release|Any CPU + {D84F8671-8550-48D8-A0CD-0D67B78E165A}.WinLab|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/C2P/Import.aspx b/C2P/Import.aspx index 1edf9bc..9316bfe 100644 --- a/C2P/Import.aspx +++ b/C2P/Import.aspx @@ -17,10 +17,10 @@ Step 1 - <%: traduci("tmp.stp_All_ImportFile_Process") %>
- <%--Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %>--%> + Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %>
- <%--Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %>--%> + Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %>
@@ -106,10 +106,11 @@
- <%----%> + <%-- - + --%> +
diff --git a/C2P/Import.aspx.cs b/C2P/Import.aspx.cs index b9cffbf..7d6895e 100644 --- a/C2P/Import.aspx.cs +++ b/C2P/Import.aspx.cs @@ -68,13 +68,63 @@ namespace C2P return answ; } /// + /// restituisce icona corretta a seconda dello stato della riga... + /// + /// + /// + /// + /// + /// + public string currIcon(object dataStart, object dataEnd, object isDone, object isOk) + { + /*----------------------------------------- + * OUTPUT possibili: + * waiting: fa fa-list-ol fa-2x + * running: fa fa-refresh fa-spin fa-2x + * done: fa fa-check fa-2x + * error: fa fa-times fa-2x + *----------------------------------------- */ + string answ = "fa fa-bolt fa-2x"; + if (Convert.ToBoolean(isDone)) + { + if (Convert.ToBoolean(isOk)) + { + answ = "fa fa-check fa-2x"; + } + else + { + answ = "fa fa-times fa-2x"; + } + } + else + { + if (dataStart.ToString() == "") + { + answ = "fa fa-list-ol fa-2x"; + } + else + { + answ = "fa fa-refresh fa-spin fa-2x"; + } + } + return answ; + } + /// /// chiamata procedura di import file /// /// /// protected void lbtImport_Click(object sender, EventArgs e) { - DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_ImportFile_Process]", @"@filePath='e:\test\',@ProcDiesGroup=1"); + insertStepTicket("step01"); + } + /// + /// fa la chiamata di inserimento step richeisto e aggiorna + /// + /// + private void insertStepTicket(string stepCode) + { + DtProxy.man.taImpTL.InsertQuery(memLayer.ML.confReadString(stepCode + "_stp"), memLayer.ML.confReadString(stepCode + "_par")); grViewTicket.SelectedIndex = -1; grViewTicket.DataBind(); } @@ -85,7 +135,7 @@ namespace C2P /// protected void lbtConvert_Click(object sender, EventArgs e) { - //DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_ConvertFile_Process]", "@filePath='e:\test\',@ERRORFILE = ''"); + insertStepTicket("step02"); } /// /// chiamata procedura di merge dati @@ -94,7 +144,7 @@ namespace C2P /// protected void lbtMerge_Click(object sender, EventArgs e) { - //DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_MergeFile_Process]", "@filePath='e:\test\',@ERRORFILE = ''"); + insertStepTicket("step03"); } } diff --git a/C2P/Import.aspx.designer.cs b/C2P/Import.aspx.designer.cs index ff4fdce..0014bb0 100644 --- a/C2P/Import.aspx.designer.cs +++ b/C2P/Import.aspx.designer.cs @@ -21,6 +21,24 @@ namespace C2P { /// protected global::System.Web.UI.WebControls.LinkButton lbtImport; + /// + /// lbtConvert control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtConvert; + + /// + /// lbtMerge control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtMerge; + /// /// grViewTicket control. /// diff --git a/C2P/Web.config b/C2P/Web.config index 8771fac..b69936a 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -34,6 +34,13 @@ + + + + + + + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 93d5606..9a4092b 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 880c437..3fe7273 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 80634d4..f25ed16 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 880c437..3fe7273 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index b34cad1..415f95f 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 80634d4..f25ed16 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 027fd73..dde36c5 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.151.353")] -[assembly: AssemblyFileVersion("2.1.151.353")] +[assembly: AssemblyVersion("2.1.152.355")] +[assembly: AssemblyFileVersion("2.1.152.355")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index b178f13..c639076 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.151.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.1.151.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.1.152.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.1.152.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+