diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 0923c40..5e0bf9f 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index cde309d..9655324 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index cde309d..9655324 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx b/WebSCR/WebUserControls/mod_fileUpload.ascx index 0c931d6..5477cb8 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx @@ -1,8 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="WebSCR.WebUserControls.mod_fileUpload" %> -
- Mostra Allegati +
+ <%: numAllegati %> Allegati
diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs index cec4e56..a809d35 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs @@ -55,6 +55,22 @@ namespace WebSCR.WebUserControls { grView.DataBind(); } + + public int numAllegati + { + get + { + int answ = 0; + try + { + answ = DtProxy.man.taFile.getByImpegno(memLayer.ML.QSI("idxImpegno")).Rows.Count; + } + catch + { } + return answ; + } + } + protected void Upload(object sender, EventArgs e) { string filename = Path.GetFileName(FileUpload1.PostedFile.FileName); diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index fc5caf1..98382ee 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -401,16 +401,6 @@ namespace WebSCR.WebUserControls refreshDetail(); mod_giornata.doUpdate(); -#if false - // 2016.02.03 semplificato udpate a SOLO disp periodo (zona) - // faccio udpate SOLO SE è variata la zona... - if (mod_dispPeriodo.Zona != mod_filtroZona.Zona) - { - mod_dispPeriodo.Zona = mod_filtroZona.Zona; - mod_dispPeriodo.doUpdate(); - } - -#endif } /// /// refresh detail diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 64b7b2b..6436609 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ