diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index b3e321a..d147ba0 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 02c7366..587d6b4 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 6481839..1cfeb55 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.066.288")] -[assembly: AssemblyFileVersion("1.9.066.288")] +[assembly: AssemblyVersion("2.0.067.294")] +[assembly: AssemblyFileVersion("2.0.067.294")] [assembly: AssemblyCopyright("Steamware © 2015-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 7ce7e3e..e8760ac 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.066.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.9.066.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.067.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.067.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 901232d..15a201d 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 832a650..33b58c7 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index 443b2aa..fd51c66 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache b/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache index 3bca980..6a3ff77 100644 Binary files a/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache and b/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index 901232d..15a201d 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 6225ce5..d14462d 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 832a650..33b58c7 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_filtroPeriodo.ascx b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx index 76d6706..97c7457 100644 --- a/WebSCR/WebUserControls/mod_filtroPeriodo.ascx +++ b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx @@ -3,10 +3,8 @@
-
+
-
-
diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx b/WebSCR/WebUserControls/mod_filtroZona.ascx index cc99f1e..575f6db 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx @@ -1,20 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_filtroZona.ascx.cs" Inherits="WebSCR.WebUserControls.mod_filtroZona" %> -
-
+
+
-
- - -
- -
-
-
+
+
+
-
- +
+ @@ -23,4 +18,9 @@
+
+ +
+ +
diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs index 370567f..e6d5c11 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs @@ -28,20 +28,27 @@ namespace WebSCR.WebUserControls { if (!Page.IsPostBack) { - if (memLayer.ML.isInSessionObject("currDoc")) - { - txtCerca.Text = memLayer.ML.StringSessionObj("currDoc"); - ddlAnno.DataBind(); - // salvo anno.. - memLayer.ML.setSessionVal("yearSel", ddlAnno.SelectedValue); - refreshSearch(); - } - else - { - lblCliente.Text = ""; - lblIndirizzo.Text = ""; - lblZona.Text = ""; - } + doUpdate(); + } + } + /// + /// forza Update + /// + public void doUpdate() + { + txtCerca.Text = memLayer.ML.StringSessionObj("currDoc"); + if (memLayer.ML.isInSessionObject("currDoc")) + { + ddlAnno.DataBind(); + // salvo anno.. + memLayer.ML.setSessionVal("yearSel", ddlAnno.SelectedValue); + refreshSearch(); + } + else + { + lblCliente.Text = ""; + lblIndirizzo.Text = ""; + lblZona.Text = ""; } } diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs index 06220e3..a281f13 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs @@ -21,24 +21,6 @@ namespace WebSCR.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblCliente; - /// - /// 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; - - /// - /// lblIndirizzo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblIndirizzo; - /// /// txtCerca control. /// @@ -48,6 +30,15 @@ namespace WebSCR.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtCerca; + /// + /// rfvDoc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvDoc; + /// /// ddlAnno control. /// @@ -65,5 +56,23 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsAnno; + + /// + /// 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; + + /// + /// lblIndirizzo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblIndirizzo; } } diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index 143f484..b9722af 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -13,7 +13,6 @@ -
+ /// anno selezionato + /// + public string errMessGiorn + { + set + { + memLayer.ML.setSessionVal("errMessGiorn", value); + + } + } + /// /// evento selezione periodo inizio /// /// @@ -116,18 +127,43 @@ namespace WebSCR.WebUserControls // se ho 1 sola squadra selezionata... //if(rblSquadre.SelectedIndex >= 0) //if (mod_selSquadre.selected.Count == 1) + + // verifico di avere la squadra selezionata... if (memLayer.ML.StringSessionObj("elencoSquadre").Length > 0) { - // recupero OC se in sessione... - string doc = memLayer.ML.StringSessionObj("currDoc"); - if (doc == "") doc = "OC00000000"; - // prendo la squadra selezionata - //string squadra = mod_selSquadre.selected[0].ToString(); - string squadra = memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString(); - // selezionato periodo, salvo evento inizio... - DtProxy.man.taImp.insertQuery(e.Start, "INDIC", squadra, doc, yearSel); - // consumo il doc selezionato e quindi rimuovo da sessione... - memLayer.ML.emptySessionVal("currDoc"); + // verifico di avere MatrOP selezionata + if (memLayer.ML.isInSessionObject("matrOp")) + { + // verifico di avere DOC selezionato... + if (memLayer.ML.StringSessionObj("currDoc").Length > 0) + { + // recupero OC se in sessione... + string doc = memLayer.ML.StringSessionObj("currDoc"); + // tolto doc default a zero... + //if (doc == "") doc = "OC00000000"; + // prendo la squadra selezionata + //string squadra = mod_selSquadre.selected[0].ToString(); + string squadra = memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString(); + // selezionato periodo, salvo evento inizio... + DtProxy.man.taImp.insertQuery(e.Start, "INDIC", squadra, doc, yearSel); + // consumo il doc selezionato e quindi rimuovo da sessione... + memLayer.ML.emptySessionVal("currDoc"); + // rimuovo matrOp + memLayer.ML.emptySessionVal("matrOp"); + } + else + { + errMessGiorn = "Prego indicare coducmento OC/DC per procedere"; + } + } + else + { + errMessGiorn = "Prego indicare Matricola Operatore per procedere"; + } + } + else + { + errMessGiorn = "Prego selezionare UNA squadra per procedere"; } doUpdate(); } diff --git a/WebSCR/WebUserControls/mod_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx index dceb732..cd5826b 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx +++ b/WebSCR/WebUserControls/mod_impegno.ascx @@ -234,7 +234,7 @@
- + diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs index a3bc1fa..42ba16a 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx.cs +++ b/WebSCR/WebUserControls/mod_impegno.ascx.cs @@ -73,5 +73,10 @@ namespace WebSCR.WebUserControls e.InputParameters["NoteGen"] = ""; } } + + protected void odsImpegni_Deleted(object sender, ObjectDataSourceStatusEventArgs e) + { + Response.Redirect(SteamWare.devicesAuthProxy.pagCorrente); + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index fbe0f39..289f514 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -11,22 +11,24 @@ <%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> <%@ Register Src="~/WebUserControls/mod_compSquadra.ascx" TagPrefix="uc1" TagName="mod_compSquadra" %> - - - - - -
+
Ricerca per Documento
+
Matr. Operatore
+
+ + +
+
+
Ricerca per Periodo
-
+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 95ed51d..434b281 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -132,6 +132,17 @@ namespace WebSCR.WebUserControls memLayer.ML.setSessionVal("DataImp", DataImp); } + /// + /// anno selezionato + /// + public string errMessGiorn + { + get + { + return memLayer.ML.StringSessionObj("errMessGiorn"); + + } + } /// /// nuovo record impegno... /// @@ -176,6 +187,16 @@ namespace WebSCR.WebUserControls mod_dispPeriodo.doUpdate(); mod_impegno.doUpdate(); mod_dettInt.doUpdate(); + + // se è vuoto doc resetto... + if (!memLayer.ML.isInSessionObject("currDoc")) + { + mod_filtroZona.doUpdate(); + } + + // update matrOp... + txtMatrOp.Text = memLayer.ML.StringSessionObj("matrOp"); + txtMatrOp.DataBind(); } protected void lbLess_Click(object sender, EventArgs e) @@ -199,5 +220,37 @@ namespace WebSCR.WebUserControls Response.Redirect(devicesAuthProxy.pagCorrente); } } + /// + /// inserita matricola operatore + /// + /// + /// + protected void txtMatrOp_TextChanged(object sender, EventArgs e) + { + if (txtMatrOp.Text.Trim() != "") + { + memLayer.ML.setSessionVal("matrOp", txtMatrOp.Text.Trim()); + } + else + { + memLayer.ML.emptySessionVal("matrOp"); + } + } +#if false + /// + /// matricola oepratore selezionata + /// + protected string matrOp + { + get + { + return memLayer.ML.StringSessionObj("matrOp"); + } + set + { + memLayer.ML.setSessionVal("matrOp", value); + } + } +#endif } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs index 44c911f..8863b33 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -21,6 +21,24 @@ namespace WebSCR.WebUserControls { /// protected global::WebSCR.WebUserControls.mod_filtroZona mod_filtroZona; + /// + /// txtMatrOp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtMatrOp; + + /// + /// rfvDoc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvDoc; + /// /// mod_filtroPeriodo control. /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 7138664..b5dc05c 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 45d9d5a..159dc16 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 073b719..4ccbaa9 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 72f6575..b5dc05c 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 dfd47cf..4ccbaa9 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 e16b1f5..b179131 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 dfd47cf..4ccbaa9 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ