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

iniziato modifica x filtro interventi mtz pending...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-01-27 18:28:24 +01:00
parent 847daa19fa
commit 548d3aef45
15 changed files with 99 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/WebGIM/GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/SteamWare.XML
+8
View File
@@ -4876,6 +4876,14 @@
<param name="numGiorniPrima"></param>
<returns></returns>
</member>
<member name="M:SteamWare.datario.prossimiGiorni(System.DateTime,System.Int32)">
<summary>
restituisce l'intervallo di N giorni dalla data indicata in avanti
</summary>
<param name="data"></param>
<param name="numGiorniSucc"></param>
<returns></returns>
</member>
<member name="M:SteamWare.datario.questaSett(System.DateTime)">
<summary>
restituisce l'intervallo della settimana corrente per la data indicata
Projects/WebGIM/GIM_data/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx
+30 -31
View File
@@ -1,37 +1,36 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="WebUserControls_mod_filtraMtzProg" CodeBehind="mod_filtraMtzProg.ascx.cs" %>
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
<div style="width: 100%; background: #cdcdcd; font-size: 0.8em;" class="txtMini">
<div style="vertical-align: top;">
<div style="min-width: 200px; float: left;">
<div>
<asp:Label runat="server" ID="lblFiltTipo" />
</div>
<div>
<uc1:mod_filtro ID="mod_filtroTipo" runat="server" css="txtMini" />
<asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
</div>
<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagPrefix="uc1" TagName="mod_periodoAnalisi" %>
<div class="row txtMini" style="width: 100%; background: #cdcdcd; font-size: 0.8em;">
<div class="col-sm-2 text-left">
<div>
<asp:Label runat="server" ID="lblFiltTipo" />
</div>
<div style="min-width: 500px; float: left;">
<div>
<asp:Label runat="server" ID="lblFiltMacchina" />
</div>
<div>
<uc1:mod_filtro ID="mod_filtroImpianto" runat="server" css="txtMini" Oneh_selValore="eh_selectedImpianto" />
<asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
</div>
<div>
<uc1:mod_filtro ID="mod_filtroMacchina" runat="server" css="txtMini" Visible="false" />
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="mod_filtroImpianto" DefaultValue="0" Name="conditio"
PropertyName="valoreInt" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div>
<uc1:mod_filtro ID="mod_filtroTipo" runat="server" css="txtMini" />
<asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
</div>
<div class="clearDiv"></div>
</div>
<div class="col-sm-5 text-left">
<div>
<asp:Label runat="server" ID="lblFiltMacchina" />
</div>
<div>
<uc1:mod_filtro ID="mod_filtroImpianto" runat="server" css="txtMini" Oneh_selValore="eh_selectedImpianto" />
<asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
</div>
<div>
<uc1:mod_filtro ID="mod_filtroMacchina" runat="server" css="txtMini" Visible="false" />
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="mod_filtroImpianto" DefaultValue="0" Name="conditio" PropertyName="valoreInt" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
<div class="col-sm-5 text-right">
<uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
</div>
</div>
Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs
+11
View File
@@ -144,4 +144,15 @@ public partial class WebUserControls_mod_filtraMtzProg : SteamWare.UserControl
}
}
public bool showPeriodo
{
get
{
return mod_periodoAnalisi.Visible;
}
set
{
mod_periodoAnalisi.Visible = value;
}
}
}
Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs
Generated
+9
View File
@@ -82,4 +82,13 @@ public partial class WebUserControls_mod_filtraMtzProg {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine;
/// <summary>
/// mod_periodoAnalisi control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_periodoAnalisi mod_periodoAnalisi;
}
Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
+5 -6
View File
@@ -41,12 +41,11 @@
OldValuesParameterFormatString="Original_{0}" FilterExpression=" (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') ">
<FilterParameters>
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
<asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxImpianto" SessionField="idxImpianto_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxMacchina" SessionField="idxMacchina_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxImpianto" SessionField="idxImpianto_filt" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxMacchina" SessionField="idxMacchina_filt" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="inizio" SessionField="_inizio" Type="DateTime" />
<asp:SessionParameter DefaultValue="0" Name="fine" SessionField="_fine" Type="DateTime" />
</FilterParameters>
</asp:ObjectDataSource>
</div>
Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
+8
View File
@@ -84,6 +84,14 @@ public partial class mod_mtzPrevPending : ApplicationUserControl
{
ods.FilterExpression += " AND (idxMacchina = {3})";
}
if (memLayer.ML.isInSessionObject("_inizio"))
{
ods.FilterExpression += " AND (data >= {4})";
}
if (memLayer.ML.isInSessionObject("_fine"))
{
ods.FilterExpression += " AND (data <= {5})";
}
ods.DataBind();
}
/// <summary>
Projects/WebGIM/GIM_site/WebUserControls/mod_periodoAnalisi.ascx.cs
+9
View File
@@ -61,6 +61,15 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
case "9_last_year":
_intervallo = _datario.estremiAnno(DateTime.Now.AddYears(-1));
break;
case "10_next_7":
_intervallo = _datario.prossimiGiorni(DateTime.Now, 7);
break;
case "11_next_15":
_intervallo = _datario.prossimiGiorni(DateTime.Now, 15);
break;
case "12_next_30":
_intervallo = _datario.prossimiGiorni(DateTime.Now, 30);
break;
default:
break;
}
Projects/WebGIM/GIM_site/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/SteamWare.xml
+8
View File
@@ -4876,6 +4876,14 @@
<param name="numGiorniPrima"></param>
<returns></returns>
</member>
<member name="M:SteamWare.datario.prossimiGiorni(System.DateTime,System.Int32)">
<summary>
restituisce l'intervallo di N giorni dalla data indicata in avanti
</summary>
<param name="data"></param>
<param name="numGiorniSucc"></param>
<returns></returns>
</member>
<member name="M:SteamWare.datario.questaSett(System.DateTime)">
<summary>
restituisce l'intervallo della settimana corrente per la data indicata
Projects/WebGIM/GIM_site/mtzProg.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
<uc5:mod_filtraMtzProg ID="mod_filtraMtzProg1" runat="server" />
</div>
<div class="col-xs-12">
<cc1:TabContainer ID="TabContainer1" runat="server" ActiveTabIndex="0">
<cc1:TabContainer ID="TabContainer1" runat="server" ActiveTabIndex="0" AutoPostBack="True" OnActiveTabChanged="TabContainer1_ActiveTabChanged">
<cc1:TabPanel runat="server" HeaderText="Programmazione Intervento" ID="TabProgrammaMtz">
<ContentTemplate>
<uc2:mod_dettMtzProg ID="mod_dettMtzProg1" runat="server" Visible="False" />
Projects/WebGIM/GIM_site/mtzProg.aspx.cs
+10
View File
@@ -9,6 +9,10 @@ public partial class mtzProg : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
{
mod_filtraMtzProg1.showPeriodo = (TabContainer1.ActiveTabIndex == 1);
}
mod_elencoMtzProg1.eh_newReq += new EventHandler(mod_elencoMtzProg1_eh_newReq);
mod_elencoMtzProg1.eh_updateDone += new EventHandler(mod_elencoMtzProg1_eh_updateDone);
mod_dettMtzProg1.eh_newInserted += new EventHandler(mod_dettMtzProg1_eh_newInserted);
@@ -65,4 +69,10 @@ public partial class mtzProg : System.Web.UI.Page
{
mod_dettMtzProg1.Visible = !mod_dettMtzProg1.Visible;
}
protected void TabContainer1_ActiveTabChanged(object sender, EventArgs e)
{
// se è attivo il tab 1 mostro filtro periodo altrimenti no...
mod_filtraMtzProg1.showPeriodo = (TabContainer1.ActiveTabIndex == 1);
}
}