diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index eb2f1a2..4e86c05 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_consegne.ascx b/WebSCR/WebUserControls/mod_consegne.ascx index bab95c4..7f6541c 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx +++ b/WebSCR/WebUserControls/mod_consegne.ascx @@ -1,8 +1,141 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_consegne.ascx.cs" Inherits="WebSCR.WebUserControls.mod_consegne" %> Consegne: prevede

- +

- 2) vedere impegni (di oggi)

+ 2) vedere impegni (di oggi) +

- 3) possibilità di cliccare "inizio", "fine", mostra Allegati, carica foto (allegati) ad ogni TASK

+ 3) possibilità di cliccare "inizio", "fine", mostra Allegati, carica foto (allegati) ad ogni TASK +

+
+ + + + + + + + + + + + + + Nessun risultato + + + + +
+
+ + +
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +   +   + + +
+
+
+ + + + +
+ +
+ + + + + + + + + + + + + +
+ +
+ <%-- + + + --%> +
+ +
+ +
+ + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + +
+ +
+ + + + + + <%--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_consegne.ascx.cs b/WebSCR/WebUserControls/mod_consegne.ascx.cs index 5a2a829..e2d6d18 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx.cs +++ b/WebSCR/WebUserControls/mod_consegne.ascx.cs @@ -1,9 +1,11 @@ -using System; +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 { @@ -13,5 +15,60 @@ namespace WebSCR.WebUserControls { } + /// + /// verifica se valore passato è NON NULLO + /// + /// + /// + public bool notNull(object dataInizio) + { + bool answ = false; + try + { + answ = dataInizio.ToString() != ""; + } + catch + { } + return answ; + } + protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) + { + // salvo il command argument... + lastCmd = e.CommandArgument.ToString(); + } + /// + /// ultimo comando letto da link button + /// + public string lastCmd { get; set; } + /// + /// evento selezione paziente... + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // recupero dati paziente... + int IdxImpegno = 0; + DS_Applicazione.ImpegniRow riga;// = DtProxy.man.taImp.GetData()[0]; + try + { + IdxImpegno = Convert.ToInt32(grView.SelectedDataKey["IdxImpegno"]); + memLayer.ML.setSessionVal("IdxImpegno", IdxImpegno); + riga = DtProxy.man.taImp.getByKey(IdxImpegno)[0]; + memLayer.ML.setSessionVal("Cliente", string.Format("{0}", riga.RagSoc)); + memLayer.ML.setSessionVal("CodCliente", riga.CodCliente); + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Errore in rimando clienti --> interventi: {0}{1}", Environment.NewLine, exc)); + riga = DtProxy.man.taImp.GetData()[0]; + } + + //if (lastCmd == "select") + //{ + // mando su PIANIFICAZIONE intervento cliente! + Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", "Pianificazione", riga.CodCliente, riga.Indir, riga.DataOra, IdxImpegno)); + //} + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_consegne.ascx.designer.cs b/WebSCR/WebUserControls/mod_consegne.ascx.designer.cs index 95f5e5c..63d07ea 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_consegne.ascx.designer.cs @@ -3,15 +3,31 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace WebSCR.WebUserControls -{ - - - public partial class mod_consegne - { +namespace WebSCR.WebUserControls { + + + public partial class mod_consegne { + + /// + /// 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_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index 73fcec5..bc1fbb3 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -252,6 +252,10 @@ namespace WebSCR.WebUserControls protected void lbtResetSquadra_Click(object sender, EventArgs e) { memLayer.ML.emptyCookieVal("colorSquadraCurr"); + memLayer.ML.emptyCookieVal("SquadraCurr"); + memLayer.ML.emptyCookieVal("CodSquadra"); + memLayer.ML.emptyCookieVal("DataRif"); + memLayer.ML.emptyCookieVal("NumGg"); Response.Redirect(devicesAuthProxy.pagCorrente); } } diff --git a/WebSCR/WebUserControls/mod_squadre.ascx.cs b/WebSCR/WebUserControls/mod_squadre.ascx.cs index b58e5ba..1143126 100644 --- a/WebSCR/WebUserControls/mod_squadre.ascx.cs +++ b/WebSCR/WebUserControls/mod_squadre.ascx.cs @@ -44,6 +44,11 @@ namespace WebSCR.WebUserControls { DS_Applicazione.AnagSquadreRow riga = DtProxy.man.taAS.getByKey(codSquadra)[0]; memLayer.ML.setCookieVal(cookieName, riga.CssColor, DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); + memLayer.ML.setCookieVal("CodSquadra", riga.CodSquadra, DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); + memLayer.ML.setCookieVal("SquadraCurr", riga.DescrSquadra, DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); + memLayer.ML.setCookieVal("DataRif", DateTime.Now.ToString("yyyy-MM-dd"), DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); + memLayer.ML.setCookieVal("NumGg", "2", DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); + // ricarico! Response.Redirect(devicesAuthProxy.pagCorrente); } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index a0477df..f3b4304 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 654964c..e84f8d6 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 d80304e..429b5e7 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 47eb24e..a2c8a1e 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 654964c..e84f8d6 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 a0477df..f3b4304 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 d80304e..429b5e7 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 0443dd8..b06aba2 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 d80304e..429b5e7 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ