From d3f8946737867fa92b844810e410823d6cc2cdc3 Mon Sep 17 00:00:00 2001 From: samuele Date: Thu, 29 Jan 2009 12:49:40 +0000 Subject: [PATCH] Fix comportamento editing richiesta (in nuova asp.net form) git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@51 3e04ef4b-3b25-4b6c-be27-bb5389ca777b --- WebSites/WebGIM/dettaglioIntervento.aspx | 10 ++++++ WebSites/WebGIM/dettaglioIntervento.aspx.cs | 22 ++++++++++++ WebSites/WebGIM/elencoRichieste.aspx | 4 +-- WebSites/WebGIM/elencoRichieste.aspx.cs | 24 +------------ WebSites/WebGIM/mod_dataOra.ascx.cs | 16 --------- WebSites/WebGIM/mod_dettaglioIntervento.ascx | 3 +- .../WebGIM/mod_dettaglioIntervento.ascx.cs | 17 ++++++++-- WebSites/WebGIM/mod_elencoRichieste.ascx | 3 +- WebSites/WebGIM/mod_elencoRichieste.ascx.cs | 34 +------------------ WebSites/WebGIM/mod_selettore.ascx.cs | 21 ------------ 10 files changed, 54 insertions(+), 100 deletions(-) create mode 100644 WebSites/WebGIM/dettaglioIntervento.aspx create mode 100644 WebSites/WebGIM/dettaglioIntervento.aspx.cs diff --git a/WebSites/WebGIM/dettaglioIntervento.aspx b/WebSites/WebGIM/dettaglioIntervento.aspx new file mode 100644 index 0000000..c5bdb0b --- /dev/null +++ b/WebSites/WebGIM/dettaglioIntervento.aspx @@ -0,0 +1,10 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" + CodeFile="dettaglioIntervento.aspx.cs" Inherits="dettaglioIntervento" %> + +<%@ Register Src="mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento" + TagPrefix="uc2" %> +<%@ Register Src="mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %> + + + + diff --git a/WebSites/WebGIM/dettaglioIntervento.aspx.cs b/WebSites/WebGIM/dettaglioIntervento.aspx.cs new file mode 100644 index 0000000..ce11c00 --- /dev/null +++ b/WebSites/WebGIM/dettaglioIntervento.aspx.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class dettaglioIntervento : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + mod_dettaglioIntervento1.eh_chiudi += new EventHandler(mod_dettaglioIntervento1_eh_chiudi); + } + /// + /// resetto selezione, nascondo dettaglio + /// + /// + /// + void mod_dettaglioIntervento1_eh_chiudi(object sender, EventArgs e) + { + Response.Redirect("elencoRichieste.aspx"); + } +} diff --git a/WebSites/WebGIM/elencoRichieste.aspx b/WebSites/WebGIM/elencoRichieste.aspx index 699c382..fd78993 100644 --- a/WebSites/WebGIM/elencoRichieste.aspx +++ b/WebSites/WebGIM/elencoRichieste.aspx @@ -7,7 +7,7 @@ <%@ Register src="mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc3" %> - - + <%-- + --%> diff --git a/WebSites/WebGIM/elencoRichieste.aspx.cs b/WebSites/WebGIM/elencoRichieste.aspx.cs index c75e9c0..896d30a 100644 --- a/WebSites/WebGIM/elencoRichieste.aspx.cs +++ b/WebSites/WebGIM/elencoRichieste.aspx.cs @@ -9,27 +9,6 @@ public partial class elencoRichieste : System.Web.UI.Page protected void Page_Load(object sender, EventArgs e) { mod_elencoRichieste1.eh_selValore += new EventHandler(mod_elencoRichieste1_eh_selValore); - mod_elencoRichieste1.eh_resetSelezione += new EventHandler(mod_elencoRichieste1_eh_resetSelezione); - mod_dettaglioIntervento1.eh_chiudi += new EventHandler(mod_dettaglioIntervento1_eh_chiudi); - } - /// - /// resetto selezione, nascondo dettaglio - /// - /// - /// - void mod_dettaglioIntervento1_eh_chiudi(object sender, EventArgs e) - { - mod_dettaglioIntervento1.Visible = false; - mod_elencoRichieste1.resetSelezione(); - } - /// - /// resetto selezione, nascondo dettaglio - /// - /// - /// - void mod_elencoRichieste1_eh_resetSelezione(object sender, EventArgs e) - { - mod_dettaglioIntervento1.Visible = false; } /// /// selezione effettuata, mostro dettaglio @@ -38,7 +17,6 @@ public partial class elencoRichieste : System.Web.UI.Page /// void mod_elencoRichieste1_eh_selValore(object sender, EventArgs e) { - mod_dettaglioIntervento1.Visible = true; - mod_dettaglioIntervento1.doUpdate(); + Response.Redirect("dettaglioIntervento.aspx"); } } diff --git a/WebSites/WebGIM/mod_dataOra.ascx.cs b/WebSites/WebGIM/mod_dataOra.ascx.cs index 9616fef..0d2441c 100644 --- a/WebSites/WebGIM/mod_dataOra.ascx.cs +++ b/WebSites/WebGIM/mod_dataOra.ascx.cs @@ -121,22 +121,6 @@ public partial class mod_dataOra : System.Web.UI.UserControl { return user_std.UtSn.Traduci(lemma.ToString()); } -#if false - /// - /// definisce se siano visibili e selezionabili i secondi - /// - public bool showSeconds - { - get - { - return _showSeconds; - } - set - { - _showSeconds = value; - } - } -#endif /// /// scelta del tipo di selettore per ora/min/sec /// diff --git a/WebSites/WebGIM/mod_dettaglioIntervento.ascx b/WebSites/WebGIM/mod_dettaglioIntervento.ascx index 72045c4..4779397 100644 --- a/WebSites/WebGIM/mod_dettaglioIntervento.ascx +++ b/WebSites/WebGIM/mod_dettaglioIntervento.ascx @@ -5,7 +5,8 @@
- + +
diff --git a/WebSites/WebGIM/mod_dettaglioIntervento.ascx.cs b/WebSites/WebGIM/mod_dettaglioIntervento.ascx.cs index f821f5c..a028989 100644 --- a/WebSites/WebGIM/mod_dettaglioIntervento.ascx.cs +++ b/WebSites/WebGIM/mod_dettaglioIntervento.ascx.cs @@ -37,7 +37,8 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl ///
private void traduciObj() { - btnChiudi.Text = traduci("btnChiudi"); + btnElenco.Text = traduci("btnElencoRichiesteMtz"); + btnCancel.Text = traduci("btnCancel"); btnCompilaMtz.Text = traduci("btnCompilaMtz"); btnEditFull.Text = traduci("btnEditFull"); } @@ -84,10 +85,22 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl /// /// /// - protected void btnChiudi_Click(object sender, EventArgs e) + protected void btnCancel_Click(object sender, EventArgs e) { frmView_default.ChangeMode(FormViewMode.ReadOnly); frmView_default.Visible = true; frmView_full.Visible = false; } + /// + /// chiude la parte di editing + /// + /// + /// + protected void btnElenco_Click(object sender, EventArgs e) + { + if (eh_chiudi != null) + { + eh_chiudi(this, new EventArgs()); + } + } } diff --git a/WebSites/WebGIM/mod_elencoRichieste.ascx b/WebSites/WebGIM/mod_elencoRichieste.ascx index 4e5cffb..1d7f274 100644 --- a/WebSites/WebGIM/mod_elencoRichieste.ascx +++ b/WebSites/WebGIM/mod_elencoRichieste.ascx @@ -7,8 +7,7 @@
+ DataKeyNames="numIntMtz" DataSourceID="ods" OnRowDataBound="grView_RowDataBound" > diff --git a/WebSites/WebGIM/mod_elencoRichieste.ascx.cs b/WebSites/WebGIM/mod_elencoRichieste.ascx.cs index 9e74f19..4fbda0d 100644 --- a/WebSites/WebGIM/mod_elencoRichieste.ascx.cs +++ b/WebSites/WebGIM/mod_elencoRichieste.ascx.cs @@ -91,7 +91,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // salvo in session il valore selezionato... - SteamWare.memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue); + SteamWare.memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue,true); // sollevo evento nuovo valore... if (eh_selValore != null) { @@ -200,38 +200,6 @@ public partial class mod_elencoRichieste : ApplicationUserControl } } /// - /// in caso di aggiornamento verifico se sia salvato un comando clona... - /// - /// - /// - protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e) - { - // carico l'idx dell'oggetto - int _idx = Convert.ToInt32(e.Keys["numIntMtz"]); - string _comando = ""; - if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand")) - { - _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand"); - SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); - } - // verifico il tipo di richiesta (up/down level, clona o update normale - switch (_comando) - { - case "clonaObj": -#if false - TA_app.obj.taImpianti.sp_clonaImpianto(_idx); - grView.EditIndex = -1; - grView.DataBind(); -#endif - // blocco update! - e.Cancel = true; - break; - default: - // faccio update! - break; - } - } - /// /// formatta il tooltip del ferma dalle... /// /// diff --git a/WebSites/WebGIM/mod_selettore.ascx.cs b/WebSites/WebGIM/mod_selettore.ascx.cs index 847fa2a..fddd689 100644 --- a/WebSites/WebGIM/mod_selettore.ascx.cs +++ b/WebSites/WebGIM/mod_selettore.ascx.cs @@ -223,27 +223,6 @@ public partial class mod_selettore : ApplicationUserControl grView.PageIndex = 0; grView.DataBind(); } -#if false - else if (_tipoSelettore == tipoSelettore.utentiAD_All || _tipoSelettore == tipoSelettore.utentiAD_cdc) - { - // verifico se sia o meno checked "solo cdc utente"... - if (chkOpzione.Checked) - { - //imposto nuovo tipo selettore - _tipoSelettore = tipoSelettore.utentiAD_cdc; - fixOds(); - } - else - { - //imposto nuovo tipo selettore - _tipoSelettore = tipoSelettore.utentiAD_All; - fixOds(); - } - // faccio databind... - grView.PageIndex = 0; - grView.DataBind(); - } -#endif } /// /// sistemazione fonte ods...