Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunjto button (x utenti NON superAdmin) x fare i 3 step insieme..

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-11-21 14:18:22 +01:00
parent 83a0371ac6
commit 081ad834aa
9 changed files with 95 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Import.aspx
+26 -21
View File
@@ -12,7 +12,12 @@
<h3 class="panel-title"><%: traduci("ImportData") %></h3>
</div>
<div class="panel-body">
<div class="row" style="min-height: 3.3em;">
<div class="row" style="min-height: 3.3em;" runat="server" id="divAllSteps">
<div class="col-sm-12">
<asp:LinkButton runat="server" ID="lbtAllSteps" CssClass="btn btn-success" Width="100%" OnClick="lbtAllSteps_Click"><%: traduci("tmp.stp_All_Process") %></asp:LinkButton>
</div>
</div>
<div class="row" style="min-height: 3.3em;" runat="server" id="divThreeSteps">
<div class="col-sm-4">
<asp:LinkButton runat="server" ID="lbtImport" CssClass="btn btn-primary" Width="100%" OnClick="lbtImport_Click">Step 1 - <%: traduci("tmp.stp_All_ImportFile_Process") %></asp:LinkButton>
</div>
@@ -127,26 +132,26 @@
</div>
<div class="row" style="min-height: 3.3em;">
<div class="col-sm-12">
<asp:GridView ID="grViewLog" runat="server" AutoGenerateColumns="False" BackColor="LightGoldenrodYellow" BorderColor="Tan" BorderWidth="1px" CellPadding="2" DataKeyNames="NumLog" DataSourceID="odsLog" ForeColor="Black" GridLines="None">
<AlternatingRowStyle BackColor="PaleGoldenrod" />
<Columns>
<asp:BoundField DataField="NumLog" HeaderText="NumLog" InsertVisible="False" ReadOnly="True" SortExpression="NumLog" />
<asp:BoundField DataField="NumTicket" HeaderText="NumTicket" SortExpression="NumTicket" />
<asp:BoundField DataField="Data" HeaderText="Data" SortExpression="Data" />
<asp:BoundField DataField="StpName" HeaderText="StpName" SortExpression="StpName" />
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" />
<asp:CheckBoxField DataField="IsOk" HeaderText="IsOk" SortExpression="IsOk" />
<asp:BoundField DataField="Command" HeaderText="Command" SortExpression="Command" />
</Columns>
<FooterStyle BackColor="Tan" />
<HeaderStyle BackColor="Tan" Font-Bold="True" />
<PagerStyle BackColor="PaleGoldenrod" ForeColor="DarkSlateBlue" HorizontalAlign="Center" />
<SelectedRowStyle BackColor="DarkSlateBlue" ForeColor="GhostWhite" />
<SortedAscendingCellStyle BackColor="#FAFAE7" />
<SortedAscendingHeaderStyle BackColor="#DAC09E" />
<SortedDescendingCellStyle BackColor="#E1DB9C" />
<SortedDescendingHeaderStyle BackColor="#C2A47B" />
</asp:GridView>
<asp:GridView ID="grViewLog" runat="server" AutoGenerateColumns="False" BackColor="LightGoldenrodYellow" BorderColor="Tan" BorderWidth="1px" CellPadding="2" DataKeyNames="NumLog" DataSourceID="odsLog" ForeColor="Black" GridLines="None">
<AlternatingRowStyle BackColor="PaleGoldenrod" />
<Columns>
<asp:BoundField DataField="NumLog" HeaderText="NumLog" InsertVisible="False" ReadOnly="True" SortExpression="NumLog" />
<asp:BoundField DataField="NumTicket" HeaderText="NumTicket" SortExpression="NumTicket" />
<asp:BoundField DataField="Data" HeaderText="Data" SortExpression="Data" />
<asp:BoundField DataField="StpName" HeaderText="StpName" SortExpression="StpName" />
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" />
<asp:CheckBoxField DataField="IsOk" HeaderText="IsOk" SortExpression="IsOk" />
<asp:BoundField DataField="Command" HeaderText="Command" SortExpression="Command" />
</Columns>
<FooterStyle BackColor="Tan" />
<HeaderStyle BackColor="Tan" Font-Bold="True" />
<PagerStyle BackColor="PaleGoldenrod" ForeColor="DarkSlateBlue" HorizontalAlign="Center" />
<SelectedRowStyle BackColor="DarkSlateBlue" ForeColor="GhostWhite" />
<SortedAscendingCellStyle BackColor="#FAFAE7" />
<SortedAscendingHeaderStyle BackColor="#DAC09E" />
<SortedDescendingCellStyle BackColor="#E1DB9C" />
<SortedDescendingHeaderStyle BackColor="#C2A47B" />
</asp:GridView>
<asp:ObjectDataSource ID="odsLog" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTicket" TypeName="C2P_Data.DS_UtilityTableAdapters.Import_LogTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="grViewTicket" DefaultValue="0" Name="NumTicket" PropertyName="SelectedValue" Type="Int32" />
C2P/Import.aspx.cs
+33 -5
View File
@@ -16,6 +16,7 @@ namespace C2P
if (!Page.IsPostBack)
{
grViewLog.Visible = false;
divThreeSteps.Visible = userIsSuperAdmin;
}
}
@@ -116,17 +117,30 @@ namespace C2P
/// <param name="e"></param>
protected void lbtImport_Click(object sender, EventArgs e)
{
insertStepTicket("step01");
insertStepTicket("step01", 0, DateTime.Now);
}
/// <summary>
/// fa la chiamata di inserimento step richeisto e aggiorna
/// </summary>
/// <param name="stepCode"></param>
private void insertStepTicket(string stepCode)
/// <param name="prevNumTicket"></param>
/// <param name="dataRich"></param>
/// <returns>NumTicket generato</returns>
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;
}
/// <summary>
/// chiamata procedura di convert tracciati
@@ -135,7 +149,7 @@ namespace C2P
/// <param name="e"></param>
protected void lbtConvert_Click(object sender, EventArgs e)
{
insertStepTicket("step02");
insertStepTicket("step02", 0, DateTime.Now);
}
/// <summary>
/// chiamata procedura di merge dati
@@ -144,8 +158,22 @@ namespace C2P
/// <param name="e"></param>
protected void lbtMerge_Click(object sender, EventArgs e)
{
insertStepTicket("step03");
insertStepTicket("step03", 0, DateTime.Now);
}
/// <summary>
/// chiamata a TUTTE LE procedure x import dati
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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));
}
}
}
C2P/Import.aspx.designer.cs
Generated
+27
View File
@@ -12,6 +12,33 @@ namespace C2P {
public partial class Import {
/// <summary>
/// divAllSteps control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAllSteps;
/// <summary>
/// lbtAllSteps control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtAllSteps;
/// <summary>
/// divThreeSteps control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divThreeSteps;
/// <summary>
/// lbtImport control.
/// </summary>
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/NLog.dll
BIN
View File
Binary file not shown.
C2P_CronJob/bin/Release/C2P_CronJob.vshost.application
+1 -1
View File
@@ -11,7 +11,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>6iQyCv+iua1rI4R+lLmzhRwZC6Y=</dsig:DigestValue>
<dsig:DigestValue>YQ9vr3cTIRCbuYBLM1J1GjhHcz8=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
C2P_CronJob/bin/Release/C2P_CronJob.vshost.exe.manifest
+4 -4
View File
@@ -77,26 +77,26 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="C2P_CronJob.exe" size="8704">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="C2P_CronJob.exe" size="9216">
<assemblyIdentity name="C2P_CronJob" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>HI6syZpBGnOpgEq9YCCayHOgZ2o=</dsig:DigestValue>
<dsig:DigestValue>TY/JBFMXj/h++cvWRSn6pqOrt9s=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="C2P_Data.dll" size="626176">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="C2P_Data.dll" size="626688">
<assemblyIdentity name="C2P_Data" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>4paIJqwB+KZOXfXfoWCvgzSqYSg=</dsig:DigestValue>
<dsig:DigestValue>cyyhEL70VPntDlHHF11UaZpnr6M=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
VersGen/C2P.cs
+2 -2
View File
@@ -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")]
VersGen/C2P.tt
+2 -2
View File
@@ -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")]
<#+