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

Update pagina import dati con abilitazione 3 button e nome stored + parametri da web.config

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-11-21 08:49:19 +01:00
parent c5da4e585e
commit def1f552e4
13 changed files with 99 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P.sln
+12
View File
@@ -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
C2P/Import.aspx
+5 -4
View File
@@ -17,10 +17,10 @@
<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>
<div class="col-sm-4">
<%--<asp:LinkButton runat="server" ID="lbtConvert" CssClass="btn btn-info" Width="100%" OnClick="lbtConvert_Click">Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %></asp:LinkButton>--%>
<asp:LinkButton runat="server" ID="lbtConvert" CssClass="btn btn-info" Width="100%" OnClick="lbtConvert_Click">Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %></asp:LinkButton>
</div>
<div class="col-sm-4">
<%--<asp:LinkButton runat="server" ID="lbtMerge" CssClass="btn btn-warning" Width="100%" OnClick="lbtMerge_Click">Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %></asp:LinkButton>--%>
<asp:LinkButton runat="server" ID="lbtMerge" CssClass="btn btn-warning" Width="100%" OnClick="lbtMerge_Click">Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %></asp:LinkButton>
</div>
</div>
<div class="row" style="min-height: 3.3em;">
@@ -106,10 +106,11 @@
<asp:TemplateField SortExpression="IsDone">
<ItemTemplate>
<div class='<%# cssByCheck(Eval("IsOk"),Eval("IsDone")) %>'>
<%--<asp:CheckBox ID="CheckBox1" runat="server" Checked='<%# Eval("IsDone") %>' Enabled="false" />--%>
<%--<asp:CheckBox ID="CheckBox1" runat="server" Checked='<%# Eval("IsDone") %>' Enabled="false" />
<i runat="server" id="icnRunning" class="fa fa-refresh fa-spin fa-2x" visible='<%# !Convert.ToBoolean(Eval("IsDone")) %>'></i>
<i runat="server" id="icnDone" class="fa fa-check fa-2x" visible='<%# Convert.ToBoolean(Eval("IsDone")) && Convert.ToBoolean(Eval("IsOk")) %>'></i>
<i runat="server" id="icnError" class="fa fa-times fa-2x" visible='<%# Convert.ToBoolean(Eval("IsDone")) && !Convert.ToBoolean(Eval("IsOk")) %>'></i>
<i runat="server" id="icnError" class="fa fa-times fa-2x" visible='<%# Convert.ToBoolean(Eval("IsDone")) && !Convert.ToBoolean(Eval("IsOk")) %>'></i>--%>
<i runat="server" id="icona" class='<%# currIcon(Eval("DataStart"),Eval("DataEnd"),Eval("IsDone"),Eval("IsOk")) %>'></i>
</div>
</ItemTemplate>
C2P/Import.aspx.cs
+53 -3
View File
@@ -68,13 +68,63 @@ namespace C2P
return answ;
}
/// <summary>
/// restituisce icona corretta a seconda dello stato della riga...
/// </summary>
/// <param name="dataStart"></param>
/// <param name="dataEnd"></param>
/// <param name="isDone"></param>
/// <param name="isOk"></param>
/// <returns></returns>
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;
}
/// <summary>
/// chiamata procedura di import file
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtImport_Click(object sender, EventArgs e)
{
DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_ImportFile_Process]", @"@filePath='e:\test\',@ProcDiesGroup=1");
insertStepTicket("step01");
}
/// <summary>
/// fa la chiamata di inserimento step richeisto e aggiorna
/// </summary>
/// <param name="stepCode"></param>
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
/// <param name="e"></param>
protected void lbtConvert_Click(object sender, EventArgs e)
{
//DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_ConvertFile_Process]", "@filePath='e:\test\',@ERRORFILE = ''");
insertStepTicket("step02");
}
/// <summary>
/// chiamata procedura di merge dati
@@ -94,7 +144,7 @@ namespace C2P
/// <param name="e"></param>
protected void lbtMerge_Click(object sender, EventArgs e)
{
//DtProxy.man.taImpTL.InsertQuery("[tmp].[stp_All_MergeFile_Process]", "@filePath='e:\test\',@ERRORFILE = ''");
insertStepTicket("step03");
}
}
C2P/Import.aspx.designer.cs
Generated
+18
View File
@@ -21,6 +21,24 @@ namespace C2P {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtImport;
/// <summary>
/// lbtConvert 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 lbtConvert;
/// <summary>
/// lbtMerge 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 lbtMerge;
/// <summary>
/// grViewTicket control.
/// </summary>
C2P/Web.config
+7
View File
@@ -34,6 +34,13 @@
<add key="urlGestUtenti" value="UserAdmin"/>
<add key="adminEmail" value="samuele@steamware.net"/>
<add key="PageNoIndex" value="UserAdmin#Test" />
<!--area import dati-->
<add key="step01_stp" value="[tmp].[stp_All_ImportFile_Process]"/>
<add key="step01_par" value="@filePath='e:\test\',@ProcDiesGroup=1"/>
<add key="step02_stp" value="[tmp].[stp_All_ConvertFile_Process]"/>
<add key="step02_par" value="@ProcDiesGroup=1"/>
<add key="step03_stp" value="[tmp].[stp_All_MergeFile_Process]"/>
<add key="step03_par" value="@flgUpdate=0"/>
<!--area suggerimenti-->
<add key="maxNumSuggest" value="50" />
<!--area logger-->
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -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")]
VersGen/C2P.tt
+2 -2
View File
@@ -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")]
<#+