diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index 888a03f..6c4e230 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs
index 7d6787b..a4b33df 100644
--- a/VersGen/WebSC.cs
+++ b/VersGen/WebSC.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.0.091.306")]
-[assembly: AssemblyFileVersion("2.0.091.306")]
+[assembly: AssemblyVersion("2.0.093.307")]
+[assembly: AssemblyFileVersion("2.0.093.307")]
[assembly: AssemblyCopyright("Steamware © 2015-2016")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt
index 4b2b929..08755d2 100644
--- a/VersGen/WebSC.tt
+++ b/VersGen/WebSC.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.0.091.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.0.091.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.0.093.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.0.093.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll
index b352c77..166adc8 100644
Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ
diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx
index d0628c1..609b5fb 100644
--- a/WebSCR/WebUserControls/mod_dettInt.ascx
+++ b/WebSCR/WebUserControls/mod_dettInt.ascx
@@ -4,7 +4,7 @@
diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs
index a180ea0..7a09c92 100644
--- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs
+++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs
@@ -93,8 +93,7 @@ namespace WebSCR.WebUserControls
}
protected void Page_Load(object sender, EventArgs e)
{
- lblWarning.Visible = false;
- lbAdd.DataBind();
+ doUpdate();
}
///
/// aggiunge il task corrente all'elenco dei task...
@@ -122,6 +121,33 @@ namespace WebSCR.WebUserControls
}
}
///
+ /// verifica se si possano agigungere dati: ha patricola (OP) e l'intervento ha il record usato si/no compilato
+ ///
+ public bool canAddData
+ {
+ get
+ {
+ return hasMatricola && isRitUsOk;
+ }
+ }
+ ///
+ /// verifica se il record sia OK x ritiro usato...
+ ///
+ public bool isRitUsOk
+ {
+ get
+ {
+ bool answ = false;
+ try
+ {
+ answ = DtProxy.man.taImp.getByKey(idxImpegno)[0].RitUsato >= 0;
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+ ///
/// verifica se ci sia matricola in sessione
///
public bool hasMatricola
@@ -198,6 +224,8 @@ namespace WebSCR.WebUserControls
}
public void doUpdate()
{
+ lblWarning.Visible = false;
+ lbAdd.DataBind();
grViewDettInt.DataBind();
}
protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e)
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx
index 5ddb410..059eb4b 100644
--- a/WebSCR/WebUserControls/mod_impegno.ascx
+++ b/WebSCR/WebUserControls/mod_impegno.ascx
@@ -265,7 +265,7 @@
-
+
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs
index d28dc93..2f062c1 100644
--- a/WebSCR/WebUserControls/mod_impegno.ascx.cs
+++ b/WebSCR/WebUserControls/mod_impegno.ascx.cs
@@ -175,5 +175,10 @@ namespace WebSCR.WebUserControls
{ }
return answ;
}
+
+ protected void odsImpegni_Updated(object sender, ObjectDataSourceStatusEventArgs e)
+ {
+ raiseEventUpd();
+ }
}
}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
index 00426f1..ff28d0f 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
@@ -45,6 +45,7 @@ namespace WebSCR.WebUserControls
mod_compSquadra.doUpdate();
mod_fileImpegno.doUpdate();
mod_fileUpload.doUpdate();
+ mod_dettInt.doUpdate();
}
private void Mod_impegno_eh_errUpd(object sender, EventArgs e)
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index 1354ae0..8a6c961 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ