diff --git a/Projects/WebGIM/WebGIM.suo b/Projects/WebGIM/WebGIM.suo index 244c2b5..3b1174b 100644 Binary files a/Projects/WebGIM/WebGIM.suo and b/Projects/WebGIM/WebGIM.suo differ diff --git a/Projects/WebGIM/WebGIM/Release/WebGIM.msi b/Projects/WebGIM/WebGIM/Release/WebGIM.msi index 632928e..bdcf3da 100644 Binary files a/Projects/WebGIM/WebGIM/Release/WebGIM.msi and b/Projects/WebGIM/WebGIM/Release/WebGIM.msi differ diff --git a/Projects/WebGIM/WebGIM/WebGIM.vdproj b/Projects/WebGIM/WebGIM/WebGIM.vdproj index 1724369..efa3c66 100644 --- a/Projects/WebGIM/WebGIM/WebGIM.vdproj +++ b/Projects/WebGIM/WebGIM/WebGIM.vdproj @@ -351,14 +351,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:WebGIM" - "ProductCode" = "8:{0D715AAA-D39E-4ADF-918F-6D0B3031287C}" - "PackageCode" = "8:{3206BEAE-EF15-40D3-9071-16386D188865}" + "ProductCode" = "8:{73953B2F-E364-409C-AB0C-F74243EF66A9}" + "PackageCode" = "8:{9FFF8FD1-7C4E-46B7-8DAC-D80D006A299D}" "UpgradeCode" = "8:{7739196B-46A3-4BC7-AC29-DB8493976F04}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.9.71" + "ProductVersion" = "8:0.9.73" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:035-460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/WebSites/WebGIM/App_Code/DS_applicazione.xss b/WebSites/WebGIM/App_Code/DS_applicazione.xss index 8a23082..d2dfc88 100644 --- a/WebSites/WebGIM/App_Code/DS_applicazione.xss +++ b/WebSites/WebGIM/App_Code/DS_applicazione.xss @@ -20,7 +20,7 @@ - + diff --git a/WebSites/WebGIM/Bin/SteamWare.dll b/WebSites/WebGIM/Bin/SteamWare.dll index 4ab77d8..fbf9e05 100644 Binary files a/WebSites/WebGIM/Bin/SteamWare.dll and b/WebSites/WebGIM/Bin/SteamWare.dll differ diff --git a/WebSites/WebGIM/calendChiusura.aspx b/WebSites/WebGIM/calendChiusura.aspx index 4c0dc1e..3d17cb8 100644 --- a/WebSites/WebGIM/calendChiusura.aspx +++ b/WebSites/WebGIM/calendChiusura.aspx @@ -1,5 +1,11 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="calendChiusura.aspx.cs" Inherits="calendChiusura" %> +<%@ Register src="mod_calChiusura.ascx" tagname="mod_calChiusura" tagprefix="uc1" %> + +<%@ Register src="mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %> + + + diff --git a/WebSites/WebGIM/mod_calChiusura.ascx b/WebSites/WebGIM/mod_calChiusura.ascx new file mode 100644 index 0000000..ee897b5 --- /dev/null +++ b/WebSites/WebGIM/mod_calChiusura.ascx @@ -0,0 +1,94 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_calChiusura.ascx.cs" + Inherits="mod_calChiusura" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebSites/WebGIM/mod_calChiusura.ascx.cs b/WebSites/WebGIM/mod_calChiusura.ascx.cs new file mode 100644 index 0000000..8752fb0 --- /dev/null +++ b/WebSites/WebGIM/mod_calChiusura.ascx.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +public partial class mod_calChiusura : ApplicationUserControl +{ + public event EventHandler eh_resetSelezione; + + protected override void Page_Load(object sender, EventArgs e) + { + base.Page_Load(sender, e); + grView.PageSize = _righeDataGridMed; + } + + /// + /// gestione evento inserimento nuovo record standard (se ZERO presenti) + /// + /// + /// + protected void btnNewFromEmpty_Click(object sender, EventArgs e) + { + // reset selezione... + resetSelezione(); + // i primi valori ("0") di default sono "ND"... li inserisco come standard... + TA_app.obj.taCalFF.Insert(DateTime.Now.Date, "-- [NUOVO] non definito --"); + grView.DataBind(); + } + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } + } + /// + /// evento dati associati a controllo + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } +} diff --git a/WebSites/WebGIM/mod_menuBottom.ascx b/WebSites/WebGIM/mod_menuBottom.ascx index a7b5e1d..c3179d0 100644 --- a/WebSites/WebGIM/mod_menuBottom.ascx +++ b/WebSites/WebGIM/mod_menuBottom.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_menuBottom.ascx.cs" Inherits="mod_menuBottom" %> -72 - +73 -