+
diff --git a/WebSCR/Squadra.aspx.cs b/WebSCR/Squadra.aspx.cs
index 0c4c176..39a0170 100644
--- a/WebSCR/Squadra.aspx.cs
+++ b/WebSCR/Squadra.aspx.cs
@@ -31,10 +31,12 @@ namespace WebSCR
mod_consegne.Visible = true;
mod_dettInt.Visible = false;
mod_ImpegnoSmall.Visible = false;
+ mod_gestIntSquadra.Visible = false;
if (qsVal("Data") != "")
{
if (qsVal("IdxImpegno") != "")
{
+ mod_gestIntSquadra.Visible = true;
mod_ImpegnoSmall.Visible = true;
mod_dettInt.Visible = true;
mod_consegne.Visible = false;
diff --git a/WebSCR/Squadra.aspx.designer.cs b/WebSCR/Squadra.aspx.designer.cs
index 63521ae..fcf6c8f 100644
--- a/WebSCR/Squadra.aspx.designer.cs
+++ b/WebSCR/Squadra.aspx.designer.cs
@@ -21,6 +21,15 @@ namespace WebSCR {
///
protected global::WebSCR.WebUserControls.mod_consegne mod_consegne;
+ ///
+ /// mod_gestIntSquadra control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_gestIntSquadra mod_gestIntSquadra;
+
///
/// mod_ImpegnoSmall control.
///
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj
index 47997ef..2025dc4 100644
--- a/WebSCR/WebSCR.csproj
+++ b/WebSCR/WebSCR.csproj
@@ -364,6 +364,7 @@
+
@@ -600,6 +601,13 @@
mod_footer.ascx
+
+ mod_gestIntSquadra.ascx
+ ASPXCodeBehind
+
+
+ mod_gestIntSquadra.ascx
+
mod_giornata.ascx
ASPXCodeBehind
diff --git a/WebSCR/WebUserControls/mod_consegne.ascx b/WebSCR/WebUserControls/mod_consegne.ascx
index 73c4c28..c362e75 100644
--- a/WebSCR/WebUserControls/mod_consegne.ascx
+++ b/WebSCR/WebUserControls/mod_consegne.ascx
@@ -1,8 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_consegne.ascx.cs" Inherits="WebSCR.WebUserControls.mod_consegne" %>
-
- 3) possibilità di cliccare "inizio", "fine", mostra Allegati, carica foto (allegati) ad ogni TASK
-
@@ -68,10 +65,6 @@
- <%--FilterExpression="CodSquadra LIKE '%{0}%' OR DescrSquadra LIKE '%{0}%' OR CodCliente LIKE '%{0}%' OR RagSoc LIKE '%{0}%' OR RifOC LIKE '%{0}%' "
-
-
- --%>
diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx
index ada35d1..6672605 100644
--- a/WebSCR/WebUserControls/mod_dettInt.ascx
+++ b/WebSCR/WebUserControls/mod_dettInt.ascx
@@ -20,7 +20,7 @@
- Nessun Task
+ Nessuna Attivià
diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx
new file mode 100644
index 0000000..ca10f11
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx
@@ -0,0 +1,10 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadra" %>
+
+
diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs
new file mode 100644
index 0000000..cb165e9
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using SteamWare;
+using WebSCR_data;
+
+namespace WebSCR.WebUserControls
+{
+ public partial class mod_gestIntSquadra : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ fixVisibility();
+ }
+ ///
+ /// sistemo visibilità buttons
+ ///
+ private void fixVisibility()
+ {
+ // verifico se impegno è iniziato o meno e di conseguenza mostro inizio/fine
+ int idxImpergno = 0;
+ try
+ {
+ idxImpergno = memLayer.ML.QSI("IdxImpegno");
+ }
+ catch
+ { }
+ if (idxImpergno > 0)
+ {
+ DS_Applicazione.ImpegniRow riga = DtProxy.man.taImp.getByKey(idxImpergno)[0];
+ bool iniziato = false;
+ bool finito = false;
+ try
+ {
+ if (riga.InizioInt != null)
+ {
+ iniziato = true;
+ }
+ }
+ catch
+ { }
+ try
+ {
+ if (riga.FineInt != null)
+ {
+ finito = true;
+ }
+ }
+ catch
+ { }
+ lbInizioInt.Visible = !iniziato;
+ lbFineInt.Visible = iniziato && !finito;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs
new file mode 100644
index 0000000..1fd0475
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+//
+// 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_gestIntSquadra {
+
+ ///
+ /// lbInizioInt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbInizioInt;
+
+ ///
+ /// lbFineInt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbFineInt;
+
+ ///
+ /// lbNoteInt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbNoteInt;
+
+ ///
+ /// lbFileInt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbFileInt;
+ }
+}
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs
index 859c558..a3bc1fa 100644
--- a/WebSCR/WebUserControls/mod_impegno.ascx.cs
+++ b/WebSCR/WebUserControls/mod_impegno.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -50,14 +51,7 @@ namespace WebSCR.WebUserControls
///
protected string qsVal(string nome)
{
- string answ = "";
- try
- {
- answ = Request.QueryString[nome].ToString();
- }
- catch
- { }
- return answ;
+ return memLayer.ML.QSS(nome);
}
///
/// recupero valori mancanti
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 8cee741..0e8907e 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 86e2c91..af3a143 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 1ba5cd0..34f5bdf 100644
Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ
diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 7f52589..c0fbb67 100644
Binary files a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache
index 2174973..13351cc 100644
Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ
diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll
index 86e2c91..af3a143 100644
Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index 8cee741..0e8907e 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 1ba5cd0..34f5bdf 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 98f699a..c51e860 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 1ba5cd0..34f5bdf 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ