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

vers 0.6.53!

Browse Source 
Completata generazioen revisioni, FORSE DA MODIFICARE stored che restituisce risultati (dovreìbbe mostrare SOLO ULTIMA REVISIONE...)
Impostato default a -365gg x periodo
This commit is contained in:
Samuele E. Locatelli
2014-04-23 18:50:51 +02:00
parent d7f16d7f57
commit 982ebc614d
15 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Web.config
+1
View File
@@ -21,6 +21,7 @@
<add key="doShrinkFolder" value="true" />
<add key="_logLevel" value="6" />
<add key="_logMaxMb" value="30" />
<add key="defDayFrom" value="-365"/>
<add key="intUpdatePagina_ms" value="60000" />
<!--stringhe connessione-->
<add key="C2PConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer;" />
C2P/WebUserControls/mod_OffersArchive.ascx
+6 -2
View File
@@ -82,12 +82,16 @@
</div>
<div class="row">
<div class="col-sm-12">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="odsQuotes" DataKeyNames="QuoteType,CodQuote,QuoteRev" OnSelectedIndexChanged="grView_SelectedIndexChanged" CellPadding="4" ForeColor="#333333" GridLines="None" CssClass="table table-striped table-bordered" AllowPaging="True" AllowSorting="true" OnSorted="grView_Sorted" PageSize="20">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="odsQuotes" DataKeyNames="QuoteType,CodQuote,QuoteRev" OnSelectedIndexChanged="grView_SelectedIndexChanged" CellPadding="4" ForeColor="#333333" GridLines="None" CssClass="table table-striped table-bordered" AllowPaging="True" AllowSorting="True" OnSorted="grView_Sorted" PageSize="20">
<EmptyDataTemplate>
<%# traduci("NoRecords") %>
</EmptyDataTemplate>
<Columns>
<asp:BoundField DataField="CodQuote" HeaderText="Offer #" SortExpression="CodQuote" ReadOnly="true" />
<asp:TemplateField HeaderText="Offer #" SortExpression="CodQuote">
<ItemTemplate>
<asp:Label ID="Label6" runat="server" Text='<%# Bind("CodQuote") %>' />.<span style="font-size: 0.8em;"><asp:Label ID="Label7" runat="server" Text='<%# Bind("QuoteRev") %>' /></span>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="QS" SortExpression="idxQState">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# traduci("ST" + Eval("idxQState")) %>'></asp:Label>
C2P/WebUserControls/mod_OffersArchive.ascx.cs
+1 -1
View File
@@ -392,7 +392,7 @@ namespace C2P.WebUserControls
protected void lbDuplicate_Click(object sender, EventArgs e)
{
// duplica offerta!
DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt16(QuoteRev));
DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev));
if (tab.Rows.Count > 0)
{
// seleziona l'offerta duplicata!
C2P/WebUserControls/mod_QuoteDet.ascx
+5
View File
@@ -86,4 +86,9 @@
<asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("nextIdxQState-03") %></asp:LinkButton>
</div>
</div>
<div id="divStato3" runat="server" class="row">
<div class="col-xs-4 col-xs-offset-4">
<asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("createNewRev") %></asp:LinkButton>
</div>
</div>
</div>
C2P/WebUserControls/mod_QuoteDet.ascx.cs
+19
View File
@@ -303,30 +303,35 @@ namespace C2P.WebUserControls
divStato0.Visible = true;
divStato1.Visible = false;
divStato2.Visible = false;
divStato3.Visible = false;
btnGetPdf.Visible = false;
break;
case "1":
divStato0.Visible = false;
divStato1.Visible = true;
divStato2.Visible = false;
divStato3.Visible = false;
btnGetPdf.Visible = true;
break;
case "2":
divStato0.Visible = false;
divStato1.Visible = false;
divStato2.Visible = true;
divStato3.Visible = false;
btnGetPdf.Visible = true;
break;
case "3":
divStato0.Visible = false;
divStato1.Visible = false;
divStato2.Visible = false;
divStato3.Visible = true;
btnGetPdf.Visible = true;
break;
default:
divStato0.Visible = false;
divStato1.Visible = false;
divStato2.Visible = false;
divStato3.Visible = false;
btnGetPdf.Visible = false;
break;
}
@@ -391,6 +396,20 @@ namespace C2P.WebUserControls
return answ;
}
}
/// <summary>
/// genera nuova revisione e rimanda a pagina corrente con nuova revisione...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbNewRev_Click(object sender, EventArgs e)
{
DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.newRev(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev));
if (tab.Rows.Count > 0)
{
// seleziona l'offerta duplicata!
Response.Redirect(string.Format("Quote?QuoteType={0}&CodQuote={1}&QuoteRev={2}", tab[0].QuoteType, tab[0].CodQuote, tab[0].QuoteRev));
}
}
}
}
C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs
Generated
+18
View File
@@ -236,5 +236,23 @@ namespace C2P.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbRelease;
/// <summary>
/// divStato3 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 divStato3;
/// <summary>
/// lbNewRev 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 lbNewRev;
}
}
C2P/WebUserControls/mod_selPeriodo.ascx
+2 -2
View File
@@ -37,11 +37,11 @@
<div class="input-group input-group-sm">
<div class="input-group-btn">
<asp:DropDownList ID="ddlSelPeriodo" runat="server" AutoPostBack="True" OnSelectedIndexChanged="ddlSelPeriodo_SelectedIndexChanged" CssClass="btn btn-default dropdown-toggle" Font-Size="X-Small">
<asp:ListItem Value="1">selezione</asp:ListItem>
<asp:ListItem Value="1" Selected="True">selezione</asp:ListItem>
<asp:ListItem Value="2">oggi</asp:ListItem>
<asp:ListItem Value="3">ieri</asp:ListItem>
<asp:ListItem>questa sett.</asp:ListItem>
<asp:ListItem Selected="True">ultimi 7gg</asp:ListItem>
<asp:ListItem>ultimi 7gg</asp:ListItem>
<asp:ListItem>questo mese</asp:ListItem>
<asp:ListItem>ultimi 30gg</asp:ListItem>
<asp:ListItem>1 anno</asp:ListItem>
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_Data/DS_Quotes.Designer.cs
Generated
+41 -4
View File
@@ -8359,7 +8359,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou
[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[5];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT * FROM dbo.QuoteList";
@@ -8396,12 +8396,20 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = "dbo.stp_QL_update";
this._commandCollection[4].CommandText = "dbo.stp_QL_newRev";
this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteRev_orig", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = "dbo.stp_QL_update";
this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8551,6 +8559,35 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou
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.Select, false)]
public virtual DS_Quotes.QuoteListDataTable newRev(string QuoteType, global::System.Nullable<long> CodQuote, global::System.Nullable<int> QuoteRev_orig) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((QuoteType == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(QuoteType));
}
if ((CodQuote.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[2].Value = ((long)(CodQuote.Value));
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
if ((QuoteRev_orig.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(QuoteRev_orig.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
DS_Quotes.QuoteListDataTable dataTable = new DS_Quotes.QuoteListDataTable();
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")]
@@ -9041,7 +9078,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int stp_QL_update(string QuoteType, global::System.Nullable<long> CodQuote, global::System.Nullable<int> QuoteRev) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
if ((QuoteType == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
C2P_Data/DS_Quotes.xsd
+13
View File
@@ -179,6 +179,19 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QL_newRev" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="newRev" GetMethodModifier="Public" GetMethodName="newRev" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="newRev" UserSourceName="newRev">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_QL_newRev</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="char" DbType="AnsiStringFixedLength" Direction="Input" ParameterName="@QuoteType" Precision="0" ProviderType="Char" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bigint" DbType="Int64" Direction="Input" ParameterName="@CodQuote" Precision="19" ProviderType="BigInt" Scale="0" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@QuoteRev_orig" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QL_update" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="stp_QL_update" Modifier="Public" Name="stp_QL_update" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="stp_QL_update">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("0.6.52.143")]
[assembly: AssemblyFileVersion("0.6.52.143")]
[assembly: AssemblyVersion("0.6.53.143")]
[assembly: AssemblyFileVersion("0.6.53.143")]
[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("0.6.52.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.6.52.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.6.53.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.6.53.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+