--%>
+
+
@@ -235,9 +235,9 @@
-
-
+
+
-
-
+
+
diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs b/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs
index c8e0b73..804f80d 100644
--- a/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs
+++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs
@@ -74,6 +74,10 @@ namespace WebSCR.WebUserControls
{
e.InputParameters["UserMod"] = SteamWare.user_std.UtSn.userNameAD;
}
+ if (e.InputParameters["NoteGen"] == null)
+ {
+ e.InputParameters["NoteGen"] = "";
+ }
}
}
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx
index ae7669f..f18c750 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx
@@ -2,10 +2,13 @@
-<%@ Register Src="mod_selettoreIndirizzo.ascx" TagName="mod_selettoreIndirizzo" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_selettoreIndirizzo.ascx" TagName="mod_selettoreIndirizzo" TagPrefix="uc1" %>
-<%@ Register src="mod_selettoreSlot.ascx" tagname="mod_selettoreSlot" tagprefix="uc2" %>
+<%@ Register Src="~/WebUserControls/mod_selettoreSlot.ascx" TagName="mod_selettoreSlot" TagPrefix="uc2" %>
+<%@ Register Src="~/WebUserControls/mod_resocontoImpegni.ascx" TagName="mod_resocontoImpegni" TagPrefix="uc3" %>
+
+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
index 3b59aeb..bfe86d3 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
@@ -13,7 +13,18 @@ namespace WebSCR.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
fixVisibility();
+ if (!Page.IsPostBack)
+ {
+ mod_selettoreSlot1.numGG = memLayer.ML.confReadInt("numGgDef");
+ refreshDetail();
+ }
mod_selettoreIndirizzo1.eh_selIndir += mod_selettoreIndirizzo1_eh_selIndir;
+ mod_selettoreSlot1.eh_selData += mod_selettoreSlot1_eh_selData;
+ }
+
+ void mod_selettoreSlot1_eh_selData(object sender, EventArgs e)
+ {
+ refreshDetail();
}
///
/// recupera valore querystring
@@ -39,7 +50,7 @@ namespace WebSCR.WebUserControls
if (true)
{
// imposto zona...
- mod_selettoreSlot1.zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona;
+ mod_selettoreSlot1.Zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona;
mod_selettoreSlot1.Visible = true;
}
// vecchia modalità con selezione "Pre" dell'indirizzo...
@@ -54,7 +65,7 @@ namespace WebSCR.WebUserControls
if (qsVal("Indir") != "")
{
// imposto zona...
- mod_selettoreSlot1.zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona;
+ mod_selettoreSlot1.Zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona;
mod_selettoreSlot1.Visible = true;
}
else
@@ -71,9 +82,15 @@ namespace WebSCR.WebUserControls
///
void mod_selettoreIndirizzo1_eh_selIndir(object sender, EventArgs e)
{
-#if false
- Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}", Request.QueryString["CodCliente"], mod_selettoreIndirizzo1.selAddr.selBtn));
-#endif
+ refreshDetail();
+ }
+
+ private void refreshDetail()
+ {
+ mod_resocontoImpegni1.DataFrom = mod_selettoreSlot1.dataFrom.ToString("yyyy-MM-dd");
+ mod_resocontoImpegni1.NumGG = mod_selettoreSlot1.numGG.ToString();
+ mod_resocontoImpegni1.Zona = mod_selettoreSlot1.Zona;
+ mod_resocontoImpegni1.doUpdate();
}
}
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
index f47918f..9d82415 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
@@ -29,5 +29,14 @@ namespace WebSCR.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::WebSCR.WebUserControls.mod_selettoreSlot mod_selettoreSlot1;
+
+ ///
+ /// mod_resocontoImpegni1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_resocontoImpegni mod_resocontoImpegni1;
}
}
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
index 79cbbed..6f8ecf7 100644
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
+++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx
@@ -1,10 +1,14 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_resocontoImpegni.ascx.cs" Inherits="WebSCR.WebUserControls.mod_resocontoImpegni" %>
-<%@ Register Src="~/WebUserControls/mod_schedaGiorno.ascx" TagPrefix="uc1" TagName="mod_schedaGiorno" %>
-<%@ Register Src="~/WebUserControls/mod_dettImpegno.ascx" TagPrefix="uc1" TagName="mod_dettImpegno" %>
+
+<%@ Register Src="~/WebUserControls/mod_schedaGiorno.ascx" TagPrefix="uc4" TagName="mod_schedaGiorno" %>
+<%@ Register Src="~/WebUserControls/mod_dettImpegno.ascx" TagPrefix="uc5" TagName="mod_dettImpegno" %>
+
+
+
@@ -23,15 +27,15 @@
-
-
+
+
-
-
+
+
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs
index 4bb66be..98421a1 100644
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs
+++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs
@@ -114,5 +114,47 @@ namespace WebSCR.WebUserControls
{
repSlot.DataBind();
}
+ ///
+ /// campo (nascosto) data from
+ ///
+ public string DataFrom
+ {
+ get
+ {
+ return lblDataFrom.Text;
+ }
+ set
+ {
+ lblDataFrom.Text = value;
+ }
+ }
+ ///
+ /// campo (nascosto) data from
+ ///
+ public string Zona
+ {
+ get
+ {
+ return lblZona.Text;
+ }
+ set
+ {
+ lblZona.Text = value;
+ }
+ }
+ ///
+ /// campo (nascosto) data from
+ ///
+ public string NumGG
+ {
+ get
+ {
+ return lblNumGG.Text;
+ }
+ set
+ {
+ lblNumGG.Text = value;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs
index 3813bb3..49f7cc0 100644
--- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs
@@ -12,6 +12,33 @@ namespace WebSCR.WebUserControls {
public partial class mod_resocontoImpegni {
+ ///
+ /// lblDataFrom control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox lblDataFrom;
+
+ ///
+ /// lblNumGG control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox lblNumGG;
+
+ ///
+ /// lblZona control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblZona;
+
///
/// repSlot control.
///
diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx b/WebSCR/WebUserControls/mod_selettoreSlot.ascx
index 622fda8..cc5a290 100644
--- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx
+++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx
@@ -1,6 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreSlot.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreSlot" %>
-<%@ Register src="mod_resocontoImpegni.ascx" tagname="mod_resocontoImpegni" tagprefix="uc1" %>
-