- Button x fare nuovi import
+
+
+
Step 1 - <%: traduci("tmp.stp_All_ImportFile_Process") %>
+
+
+
Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %>
+
+
+
Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %>
+
-
- Tabella delle richieste (e loro stato)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%--
+
+
+
+ --%>
+
+
+
+
-
- Tabella dettaglio log x ogni richiesta
+
+
+ Tabella dettaglio log x ogni richiesta
@@ -66,11 +147,12 @@
-
-
-
-
-
+
+
+
+
+
+
diff --git a/C2P/Import.aspx.cs b/C2P/Import.aspx.cs
index 5ec748e..b8d07d1 100644
--- a/C2P/Import.aspx.cs
+++ b/C2P/Import.aspx.cs
@@ -1,9 +1,11 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using C2P_Data;
namespace C2P
{
@@ -21,5 +23,77 @@ namespace C2P
{
grViewLog.Visible = true;
}
+
+ ///
+ /// verifica se utente sia SuperAdmin
+ ///
+ public bool userIsSuperAdmin
+ {
+ get
+ {
+ return devicesAuthProxy.stObj.userHasRight("SuperAdmin");
+ }
+ }
+ ///
+ /// wrapper traduzione
+ ///
+ ///
+ ///
+ public string traduci(string lemma)
+ {
+ return user_std.UtSn.Traduci(lemma);
+ }
+ ///
+ /// classe css dato controllo esito stored
+ ///
+ ///
+ ///
+ ///
warnRed/warnOrange/allOk
+ public string cssByCheck(object isOk, object isDone)
+ {
+ string answ = "warnRed";
+ try
+ {
+ if (!Convert.ToBoolean(isDone))
+ {
+ answ = "running";
+ }
+ else
+ {
+ if (Convert.ToBoolean(isOk)) answ = "allOk";
+ }
+ }
+ catch
+ { }
+ 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\',@ERRORFILE = ''");
+ }
+ ///
+ /// chiamata procedura di convert tracciati
+ ///
+ ///
+ ///
+ protected void lbtConvert_Click(object sender, EventArgs e)
+ {
+ //DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_ConvertFile_Process]", "@filePath='e:\test\',@ERRORFILE = ''");
+ }
+ ///
+ /// chiamata procedura di merge dati
+ ///
+ ///
+ ///
+ protected void lbtMerge_Click(object sender, EventArgs e)
+ {
+ //DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_MergeFile_Process]", "@filePath='e:\test\',@ERRORFILE = ''");
+ }
+
}
}
\ No newline at end of file
diff --git a/C2P/Import.aspx.designer.cs b/C2P/Import.aspx.designer.cs
index 77a4b06..0014bb0 100644
--- a/C2P/Import.aspx.designer.cs
+++ b/C2P/Import.aspx.designer.cs
@@ -12,6 +12,33 @@ namespace C2P {
public partial class Import {
+ ///
+ /// lbtImport control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ 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/bin/C2P.dll b/C2P/bin/C2P.dll
index 1c4e441..503cde2 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 2d8cb96..880c437 100644
Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ
diff --git a/C2P_Data/DS_Utility.xsd b/C2P_Data/DS_Utility.xsd
index ff006d7..25a4ef4 100644
--- a/C2P_Data/DS_Utility.xsd
+++ b/C2P_Data/DS_Utility.xsd
@@ -606,10 +606,12 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
-
- SELECT * FROM dbo.Import_TicketList
+
+ SELECT NumTicket, StpName, StpParam, DataRich, DataStart, DataEnd, Note, IsDone, IsOk
+FROM Import_TicketList
+ORDER BY NumTicket DESC
@@ -626,7 +628,20 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
+
+
+
+ dbo.stp_ImTL_InsertQuery
+
+
+
+
+
+
+
+
+
@@ -670,7 +685,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -690,7 +705,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -710,7 +725,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -730,7 +745,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -750,7 +765,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -770,7 +785,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -800,7 +815,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -821,7 +836,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -841,7 +856,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -861,7 +876,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -881,7 +896,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -893,14 +908,14 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
-
+
@@ -912,7 +927,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -926,14 +941,14 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
-
+
@@ -968,7 +983,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -988,7 +1003,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
@@ -1021,7 +1036,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
-
+
diff --git a/C2P_Data/DS_Utility.xss b/C2P_Data/DS_Utility.xss
index 92007bf..d41a333 100644
--- a/C2P_Data/DS_Utility.xss
+++ b/C2P_Data/DS_Utility.xss
@@ -23,8 +23,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/C2P_Data/DS_Utility1.Designer.cs b/C2P_Data/DS_Utility1.Designer.cs
index aec453d..df7a15e 100644
--- a/C2P_Data/DS_Utility1.Designer.cs
+++ b/C2P_Data/DS_Utility1.Designer.cs
@@ -12649,11 +12649,19 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
- this._commandCollection[0].CommandText = "SELECT * FROM dbo.Import_TicketList";
+ this._commandCollection[0].CommandText = "SELECT NumTicket, StpName, StpParam, DataRich, DataStart, DataEnd, Note, I" +
+ "sDone, IsOk\r\nFROM Import_TicketList\r\nORDER BY NumTicket DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[1].Connection = this.Connection;
+ this._commandCollection[1].CommandText = "dbo.stp_ImTL_InsertQuery";
+ this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StpName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StpParam", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -12679,6 +12687,41 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN
this.Adapter.Fill(dataTable);
return dataTable;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)]
+ public virtual int InsertQuery(string StpName, string StpParam) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
+ if ((StpName == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(StpName));
+ }
+ if ((StpParam == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[2].Value = ((string)(StpParam));
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ int returnValue;
+ try {
+ returnValue = command.ExecuteNonQuery();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ return returnValue;
+ }
}
///
diff --git a/C2P_Data/DtProxy.cs b/C2P_Data/DtProxy.cs
index 7891062..7c27131 100644
--- a/C2P_Data/DtProxy.cs
+++ b/C2P_Data/DtProxy.cs
@@ -34,6 +34,7 @@ namespace C2P_Data
taO4I = new DS_UtilityTableAdapters.Offers4ItemTableAdapter();
taOH = new DS_UtilityTableAdapters.OrderHistTableAdapter();
taSC2C = new DS_UtilityTableAdapters.StdCost2createTableAdapter();
+ taImpTL = new DS_UtilityTableAdapters.Import_TicketListTableAdapter();
}
///
/// effettua setup dei connection strings da web.config della singola applicazione
@@ -54,6 +55,7 @@ namespace C2P_Data
taO4I.Connection.ConnectionString = connStr;
taOH.Connection.ConnectionString = connStr;
taSC2C.Connection.ConnectionString = connStr;
+ taImpTL.Connection.ConnectionString = connStr;
}
#endregion
@@ -72,6 +74,8 @@ namespace C2P_Data
public DS_UtilityTableAdapters.Offers4ItemTableAdapter taO4I;
public DS_UtilityTableAdapters.OrderHistTableAdapter taOH;
public DS_UtilityTableAdapters.StdCost2createTableAdapter taSC2C;
+ public DS_UtilityTableAdapters.Import_TicketListTableAdapter taImpTL;
+
public static DtProxy man = new DtProxy();
diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll
index 2d8cb96..880c437 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_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll
index 2d8cb96..880c437 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 d67900b..527eab1 100644
Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ