v 1.4.251

inserito filtraggio in elenco interventi come x mtz progr
This commit is contained in:
Samuele E. Locatelli
2015-10-15 16:44:05 +02:00
parent b3a9fa9951
commit 7514aee244
38 changed files with 122 additions and 82 deletions
@@ -9,8 +9,8 @@
<head id="Head1" runat="server">
<title></title>
<link href="~/Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
<link rel="icon" href="~/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/favicon.png" type="image/png" />
</head>
<body class="body">
<form id="form1" runat="server">
@@ -14,8 +14,8 @@
<head id="Head1" runat="server">
<title></title>
<link href="~/Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
<link rel="icon" href="~/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/favicon.png" type="image/png" />
</head>
<body class="body">
<form id="form1" runat="server">
@@ -15,8 +15,8 @@
<head id="Head1" runat="server">
<title></title>
<link href="~/Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
<link rel="icon" href="~/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/favicon.png" type="image/png" />
</head>
<body class="body">
<form id="form1" runat="server">
@@ -7,8 +7,8 @@
<head runat="server">
<title>Simplepage</title>
<link href="../Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
<link rel="icon" href="~/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/favicon.png" type="image/png" />
</head>
<body class="body">
<form id="form1" runat="server">
@@ -8,8 +8,8 @@
<head id="Head1" runat="server">
<title>SimplePage</title>
<link href="~/Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
<link rel="icon" href="~/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/favicon.png" type="image/png" />
</head>
<body>
<form id="form1" runat="server" method="post" enctype="multipart/form-data">
@@ -10,8 +10,8 @@
<head runat="server">
<title></title>
<link href="~/Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
<link rel="icon" href="~/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/favicon.png" type="image/png" />
</head>
<body class="body">
<form id="form1" runat="server">
@@ -1,5 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true"
Inherits="mod_elencoRichieste" Codebehind="mod_elencoRichieste.ascx.cs" %>
Inherits="mod_elencoRichieste" CodeBehind="mod_elencoRichieste.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi"
TagPrefix="uc1" %>
@@ -109,9 +109,19 @@
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByPeriodoSearch" TypeName="GIM_data.DS_applicazioneTableAdapters.v_intervExpTableAdapter"
FilterExpression=" (idxStato < 3) ">
<%--<FilterParameters>
<FilterParameters>
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
</FilterParameters>--%>
<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:ControlParameter ControlID="mod_filtroTipo" DefaultValue="0" Name="idxTipo"
PropertyName="valoreInt" Type="Int32" />
<asp:ControlParameter ControlID="mod_filtroMacchina" DefaultValue="0" Name="idxMacchina"
PropertyName="valoreInt" Type="Int32" />--%>
</FilterParameters>
<SelectParameters>
<asp:SessionParameter DefaultValue="01/01/1900" Name="inizio" SessionField="_inizio"
Type="DateTime" />
@@ -370,7 +370,6 @@ public partial class mod_elencoRichieste : ApplicationUserControl
/// </summary>
private void checkFixOds()
{
//ods.FilterExpression = "( CONVERT(numIntMtz,'System.String') LIKE '%{0}%' OR codImpianto LIKE '%{0}%' OR nomeImpianto LIKE '%{0}%' OR codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' )";
if (!chkMostraIntChiusi.Checked)
{
//ods.FilterExpression += " AND (idxStato < 3)";
@@ -380,6 +379,18 @@ public partial class mod_elencoRichieste : ApplicationUserControl
{
ods.FilterExpression = "";
}
if (memLayer.ML.isInSessionObject("idxTipo_filt"))
{
ods.FilterExpression += " AND (idxTipo = {1})";
}
if (memLayer.ML.isInSessionObject("idxImpianto_filt"))
{
ods.FilterExpression += " AND (idxImpianto = {2})";
}
if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
{
ods.FilterExpression += " AND (idxMacchina = {3})";
}
ods.DataBind();
}
/// <summary>
@@ -1,40 +1,37 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="WebUserControls_mod_filtraMtzProg" Codebehind="mod_filtraMtzProg.ascx.cs" %>
<%@ Register src="mod_filtro.ascx" tagname="mod_filtro" tagprefix="uc1" %>
<%@ 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;" class="txtMini">
<table cellpadding="5px">
<tr valign="top">
<td style="width: 250px;">
<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>
</td>
<td>
<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>
</td>
</tr>
</table>
</div>
<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>
</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>
<div class="clearDiv"></div>
</div>
</div>
Binary file not shown.
Binary file not shown.
@@ -4,6 +4,9 @@
<%@ Register Src="~/WebUserControls/mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento"
TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc3" %>
<%@ Register Src="~/WebUserControls/mod_filtraMtzProg.ascx" TagPrefix="uc1" TagName="mod_filtraMtzProg" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_filtraMtzProg runat="server" ID="mod_filtraMtzProg" />
<uc1:mod_elencoRichieste ID="mod_elencoRichieste1" runat="server" />
</asp:Content>
@@ -8,10 +8,21 @@ public partial class elencoRichieste : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
mod_filtraMtzProg.eh_newFiltroSel += new EventHandler(mod_filtraMtzProg1_eh_newFiltroSel);
mod_elencoRichieste1.eh_selValore += new EventHandler(mod_elencoRichieste1_eh_selValore);
((AjaxSearch)Master).eh_Search_Submit += elencoRichieste_eh_Search_Submit;
}
/// <summary>
/// è stato chiamato evento "nuovo filtro" e quindi aggiorno
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_filtraMtzProg1_eh_newFiltroSel(object sender, EventArgs e)
{
// update della visualizzazione normale
mod_elencoRichieste1.doUpdate();
}
void elencoRichieste_eh_Search_Submit(object sender, EventArgs e)
{
mod_elencoRichieste1.doUpdate();
+10 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -12,6 +11,15 @@
public partial class elencoRichieste {
/// <summary>
/// mod_filtraMtzProg control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebUserControls_mod_filtraMtzProg mod_filtraMtzProg;
/// <summary>
/// mod_elencoRichieste1 control.
/// </summary>
@@ -13,7 +13,7 @@
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
<link rel="apple-touch-icon-precomposed" href="./templates/default/images/logo/ilias_logo_57x57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="./templates/default/images/logo/ilias_logo_114x114-precomposed.png">
+1 -1
View File
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#8" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#10" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#11" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#14" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#15" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#17" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#18" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#19" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#23" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#25" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#26" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#30" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#31" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#33" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#34" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#35" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#69" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#70" title="Table of Contents"/>
@@ -4,7 +4,7 @@
<title>ILIAS - Manuale WebGIM</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
</head>
<frameset name="content" cols="30%,70%">
<frame name="toc" src="frame_toc.html#8" title="Table of Contents"/>
@@ -17,7 +17,7 @@
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.4.249.510")]
[assembly: AssemblyFileVersion("1.4.249.510")]
[assembly: AssemblyVersion("1.4.251.510")]
[assembly: AssemblyFileVersion("1.4.251.510")]
[assembly: AssemblyCopyright("Steamware © 2006-2015")]
[assembly: AssemblyCompany("Steamware")]
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.4.249.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.4.249.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.4.251.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.4.251.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
Binary file not shown.