From f5b1a1e45e6eac2f55675b71a665ee2f9843382e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 4 Oct 2019 09:47:30 +0200 Subject: [PATCH] =?UTF-8?q?inizio=20fix=20edit=20attivit=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebUserControls/mod_commAttivita.ascx.cs | 17 ++--------------- GPW_Smart/attivitaIns.aspx | 17 ++++++----------- GPW_Smart/attivitaIns.aspx.cs | 14 ++++++-------- GPW_Smart/attivitaIns.aspx.designer.cs | 16 ++++++++-------- 4 files changed, 22 insertions(+), 42 deletions(-) diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs b/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs index 9eb9757..bc91a01 100644 --- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx.cs @@ -191,7 +191,7 @@ namespace GPW.WebUserControls DataProxy.DP.taRA.clonaRecord(idxRa); //update! setupPage(); - repRegAtt.DataBind(); + grView.DataBind(); } protected void lnkCreateNew_Click(object sender, EventArgs e) { @@ -199,19 +199,6 @@ namespace GPW.WebUserControls // redirect! Response.Redirect("attivitaIns.aspx"); } -#if false - /// - /// aggiorno data selezionata! - /// - /// - /// - protected void calDataRif_SelectionChanged(object sender, EventArgs e) - { - dataRif = calDataRif.SelectedDate; - setupPage(); - repRegAtt.DataBind(); - } -#endif protected void txtData_TextChanged(object sender, EventArgs e) { @@ -219,7 +206,7 @@ namespace GPW.WebUserControls DateTime.TryParse(txtData.Text, out newData); dataRif = newData; setupPage(); - repRegAtt.DataBind(); + grView.DataBind(); } } } \ No newline at end of file diff --git a/GPW_Smart/attivitaIns.aspx b/GPW_Smart/attivitaIns.aspx index 1005618..521624a 100644 --- a/GPW_Smart/attivitaIns.aspx +++ b/GPW_Smart/attivitaIns.aspx @@ -1,12 +1,7 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/JQMob.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="attivitaIns.aspx.cs" Inherits="GPW_Smart.attivitaIns" %> -<%@ Register src="~/WebUserControls/mod_attivitaIns.ascx" tagname="mod_attivitaIns" tagprefix="uc1" %> - - - - - - - - - +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="attivitaIns.aspx.cs" Inherits="GPW_Smart.attivitaIns" %> +<%@ Register Src="~/WebUserControls/mod_attivitaIns.ascx" TagName="mod_attivitaIns" TagPrefix="uc1" %> + + + + diff --git a/GPW_Smart/attivitaIns.aspx.cs b/GPW_Smart/attivitaIns.aspx.cs index 9a6b62a..0651a4d 100644 --- a/GPW_Smart/attivitaIns.aspx.cs +++ b/GPW_Smart/attivitaIns.aspx.cs @@ -1,14 +1,12 @@ -using GPW.WebMasterPages; -using System; +using System; namespace GPW_Smart { - public partial class attivitaIns : System.Web.UI.Page + public partial class attivitaIns : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - ((JQMob)Master).showSettings = false; - ((JQMob)Master).showLeftPnl = false; - } + ((Site)Master).showSearch = false; } + } } \ No newline at end of file diff --git a/GPW_Smart/attivitaIns.aspx.designer.cs b/GPW_Smart/attivitaIns.aspx.designer.cs index a5acbce..2b090dd 100644 --- a/GPW_Smart/attivitaIns.aspx.designer.cs +++ b/GPW_Smart/attivitaIns.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace GPW_Smart { @@ -13,11 +13,11 @@ namespace GPW_Smart { public partial class attivitaIns { /// - /// mod_attivitaIns1 control. + /// Controllo mod_attivitaIns1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::GPW.WebUserControls.mod_attivitaIns mod_attivitaIns1; }