+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
index adec4c2..9b6a518 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
@@ -26,6 +26,11 @@ namespace WebSCR.WebUserControls
}
mod_filtroZona.eh_selIndir += mod_selettoreIndirizzo1_eh_selIndir;
mod_filtroPeriodo.eh_selData += mod_filtroPeriodo_eh_selData;
+ mod_dettInt.eh_update += mod_dettInt_eh_update;
+ }
+ void mod_dettInt_eh_update(object sender, EventArgs e)
+ {
+ refreshDetail();
}
///
/// evento selezione nuova data in filtro
@@ -50,9 +55,39 @@ namespace WebSCR.WebUserControls
///
private void fixVisibility()
{
- // imposto zona...
+ // imposto filtraggi zona...
mod_dispPeriodo.Zona = mod_filtroZona.Zona;
mod_filtroPeriodo.Visible = true;
+
+ // sistemo visibilità giornata/impegni
+ mod_giornata.eh_newData += mod_giornata_eh_newData;
+
+ mod_giornata.Visible = false;
+ mod_dettInt.Visible = false;
+ mod_impegno.Visible = false;
+ if (qsVal("Data") != "")
+ {
+ if (qsVal("IdxImpegno") != "")
+ {
+ mod_impegno.Visible = true;
+ mod_dettInt.Visible = true;
+ }
+ else
+ {
+ mod_giornata.Visible = true;
+ }
+ }
+ }
+ ///
+ /// nuovo record impegno...
+ ///
+ ///
+ ///
+ void mod_giornata_eh_newData(object sender, EventArgs e)
+ {
+ // FARE!!! spostamento di doUpdate();
+ //repSlot.DataBind();
+ refreshDetail();
}
///
/// evento selezione indirizzo, allora mostro il resto
@@ -70,6 +105,8 @@ namespace WebSCR.WebUserControls
mod_dispPeriodo.NumGG = mod_filtroPeriodo.numGG.ToString();
mod_dispPeriodo.Zona = mod_filtroZona.Zona;
mod_dispPeriodo.doUpdate();
+ mod_impegno.doUpdate();
+ mod_dettInt.doUpdate();
}
}
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
index 74f742e..a83ea77 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
@@ -56,5 +56,14 @@ namespace WebSCR.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::WebSCR.WebUserControls.mod_impegno mod_impegno;
+
+ ///
+ /// mod_dettInt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_dettInt mod_dettInt;
}
}
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
deleted file mode 100644
index 950e20a..0000000
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_resocontoImpegni.ascx.cs" Inherits="WebSCR.WebUserControls.mod_resocontoImpegni" %>
-
-<%@ 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/WebUserControls/mod_resocontoImpegni.ascx.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs
deleted file mode 100644
index 0f57d75..0000000
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using SteamWare;
-
-namespace WebSCR.WebUserControls
-{
- public partial class mod_resocontoImpegni : System.Web.UI.UserControl
- {
- ///
- /// avvio componente
- ///
- ///
- ///
- protected void Page_Load(object sender, EventArgs e)
- {
- mod_schedaGiorno.eh_newData += mod_schedaGiorno_eh_newData;
-
- mod_schedaGiorno.Visible = false;
- mod_dettImpegno.Visible = false;
- if (qsVal("Data") != "")
- {
- if (qsVal("IdxImpegno") != "")
- {
- mod_dettImpegno.Visible = true;
- }
- else
- {
- mod_schedaGiorno.Visible = true;
- }
- }
- }
- ///
- /// nuovo record impegno...
- ///
- ///
- ///
- void mod_schedaGiorno_eh_newData(object sender, EventArgs e)
- {
- // FARE!!! spostamento di doUpdate();
- //repSlot.DataBind();
- }
- ///
- /// recupera valore querystring
- ///
- ///
- ///
- protected string qsVal(string nome)
- {
- return memLayer.ML.QSS(nome);
- //string answ = "";
- //try
- //{
- // answ = Request.QueryString[nome].ToString();
- //}
- //catch
- //{ }
- //return answ;
- }
- }
-}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs
deleted file mode 100644
index 9e37b46..0000000
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// 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_resocontoImpegni {
-
- ///
- /// mod_schedaGiorno control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::WebSCR.WebUserControls.mod_schedaGiorno mod_schedaGiorno;
-
- ///
- /// mod_dettImpegno control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::WebSCR.WebUserControls.mod_dettImpegno mod_dettImpegno;
- }
-}
diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx b/WebSCR/WebUserControls/mod_schedaGiorno.ascx
deleted file mode 100644
index 4f029fd..0000000
--- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_schedaGiorno.ascx.cs" Inherits="WebSCR.WebUserControls.mod_schedaGiorno" %>
-<%@ Register Assembly="DayPilot" Namespace="DayPilot.Web.Ui" TagPrefix="DayPilot" %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs
deleted file mode 100644
index 76267d7..0000000
--- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-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_schedaGiorno : 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_schedaGiorno.ascx.designer.cs b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.designer.cs
deleted file mode 100644
index 05ac627..0000000
--- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.designer.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// 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_schedaGiorno {
-
- ///
- /// 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/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 436b81a..ba2278e 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 3b49c97..0cde18d 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 b040b38..e1ad286 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 ae73143..78b566a 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 252c976..bb42e48 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 3b49c97..0cde18d 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 436b81a..ba2278e 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 b040b38..e1ad286 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 cf3f3ef..e515d38 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 b040b38..e1ad286 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ