diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index ca73c70..5db7709 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/Content/themes/base/images/ajax-loader.gif b/WebSCR/Content/themes/base/images/ajax-loader.gif new file mode 100644 index 0000000..57f5624 Binary files /dev/null and b/WebSCR/Content/themes/base/images/ajax-loader.gif differ diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index f3705e9..38e41aa 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -328,6 +328,7 @@ Style.css + WebSCR.less @@ -371,6 +372,7 @@ + @@ -543,6 +545,13 @@ mod_AssSquadra.ascx + + mod_compSquadra.ascx + ASPXCodeBehind + + + mod_compSquadra.ascx + mod_consegne.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx b/WebSCR/WebUserControls/mod_AssSquadra.ascx index 5a9eea3..ec7f444 100644 --- a/WebSCR/WebUserControls/mod_AssSquadra.ascx +++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx @@ -39,7 +39,7 @@ - Nessun record + Nessun componente squadra assegnato diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx b/WebSCR/WebUserControls/mod_compSquadra.ascx new file mode 100644 index 0000000..d586092 --- /dev/null +++ b/WebSCR/WebUserControls/mod_compSquadra.ascx @@ -0,0 +1,38 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_compSquadra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_compSquadra" %> + +
+
+
+ + + + + + + + + + + + + + Nessun componente squadra assegnato + + + <%----%> + + + + + + + + <%----%> + + <%----%> + + + +
+
+
diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx.cs b/WebSCR/WebUserControls/mod_compSquadra.ascx.cs new file mode 100644 index 0000000..126fc45 --- /dev/null +++ b/WebSCR/WebUserControls/mod_compSquadra.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace WebSCR.WebUserControls +{ + public partial class mod_compSquadra : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx.designer.cs b/WebSCR/WebUserControls/mod_compSquadra.ascx.designer.cs new file mode 100644 index 0000000..1ae0b81 --- /dev/null +++ b/WebSCR/WebUserControls/mod_compSquadra.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// 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_compSquadra { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index 051b322..4822fd2 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -9,6 +9,8 @@ <%@ 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" %> +<%@ Register Src="~/WebUserControls/mod_compSquadra.ascx" TagPrefix="uc1" TagName="mod_compSquadra" %> + @@ -46,10 +48,11 @@
-
- +
+
+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 161d41e..487cbc8 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -5,6 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; +using WebSCR_data; namespace WebSCR.WebUserControls { @@ -79,6 +80,9 @@ namespace WebSCR.WebUserControls { if (qsVal("IdxImpegno") != "") { + // salvo parametri in sessione + saveSessParam(); + mod_impegno.Visible = true; mod_dettInt.Visible = true; mod_fileImpegno.Visible = true; @@ -90,6 +94,26 @@ namespace WebSCR.WebUserControls } } } + + private void saveSessParam() + { + // metto in sessione squadra sel + int idxImpegno = 0; + string CodSquadra = ""; + DateTime DataImp = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif")); + try + { + idxImpegno = Convert.ToInt32(qsVal("IdxImpegno")); + DS_Applicazione.ImpegniRow rigaImp = DtProxy.man.taImp.getByKey(idxImpegno)[0]; + CodSquadra = rigaImp.CodSquadra; + DataImp = rigaImp.DataOra; + } + catch + { } + memLayer.ML.setSessionVal("CodSquadra", CodSquadra); + memLayer.ML.setSessionVal("DataImp", DataImp); + } + /// /// nuovo record impegno... /// diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs index 5145959..d723b2b 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -75,6 +75,15 @@ namespace WebSCR.WebUserControls { /// protected global::WebSCR.WebUserControls.mod_dettInt mod_dettInt; + /// + /// mod_compSquadra control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_compSquadra mod_compSquadra; + /// /// mod_fileImpegno control. /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 13f4017..d58bda5 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 dcf20de..5d49220 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index bbfa439..8fb25d9 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 13f4017..d58bda5 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 bbfa439..8fb25d9 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 42fe019..9d4b2f2 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 bbfa439..8fb25d9 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ