diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 97bc60a..d374d60 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -374,6 +374,7 @@ + @@ -414,6 +415,7 @@ + @@ -795,6 +797,13 @@ mod_createNewStdCost.ascx + + mod_DiesGroupMan.ascx + ASPXCodeBehind + + + mod_DiesGroupMan.ascx + mod_display.ascx ASPXCodeBehind @@ -1082,6 +1091,13 @@ mod_testata.ascx + + mod_TranspCostMan.ascx + ASPXCodeBehind + + + mod_TranspCostMan.ascx + mod_vocabolario.ascx ASPXCodeBehind diff --git a/C2P/DiesGroupMan.aspx b/C2P/DiesGroupMan.aspx index 1f0c5e7..9515405 100644 --- a/C2P/DiesGroupMan.aspx +++ b/C2P/DiesGroupMan.aspx @@ -1,5 +1,8 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="DiesGroupMan.aspx.cs" Inherits="C2P.DiesGroupMan" %> -<%@ Register Src="~/WebUserControls/mod_fileUploader.ascx" TagName="mod_fileUploader" TagPrefix="uc2" %> + +<%@ Register Src="~/WebUserControls/mod_DiesGroupMan.ascx" TagPrefix="uc1" TagName="mod_DiesGroupMan" %> + + @@ -9,70 +12,7 @@
- -
-
-
-
-
-

<%: traduci("HDiesGroupManTitle") %>

-
- <%: traduci("HDiesGroupManRepBody") %> -
-
-
-
-
-
-
-
-
-

<%: traduci("StepA") %>

-
-
-

<%: traduci("HDiesGroupManStepA") %>

-
-
-
- - - -
- <%: traduci("DiesGroupFile") %> -
- -
-
-
-
-
-
-
-

<%: traduci("StepB") %>

-
-
-

<%: traduci("HDiesGroupManStepB") %>

-
-
-
- - <%: traduci("WaitingForFile") %> -
-
- -
- <%--
- -
--%> -
-
-
-
-
-
-
-
-
+
diff --git a/C2P/DiesGroupMan.aspx.cs b/C2P/DiesGroupMan.aspx.cs index 814ea45..69cd6dd 100644 --- a/C2P/DiesGroupMan.aspx.cs +++ b/C2P/DiesGroupMan.aspx.cs @@ -4,78 +4,11 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using SteamWare; -using C2P_Data; namespace C2P { public partial class DiesGroupMan : System.Web.UI.Page { - protected void Page_Load(object sender, EventArgs e) - { -#if false - if (!Page.IsPostBack) - { - btnDoImport.DataBind(); - } -#endif - mod_fileUploader1.eh_uploadDone += mod_fileUploader1_eh_uploadDone; - } - - /// - /// file caricato - /// - /// - /// - void mod_fileUploader1_eh_uploadDone(object sender, EventArgs e) - { - // caricato file su server, PROVA ad eseguire import tabella - int numRecIn = 0; - int numRecConv = 0; - string fileName = "DiesGroupRaw"; - string uplDir = memLayer.ML.confReadString("uplDir"); - string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR"); - string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR"); - string FIRSTROW = memLayer.ML.confReadString("FIRSTROW"); - string CODEPAGE = memLayer.ML.confReadString("CODEPAGE"); - bool flgUpdate = memLayer.ML.confReadBool("flgUpdate"); - int numTicket = Convert.ToInt32(DateTime.Now.ToString("yyMMddHHmm")); - try - { - DtProxy.man.taDGD.import(fileName, uplDir, "DiesGroupRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorDiesGroup.log", numTicket); - //numRecIn = DtProxy.man.taILog.getByTicket(numTicket)[0].re; - } - catch - { } - try - { - DtProxy.man.taDGD.convert(fileName, numTicket); - //numRecConv = DtProxy.man.taOH.convert("OrdersHistRaw")[0].RecordsIn; - } - catch - { } - try - { - DtProxy.man.taDGD.merge(fileName, numTicket, flgUpdate); - //DtProxy.man.taOH.merge("OrdersHistRaw"); - } - catch - { } - lblUploadDone.Text = string.Format("Upload and Import done for {0}", fileName); - //lblUploadDone.Text = string.Format("{0} records IN, {1} records acquired", numRecIn, numRecConv); - logger.lg.scriviLog(lblUploadDone.Text, tipoLog.INFO); - //btnDoImport.Visible = true; - //lblOut.Visible = !btnDoImport.Visible; - } - - /// - /// wrapper traduzione - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } + } } \ No newline at end of file diff --git a/C2P/DiesGroupMan.aspx.designer.cs b/C2P/DiesGroupMan.aspx.designer.cs index ac1dd89..6d5bffe 100644 --- a/C2P/DiesGroupMan.aspx.designer.cs +++ b/C2P/DiesGroupMan.aspx.designer.cs @@ -13,66 +13,12 @@ namespace C2P { public partial class DiesGroupMan { /// - /// divHelp control. + /// mod_DiesGroupMan control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHelp; - - /// - /// divAnalisys control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAnalisys; - - /// - /// HyperLink2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink2; - - /// - /// div1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl div1; - - /// - /// mod_fileUploader1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::C2P.WebUserControls.mod_fileUploader mod_fileUploader1; - - /// - /// lblOut control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblOut; - - /// - /// lblUploadDone control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblUploadDone; + protected global::C2P.WebUserControls.mod_DiesGroupMan mod_DiesGroupMan; } } diff --git a/C2P/Web.config b/C2P/Web.config index 658bf26..cbb5b92 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -62,7 +62,7 @@ - + diff --git a/C2P/WebUserControls/mod_DiesGroupMan.ascx b/C2P/WebUserControls/mod_DiesGroupMan.ascx new file mode 100644 index 0000000..86fb02f --- /dev/null +++ b/C2P/WebUserControls/mod_DiesGroupMan.ascx @@ -0,0 +1,64 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_DiesGroupMan.ascx.cs" Inherits="C2P.WebUserControls.mod_DiesGroupMan" %> + +<%@ Register Src="~/WebUserControls/mod_fileUploader.ascx" TagName="mod_fileUploader" TagPrefix="uc1" %> + +
+
+
+
+
+

<%: traduci("HDiesGroupManTitle") %>

+
+ <%: traduci("HDiesGroupManRepBody") %> +
+
+
+
+
+
+
+
+
+

<%: traduci("StepA") %>

+
+
+

<%: traduci("HDiesGroupManStepA") %>

+
+
+
+ + + +
+ <%: traduci("DiesGroupFile") %> +
+ +
+
+
+
+
+
+
+

<%: traduci("StepB") %>

+
+
+

<%: traduci("HDiesGroupManStepB") %>

+
+
+
+ + <%: traduci("WaitingForFile") %> +
+
+ +
+
+
+
+
+
+
+
+
+
diff --git a/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs b/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs new file mode 100644 index 0000000..6562e50 --- /dev/null +++ b/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using C2P_Data; + +namespace C2P.WebUserControls +{ + public partial class mod_DiesGroupMan : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + mod_fileUploader1.eh_uploadDone += mod_fileUploader1_eh_uploadDone; + } + + /// + /// file caricato + /// + /// + /// + void mod_fileUploader1_eh_uploadDone(object sender, EventArgs e) + { + // caricato file su server, PROVA ad eseguire import tabella + string fileName = "DiesGroupRaw"; + string uplDir = memLayer.ML.confReadString("uplDir"); + string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR"); + string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR"); + string FIRSTROW = memLayer.ML.confReadString("FIRSTROW"); + string CODEPAGE = memLayer.ML.confReadString("CODEPAGE"); + bool flgUpdate = memLayer.ML.confReadBool("flgUpdate"); + int numTicket = 0; // Convert.ToInt32(DateTime.Now.ToString("yyMMddHHmm")); + try + { + DtProxy.man.taDGD.import(fileName, uplDir, "DiesGroupRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorDiesGroup.log", numTicket); + } + catch + { } + try + { + DtProxy.man.taDGD.convert(fileName, numTicket); + } + catch + { } + try + { + DtProxy.man.taDGD.merge(fileName, numTicket, flgUpdate); + } + catch + { } + lblUploadDone.Text = string.Format("Upload and Import done for {0}", fileName); + logger.lg.scriviLog(lblUploadDone.Text, tipoLog.INFO); + } + + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_DiesGroupMan.ascx.designer.cs b/C2P/WebUserControls/mod_DiesGroupMan.ascx.designer.cs new file mode 100644 index 0000000..65657fa --- /dev/null +++ b/C2P/WebUserControls/mod_DiesGroupMan.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls { + + + public partial class mod_DiesGroupMan { + + /// + /// divHelp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHelp; + + /// + /// divAnalisys control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAnalisys; + + /// + /// HyperLink2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink2; + + /// + /// div1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl div1; + + /// + /// mod_fileUploader1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_fileUploader mod_fileUploader1; + + /// + /// lblOut control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblOut; + + /// + /// lblUploadDone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblUploadDone; + } +} diff --git a/C2P/WebUserControls/mod_marginReport.ascx.cs b/C2P/WebUserControls/mod_marginReport.ascx.cs index 04f93c9..61054fe 100644 --- a/C2P/WebUserControls/mod_marginReport.ascx.cs +++ b/C2P/WebUserControls/mod_marginReport.ascx.cs @@ -16,7 +16,6 @@ namespace C2P.WebUserControls if (!Page.IsPostBack) { setModVisibility(""); - //memLayer.ML.setSessionVal("runningQLR", false); } mod_fileUploader1.eh_uploadDone += mod_fileUploader1_eh_uploadDone; // verifico se sto eseguendo task lungo di caricamento... diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 5050fbc..9d4821d 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 16d457e..f106359 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.application b/C2P_CronJob/bin/Release/C2P_CronJob.application index ff306c6..8af4e45 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.application +++ b/C2P_CronJob/bin/Release/C2P_CronJob.application @@ -11,7 +11,7 @@ - bnLKC9e9BFu5k+Ggb9RK7TyaV68= + scdH882AFFsw9qODgLh5duMYeOY= diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest index 23a218b..48c9ff2 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest +++ b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest @@ -84,7 +84,7 @@ - aICFqQ8Ie+fElxKgP0aZ9zfZb7I= + 9Co0gwc4OUj8X4I1+YFJDq4o77A= @@ -96,7 +96,7 @@ - qEnv3tKIoD5vse1IUJmYZ9B/d4o= + H0p40cT6cWtx9w3KeH6cGReWot4= diff --git a/C2P_CronJob/bin/Release/C2P_Data.dll b/C2P_CronJob/bin/Release/C2P_Data.dll index 16d457e..f106359 100644 Binary files a/C2P_CronJob/bin/Release/C2P_Data.dll and b/C2P_CronJob/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 16d457e..f106359 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Project/bin/Output/C2P_DB.dacpac b/C2P_Project/bin/Output/C2P_DB.dacpac index a7fadc0..359711e 100644 Binary files a/C2P_Project/bin/Output/C2P_DB.dacpac and b/C2P_Project/bin/Output/C2P_DB.dacpac differ diff --git a/C2P_Project/bin/Output/C2P_Project.dll b/C2P_Project/bin/Output/C2P_Project.dll index ed35fd4..ec217d7 100644 Binary files a/C2P_Project/bin/Output/C2P_Project.dll and b/C2P_Project/bin/Output/C2P_Project.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 16d457e..f106359 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 7cd0f62..cbe467c 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ