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

prima release con filtro data (default: 2 mesi prima...)

Browse Source
This commit is contained in:
Samuele Locatelli
2017-02-13 17:37:12 +01:00
parent 584fb603ac
commit 7a6d18f098
7 changed files with 322 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XPS/Web.config
+2
View File
@@ -167,6 +167,8 @@
<add key="AuthCookieName" value="XPS_Auth" />
<add key="enablePlain" value="true" />
<add key="DevicesAuthConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
<!--area periodo Dati-->
<add key="prevMonth" value="2"/>
<!--area DB-->
<add key="XPSConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
<add key="PermessiConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
XPS/WebUserControls/mod_elencoComm.ascx
+79 -69
View File
@@ -3,75 +3,86 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc2" %>
<div class="filtro_1 row">
<div class="col-xs-12">
<span style="float: left;">
<uc1:mod_filtro ID="mf_tipoFiltro" runat="server" changeCheckEnabled="false" changeCheckVisible="false" />
<asp:ObjectDataSource ID="odsTipoFiltro" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByUrl" TypeName="XPS_data.DS_utilityTableAdapters.v_selFiltriTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="lblPag" DefaultValue="*" Name="url" PropertyName="Text" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Label runat="server" ID="lblPag" Visible="false" />
</span>
<span style="float: left;">
<uc1:mod_filtro ID="mf_clienti" runat="server" />
<asp:ObjectDataSource ID="odsFiltroClienti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="XPS_data.DS_utilityTableAdapters.v_selClientiTableAdapter"></asp:ObjectDataSource>
</span>
<span style="float: right;">
<asp:LinkButton ID="btnShowNew" runat="server" OnClick="btnShowNew_Click" CssClass="styleBtnComposito" CausesValidation="false">
<asp:Label ID="lblReset" runat="server" Text="..." />
</asp:LinkButton></span></div><div class="col-xs-12">
<asp:Panel ID="pnlNew" runat="server" Visible="false" BackColor="#CCCCFF">
<table cellpadding="5px">
<tr>
<td>
<asp:Label ID="lblCli" runat="server" />
</td>
<td colspan="3">
<uc1:mod_filtro ID="mf_cliNew" runat="server" changeCheckEnabled="false" changeCheckVisible="false" />
</td>
<td>
<asp:Label ID="lblCicloEqua" runat="server" />
</td>
<td>
<asp:DropDownList runat="server" ID="ddlCiclo" DataSourceID="odsValLav" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsValLav" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="XPS_data.DS_utilityTableAdapters.v_selAnagLavTableAdapter"></asp:ObjectDataSource>
</td>
<td>
<asp:Label ID="lblDescr" runat="server" />
</td>
<td>
<asp:TextBox ID="txtDescr" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDescr" runat="server" ErrorMessage="!!!" ControlToValidate="txtDescr" />
</td>
</tr>
<tr>
<td>
<asp:Label ID="lblNumDDT" runat="server" />
</td>
<td>
<asp:TextBox ID="txtDDT" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDDT" />
</td>
<td>
<asp:Label ID="lblDataDDT" runat="server" />
</td>
<td>
<asp:TextBox ID="txtDataDDT" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDataDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDataDDT" />
<asp:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDataDDT" Format="dd/MM/yyyy"></asp:CalendarExtender></td><td colspan="2">
<asp:Label ID="lblEmailNotifica" runat="server" />
<asp:CheckBox runat="server" ID="chkReqEmail" Checked="false" />
</td>
<td colspan="2" align="right">
<asp:LinkButton ID="btnNewComm" runat="server" OnClick="btnNewComm_Click" CssClass="styleBtnComposito" CausesValidation="true"></asp:LinkButton><asp:Label ID="Label2" runat="server" Text="..." />
</td>
</tr>
</table>
</asp:Panel>
<div class="filtro_1">
<div class="row">
<div class="col-xs-2">
<asp:TextBox runat="server" ID="txtData" TextMode="Date" AutoPostBack="true" />
</div>
<div class="col-xs-8">
<span style="float: left;">
<uc1:mod_filtro ID="mf_tipoFiltro" runat="server" changeCheckEnabled="false" changeCheckVisible="false" />
<asp:ObjectDataSource ID="odsTipoFiltro" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByUrl" TypeName="XPS_data.DS_utilityTableAdapters.v_selFiltriTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="lblPag" DefaultValue="*" Name="url" PropertyName="Text" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Label runat="server" ID="lblPag" Visible="false" />
</span>
<span style="float: left;">
<uc1:mod_filtro ID="mf_clienti" runat="server" />
<asp:ObjectDataSource ID="odsFiltroClienti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="XPS_data.DS_utilityTableAdapters.v_selClientiTableAdapter"></asp:ObjectDataSource>
</span>
</div>
<div class="col-xs-2">
<span style="float: right;">
<asp:LinkButton ID="btnShowNew" runat="server" OnClick="btnShowNew_Click" CssClass="styleBtnComposito" CausesValidation="false">
<asp:Label ID="lblReset" runat="server" Text="..." />
</asp:LinkButton></span>
</div>
<div class="col-xs-12">
<asp:Panel ID="pnlNew" runat="server" Visible="false" BackColor="#CCCCFF">
<table>
<tr>
<td>
<asp:Label ID="lblCli" runat="server" />
</td>
<td colspan="3">
<uc1:mod_filtro ID="mf_cliNew" runat="server" changeCheckEnabled="false" changeCheckVisible="false" />
</td>
<td>
<asp:Label ID="lblCicloEqua" runat="server" />
</td>
<td>
<asp:DropDownList runat="server" ID="ddlCiclo" DataSourceID="odsValLav" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsValLav" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="XPS_data.DS_utilityTableAdapters.v_selAnagLavTableAdapter"></asp:ObjectDataSource>
</td>
<td>
<asp:Label ID="lblDescr" runat="server" />
</td>
<td>
<asp:TextBox ID="txtDescr" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDescr" runat="server" ErrorMessage="!!!" ControlToValidate="txtDescr" />
</td>
</tr>
<tr>
<td>
<asp:Label ID="lblNumDDT" runat="server" />
</td>
<td>
<asp:TextBox ID="txtDDT" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDDT" />
</td>
<td>
<asp:Label ID="lblDataDDT" runat="server" />
</td>
<td>
<asp:TextBox ID="txtDataDDT" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDataDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDataDDT" />
<asp:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDataDDT" Format="dd/MM/yyyy"></asp:CalendarExtender></td><td colspan="2">
<asp:Label ID="lblEmailNotifica" runat="server" />
<asp:CheckBox runat="server" ID="chkReqEmail" Checked="false" />
</td>
<td colspan="2" align="right">
<asp:LinkButton ID="btnNewComm" runat="server" OnClick="btnNewComm_Click" CssClass="styleBtnComposito" CausesValidation="true"></asp:LinkButton><asp:Label ID="Label2" runat="server" Text="..." />
</td>
</tr>
</table>
</asp:Panel>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-8 col-sm-offset-2 text-center">
<div id="divDet" runat="server" class="col-sm-0">
<asp:Panel ID="pnlSetDueDate" Visible="false" runat="server">
<div class="notaMargine">
<div style="text-align: center;">
@@ -98,9 +109,7 @@
<div style="text-align: center;">
<asp:Button ID="btnOkStati" runat="server" Width="100px" OnClick="btnOkStati_Click" />
&nbsp;&nbsp; <asp:Button ID="btnCancelStati" runat="server" Width="100px" OnClick="btnCancelStati_Click" />
<asp:ConfirmButtonExtender ID="cbeOkStati" runat="server" ConfirmText="..." TargetControlID="btnOkStati"></asp:ConfirmButtonExtender></div></div></asp:Panel></div></div><div class="row">
<div id="divDet" runat="server" class="col-sm-0">
<asp:Panel ID="pnlLogStati" Visible="false" runat="server">
<asp:ConfirmButtonExtender ID="cbeOkStati" runat="server" ConfirmText="..." TargetControlID="btnOkStati"></asp:ConfirmButtonExtender></div></div></asp:Panel><asp:Panel ID="pnlLogStati" Visible="false" runat="server">
<uc2:mod_logStati ID="mod_logStati1" runat="server" />
</asp:Panel>
</div>
@@ -227,6 +236,7 @@
</FilterParameters>
<SelectParameters>
<asp:ControlParameter ControlID="mf_tipoFiltro" DefaultValue="*" Name="CodFiltro" PropertyName="Valore" Type="String" />
<asp:ControlParameter ControlID="txtData" DefaultValue="" Name="DataFiltro" PropertyName="Text" Type="DateTime" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="Original_Cod" Type="String" />
XPS/WebUserControls/mod_elencoComm.ascx.cs
+9
View File
@@ -121,6 +121,7 @@ namespace XPS.WebUserControls
{
traduciObj();
SetUpByUserRight();
setupDataMin();
}
aggiornaControlliDataGL();
_idxGridView = "CodDDT";
@@ -129,6 +130,14 @@ namespace XPS.WebUserControls
mod_logStati1.eh_reset += new EventHandler(mod_logStati1_eh_reset);
setStatiRewindAmmessi();
}
/// <summary>
/// imposta data minima x recupero dati...
/// </summary>
private void setupDataMin()
{
// imposto data minima a x mesi fa...
txtData.Text = DateTime.Today.AddMonths(-memLayer.ML.CRI("prevMonth")).ToString("dd/MM/yyyy");
}
/// <summary>
XPS/WebUserControls/mod_elencoComm.ascx.designer.cs
Generated
+18 -9
View File
@@ -12,6 +12,15 @@ namespace XPS.WebUserControls {
public partial class mod_elencoComm {
/// <summary>
/// txtData 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.TextBox txtData;
/// <summary>
/// mf_tipoFiltro control.
/// </summary>
@@ -255,6 +264,15 @@ namespace XPS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// divDet 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 divDet;
/// <summary>
/// pnlSetDueDate control.
/// </summary>
@@ -399,15 +417,6 @@ namespace XPS.WebUserControls {
/// </remarks>
protected global::AjaxControlToolkit.ConfirmButtonExtender cbeOkStati;
/// <summary>
/// divDet 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 divDet;
/// <summary>
/// pnlLogStati control.
/// </summary>
XPS_data/DS_applicazione.Designer.cs
Generated
+8 -1
View File
@@ -12152,6 +12152,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT
this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFiltro", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFiltro", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = "dbo.sp_creaSetObj";
@@ -12231,7 +12232,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT
[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_applicazione.v_commesseDataTable getByCodFiltro(string CodFiltro) {
public virtual DS_applicazione.v_commesseDataTable getByCodFiltro(string CodFiltro, global::System.Nullable<global::System.DateTime> DataFiltro) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((CodFiltro == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -12239,6 +12240,12 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodFiltro));
}
if ((DataFiltro.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(DataFiltro.Value));
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
DS_applicazione.v_commesseDataTable dataTable = new DS_applicazione.v_commesseDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
XPS_data/DS_applicazione.xsd
+200 -199
View File
File diff suppressed because it is too large Load Diff
XPS_data/DS_applicazione.xss
+6 -6
View File
@@ -4,18 +4,18 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="179" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:AnagClienti" ZOrder="1" X="179" Y="-21" Height="267" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:AnagClienti" ZOrder="2" X="179" Y="-21" Height="267" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:AnagTrattamenti" ZOrder="19" X="1006" Y="43" Height="115" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:Tratt2Obj" ZOrder="18" X="813" Y="198" Height="134" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:v_commesse" ZOrder="5" X="9" Y="452" Height="402" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:v_commesse" ZOrder="1" X="9" Y="452" Height="402" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:IstObj" ZOrder="6" X="496" Y="-33" Height="533" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
<Shape ID="DesignTable:v_righe" ZOrder="7" X="304" Y="533" Height="381" Width="282" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:sp_rec4Day" ZOrder="10" X="802" Y="413" Height="96" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:v_ULP" ZOrder="8" X="1040" Y="332" Height="440" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:Eventi" ZOrder="2" X="23" Y="245" Height="172" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:TraEv2Stati" ZOrder="3" X="282" Y="253" Height="267" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:Eventi" ZOrder="3" X="23" Y="245" Height="172" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:TraEv2Stati" ZOrder="4" X="282" Y="253" Height="267" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:v_logStati" ZOrder="9" X="658" Y="557" Height="248" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:sp_contaNonSched" ZOrder="13" X="1056" Y="207" Height="96" Width="254" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:sp_schedaIdent" ZOrder="14" X="669" Y="831" Height="305" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -51,7 +51,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_IstObj_AnagClienti" ZOrder="4" LineWidth="11">
<Connector ID="DesignRelation:FK_IstObj_AnagClienti" ZOrder="5" LineWidth="11">
<RoutePoints>
<Point>
<X>432</X>