diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 288706e..179428f 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index c8d73a2..4bf1164 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -36,6 +36,8 @@ + + diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 5cb99d5..963372a 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -383,6 +383,7 @@ + @@ -624,6 +625,13 @@ mod_enrollByJumperAuthKey.ascx + + mod_fileImpegno.ascx + ASPXCodeBehind + + + mod_fileImpegno.ascx + mod_fileUpload.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_fileImpegno.ascx b/WebSCR/WebUserControls/mod_fileImpegno.ascx new file mode 100644 index 0000000..98ece17 --- /dev/null +++ b/WebSCR/WebUserControls/mod_fileImpegno.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileImpegno.ascx.cs" Inherits="WebSCR.WebUserControls.mod_fileImpegno" %> + +
+ +
diff --git a/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs b/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs new file mode 100644 index 0000000..ffa1362 --- /dev/null +++ b/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs @@ -0,0 +1,67 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using WebSCR_data; + +namespace WebSCR.WebUserControls +{ + public partial class mod_fileImpegno : System.Web.UI.UserControl + { + /// + /// caricamento modulo + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + // leggo impegno + int IdxImpegno = 0; + try + { + IdxImpegno = Convert.ToInt32(qsVal("IdxImpegno")); + } + catch + { } + hlDoc.Text = "-"; + // recupero documento... + if (IdxImpegno > 0) + { + // cerco DOC... + DS_Applicazione.ImpegniRow riga =DtProxy.man.taImp.getByKey(IdxImpegno)[0]; + // se c'è documento... + if (riga.RifOC != "") + { + string tipoDoc = ""; + int numDoc = 0; + try + { + tipoDoc = riga.RifOC.Substring(0, 2); + numDoc = Convert.ToInt32(riga.RifOC.Replace(tipoDoc, "")); + } + catch + { } + if (numDoc > 0) + { + // imposto link del doc richiesto x download... + hlDoc.NavigateUrl = string.Format("{0}/{1:0000000}_{2}_{3:yyyy}.pdf", memLayer.ML.CRS("fileUploadFolder"), numDoc, tipoDoc, DateTime.Now); + hlDoc.Text = string.Format("{1}{0:0000000} ({2:yyyy})", numDoc, tipoDoc, DateTime.Now); + } + } + } + } + /// + /// recupera valore querystring + /// + /// + /// + protected string qsVal(string nome) + { + return memLayer.ML.QSS(nome); + } + + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_fileImpegno.ascx.designer.cs b/WebSCR/WebUserControls/mod_fileImpegno.ascx.designer.cs new file mode 100644 index 0000000..a3146c3 --- /dev/null +++ b/WebSCR/WebUserControls/mod_fileImpegno.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WebSCR.WebUserControls { + + + public partial class mod_fileImpegno { + + /// + /// hlDoc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlDoc; + } +} diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx b/WebSCR/WebUserControls/mod_fileUpload.ascx index b85a5fd..9c3a657 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="WebSCR.WebUserControls.mod_fileUpload" %>
- +
@@ -35,9 +35,7 @@ - - -
+
@@ -47,8 +45,8 @@
- - + +
diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs index cec741e..4c46235 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs @@ -16,6 +16,15 @@ namespace WebSCR.WebUserControls { public partial class mod_fileUpload : SteamWare.UserControl { + /// + /// abilita modifica/cancellazione allegati + /// + public bool enableMod { get; set; } + /// + /// caricamento pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) @@ -24,6 +33,7 @@ namespace WebSCR.WebUserControls grView.DataBind(); } divNewEdit.Visible = isWriteEnabled; + btnAdd.DataBind(); } protected void Upload(object sender, EventArgs e) { diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index 0f646ef..051b322 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -7,6 +7,10 @@ <%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %> <%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %> <%@ Register Src="~/WebUserControls/mod_selSquadre.ascx" TagPrefix="uc1" TagName="mod_selSquadre" %> +<%@ Register Src="~/WebUserControls/mod_fileImpegno.ascx" TagPrefix="uc1" TagName="mod_fileImpegno" %> +<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> + + @@ -24,17 +28,31 @@
-
+
-
+
-
-
- +
+
+
+
+ +
+
+ +
+
-
- +
+
+
+ +
+
+ +
+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 32afe4d..aa78d63 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -23,8 +23,6 @@ namespace WebSCR.WebUserControls mod_filtroZona.Zona = memLayer.ML.confReadString("zonaDef"); mod_filtroPeriodo.numGG = memLayer.ML.confReadInt("numGgDef"); // reimposto selezione squadre... - // !!!FARE!!! verifica - //mod_selSquadre.selezionaAttive(); mod_selSquadre.selezionaDaSession(); refreshDetail(); } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs index 952635b..5145959 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -74,5 +74,23 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::WebSCR.WebUserControls.mod_dettInt mod_dettInt; + + /// + /// mod_fileImpegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_fileImpegno mod_fileImpegno; + + /// + /// mod_fileUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_fileUpload mod_fileUpload; } } diff --git a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs index c1f674d..36d5683 100644 --- a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs +++ b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs @@ -40,12 +40,12 @@ namespace WebSCR.WebUserControls /// public void selezionaDaSession() { - // !!!FARE!!! NON FUNZIONA!!! + cblSquadre.DataBind(); if (memLayer.ML.isInSessionObject("elencoSquadre")) { foreach (ListItem item in cblSquadre.Items) { - if (memLayer.ML.isInSessionObject("elencoSquadre").ToString().IndexOf(item.Value) > 0) + if (memLayer.ML.StringSessionObj("elencoSquadre").ToString().IndexOf(item.Value) >= 0) item.Selected = true; } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 6168962..7cff1f2 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 7ec84dd..185d470 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR.dll.config b/WebSCR/bin/WebSCR.dll.config index c8d73a2..4bf1164 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -36,6 +36,8 @@ + + diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 94d8724..93c886b 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 6168962..7cff1f2 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 94d8724..93c886b 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index dbb5530..3cedefe 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 94d8724..93c886b 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ