diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo
index f78a0a6..b27b46f 100644
Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj
index fa6ca05..b0bfc9e 100644
--- a/WebSCR/WebSCR.csproj
+++ b/WebSCR/WebSCR.csproj
@@ -364,7 +364,9 @@
+
+
@@ -598,6 +600,13 @@
mod_footer.ascx
+
+ mod_giornata.ascx
+ ASPXCodeBehind
+
+
+ mod_giornata.ascx
+
mod_header.ascx
ASPXCodeBehind
@@ -605,6 +614,13 @@
mod_header.ascx
+
+ mod_impegno.ascx
+ ASPXCodeBehind
+
+
+ mod_impegno.ascx
+
mod_Interventi.ascx
ASPXCodeBehind
diff --git a/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs b/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs
index ff13aa8..df3bc0b 100644
--- a/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs
+++ b/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs
@@ -31,14 +31,6 @@ namespace WebSCR.WebUserControls
protected string qsVal(string nome)
{
return memLayer.ML.QSS(nome);
- //string answ = "";
- //try
- //{
- // answ = Request.QueryString[nome].ToString();
- //}
- //catch
- //{ }
- //return answ;
}
///
/// esegue update componenti
@@ -130,8 +122,6 @@ namespace WebSCR.WebUserControls
{
LinkButton lb = (LinkButton)sender;
dataSel = Convert.ToDateTime(lb.CommandArgument);
-
- //Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel));
Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, qsVal("CodCliente"), qsVal("Indir"), dataSel));
}
}
diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx
new file mode 100644
index 0000000..756eda1
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_giornata.ascx
@@ -0,0 +1,60 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_giornata.ascx.cs" Inherits="WebSCR.WebUserControls.mod_giornata" %>
+<%@ Register Assembly="DayPilot" Namespace="DayPilot.Web.Ui" TagPrefix="DayPilot" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs
new file mode 100644
index 0000000..ff1c5a5
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs
@@ -0,0 +1,165 @@
+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_giornata : System.Web.UI.UserControl
+ {
+ public event EventHandler eh_newData;
+ ///
+ /// solleva evento selezione data
+ ///
+ protected void reportEvent()
+ {
+ // evento!
+ if (eh_newData != null)
+ {
+ eh_newData(this, new EventArgs());
+ }
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ lblCodCli.Text = Request.QueryString["CodCliente"];
+ if (qsVal("Data") != "")
+ {
+ data = Convert.ToDateTime(qsVal("Data"));
+ }
+ DayPilotCalendar1.TimeRangeSelected += DayPilotCalendar1_TimeRangeSelected;
+ DayPilotCalendar1.EventMove += DayPilotCalendar1_EventMove;
+ }
+ public string CodCliente
+ {
+ get
+ {
+ return qsVal("CodCliente");
+ }
+ }
+ public string Indir
+ {
+ get
+ {
+ return qsVal("Indir");
+ }
+ }
+ public string Data
+ {
+ get
+ {
+ return qsVal("Data");
+ }
+ }
+ ///
+ /// recupera valore querystring
+ ///
+ ///
+ ///
+ protected string qsVal(string nome)
+ {
+ string answ = "";
+ try
+ {
+ answ = Request.QueryString[nome].ToString();
+ }
+ catch
+ { }
+ return answ;
+ }
+ void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e)
+ {
+ // sposto evento!
+ DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart);
+ doUpdate();
+ }
+
+ ///
+ /// evento selezione periodo inizio
+ ///
+ ///
+ ///
+ void DayPilotCalendar1_TimeRangeSelected(object sender, DayPilot.Web.Ui.Events.TimeRangeSelectedEventArgs e)
+ {
+ // se ho squadra selezionata...
+ if (rblSquadre.SelectedIndex >= 0)
+ {
+ // recupero indirizzo e cliente !!FARE!!!
+ // selezionato periodo, salvo evento inizio...
+ DtProxy.man.taImp.insertQuery(e.Start, "INDIC", rblSquadre.SelectedValue, "OC00000000");
+ }
+ doUpdate();
+ }
+
+ private void doUpdate()
+ {
+ //ods.DataBind();
+ //rblSquadre.SelectedIndex = -1;
+ DayPilotCalendar1.DataBind();
+ DayPilotCalendar1.Update();
+ reportEvent();
+ }
+ ///
+ /// data di riferimento
+ ///
+ public DateTime data
+ {
+ get
+ {
+ DateTime answ = DateTime.Now;
+ try
+ {
+ answ = DayPilotCalendar1.StartDate;
+ }
+ catch
+ { }
+ return answ;
+ }
+ set
+ {
+ DayPilotCalendar1.StartDate = value;
+ lblData.Text = value.ToString("yyyy/MM/dd");
+ }
+ }
+ ///
+ /// selezione nuova squadra...
+ ///
+ ///
+ ///
+ protected void rblSquadre_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ // aggiorno controllo...
+ }
+
+ protected void btnAllSquadre_Click(object sender, EventArgs e)
+ {
+ // resetto sel rbl
+ rblSquadre.SelectedIndex = -1;
+ }
+ ///
+ /// intercetto e cambio classe CSS...
+ ///
+ ///
+ ///
+ protected void DayPilotCalendar1_BeforeEventRender(object sender, DayPilot.Web.Ui.Events.Calendar.BeforeEventRenderEventArgs e)
+ {
+ try
+ {
+ // this assumes your event object in Events collection has "color" field or property
+ e.BackgroundColor = (string)e.DataItem["CssColor"];
+ }
+ catch
+ { }
+ }
+
+ protected void DayPilotCalendar1_EventClick(object sender, DayPilot.Web.Ui.Events.EventClickEventArgs e)
+ {
+#if false
+ Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", devicesAuthProxy.pagCorrente, qsVal("CodCliente"), qsVal("Indir"), qsVal("Data"), e.Id));
+#endif
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.designer.cs b/WebSCR/WebUserControls/mod_giornata.ascx.designer.cs
new file mode 100644
index 0000000..39e3e9c
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_giornata.ascx.designer.cs
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+//
+// 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_giornata {
+
+ ///
+ /// lblCodCli control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblCodCli;
+
+ ///
+ /// lblData control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblData;
+
+ ///
+ /// btnAllSquadre control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnAllSquadre;
+
+ ///
+ /// rblSquadre control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.RadioButtonList rblSquadre;
+
+ ///
+ /// odsSquadre control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsSquadre;
+
+ ///
+ /// DayPilotCalendar1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::DayPilot.Web.Ui.DayPilotCalendar DayPilotCalendar1;
+
+ ///
+ /// 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_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx
new file mode 100644
index 0000000..077afe1
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_impegno.ascx
@@ -0,0 +1,2 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_impegno.ascx.cs" Inherits="WebSCR.WebUserControls.mod_impegno" %>
+IMPEGNO
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs
new file mode 100644
index 0000000..93c96da
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_impegno.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_impegno : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.designer.cs b/WebSCR/WebUserControls/mod_impegno.ascx.designer.cs
new file mode 100644
index 0000000..d0cfeed
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_impegno.ascx.designer.cs
@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+//
+// 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_impegno
+ {
+ }
+}
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx
index 7ea02db..4a1007e 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx
@@ -1,9 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pianificazione.ascx.cs" Inherits="WebSCR.WebUserControls.mod_pianificazione" %>
-<%@ Register Src="~/WebUserControls/mod_resocontoImpegni.ascx" TagName="mod_resocontoImpegni" TagPrefix="uc3" %>
<%@ Register Src="~/WebUserControls/mod_filtroZona.ascx" TagPrefix="uc1" TagName="mod_filtroZona" %>
<%@ Register Src="~/WebUserControls/mod_filtroPeriodo.ascx" TagPrefix="uc1" TagName="mod_filtroPeriodo" %>
<%@ Register Src="~/WebUserControls/mod_dispPeriodo.ascx" TagPrefix="uc1" TagName="mod_dispPeriodo" %>
+<%@ Register Src="~/WebUserControls/mod_giornata.ascx" TagPrefix="uc1" TagName="mod_giornata" %>
+<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %>
@@ -16,7 +17,8 @@
-
+
+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
index 77f6e25..adec4c2 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
@@ -44,53 +44,15 @@ namespace WebSCR.WebUserControls
protected string qsVal(string nome)
{
return memLayer.ML.QSS(nome);
-#if false
- string answ = "";
- try
- {
- answ = Request.QueryString[nome].ToString();
- }
- catch
- { }
- return answ;
-#endif
}
///
/// imposta visibilità dato elementi già impostati
///
private void fixVisibility()
{
-#if false
- if (true)
- {
-#endif
// imposto zona...
mod_dispPeriodo.Zona = mod_filtroZona.Zona;
mod_filtroPeriodo.Visible = true;
-#if false
- }
- // vecchia modalità con selezione "Pre" dell'indirizzo...
- else
- {
- // controllo se c'è CodCliente
- if ((qsVal("CodCliente") != "") && memLayer.ML.isInSessionObject("CodCliente") && memLayer.ML.isInSessionObject("Cliente"))
- {
- mod_filtroZona.Visible = true;
- }
- // controllo se c'è indirizzo...
- if (qsVal("Indir") != "")
- {
- // imposto zona...
- mod_selettoreSlot1.Zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona;
- mod_selettoreSlot1.Visible = true;
- }
- else
- {
- mod_selettoreSlot1.Visible = false;
- }
- }
-#endif
-
}
///
/// evento selezione indirizzo, allora mostro il resto
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
index ec55bed..74f742e 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
@@ -40,12 +40,21 @@ namespace WebSCR.WebUserControls {
protected global::WebSCR.WebUserControls.mod_dispPeriodo mod_dispPeriodo;
///
- /// mod_resocontoImpegni1 control.
+ /// mod_giornata control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebSCR.WebUserControls.mod_resocontoImpegni mod_resocontoImpegni1;
+ protected global::WebSCR.WebUserControls.mod_giornata mod_giornata;
+
+ ///
+ /// mod_impegno control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_impegno mod_impegno;
}
}
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
index 8dec0e5..950e20a 100644
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
+++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
@@ -3,12 +3,5 @@
<%@ Register Src="~/WebUserControls/mod_schedaGiorno.ascx" TagPrefix="uc4" TagName="mod_schedaGiorno" %>
<%@ Register Src="~/WebUserControls/mod_dettImpegno.ascx" TagPrefix="uc5" TagName="mod_dettImpegno" %>
-<%----%>
+
+
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 3675ec2..436b81a 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 f5604e7..3b49c97 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 a2d5e50..b040b38 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 8ff62fa..ae73143 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 f441544..252c976 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 f5604e7..3b49c97 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 3675ec2..436b81a 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 a2d5e50..b040b38 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 e502791..cf3f3ef 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 a2d5e50..b040b38 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ