diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index d147ba0..6fa401b 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/DataUploader/Web.config b/DataUploader/Web.config index 9c93831..6ce6f6c 100644 --- a/DataUploader/Web.config +++ b/DataUploader/Web.config @@ -8,6 +8,7 @@ + diff --git a/DataUploader/bin/DataUploader.dll.config b/DataUploader/bin/DataUploader.dll.config index 9c93831..6ce6f6c 100644 --- a/DataUploader/bin/DataUploader.dll.config +++ b/DataUploader/bin/DataUploader.dll.config @@ -8,6 +8,7 @@ + diff --git a/WebSCR/Pianificazione.aspx.cs b/WebSCR/Pianificazione.aspx.cs index 6273845..67f3982 100644 --- a/WebSCR/Pianificazione.aspx.cs +++ b/WebSCR/Pianificazione.aspx.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Web; using System.Web.UI; diff --git a/WebSCR/Properties/PublishProfiles/IIS02.pubxml b/WebSCR/Properties/PublishProfiles/IIS02.pubxml index 133bb47..0e78377 100644 --- a/WebSCR/Properties/PublishProfiles/IIS02.pubxml +++ b/WebSCR/Properties/PublishProfiles/IIS02.pubxml @@ -17,7 +17,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt False WMSVC True - steamwarewin\administrator + steamw\administrator <_SavePWD>True @@ -53,6 +53,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt + False True True False diff --git a/WebSCR/Properties/PublishProfiles/IIS02.pubxml.user b/WebSCR/Properties/PublishProfiles/IIS02.pubxml.user index f2acb18..fdf9202 100644 --- a/WebSCR/Properties/PublishProfiles/IIS02.pubxml.user +++ b/WebSCR/Properties/PublishProfiles/IIS02.pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAWrMOGKZ5+kG5PChtPELSKAAAAAACAAAAAAADZgAAwAAAABAAAADQqGyYdt8WVYiVevOHwQtrAAAAAASAAACgAAAAEAAAADa0EE6ZGibAVouh3p25mB4YAAAAM64tMTOGJ0cuNUUqtsZ6MStSH4RpeVk5FAAAALyd/yM2g5QR/onffXHWuHMCs+5/ + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA7gr2JUxpGk+kgETgdPCX3gAAAAACAAAAAAADZgAAwAAAABAAAAAcaNv8rWW21TzVz3OKj8mnAAAAAASAAACgAAAAEAAAAHItJ+1D4HCNvqgCJspNTsEYAAAAUyPc3cR2ToKbCtgrZjIBLAg3zdpVrG0bFAAAANcahGf6d97F5Y5s2y/xPrj2qcEa \ No newline at end of file diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 9a8ed92..30697e4 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -65,6 +65,7 @@ --> + diff --git a/WebSCR/WebSCR.csproj.user b/WebSCR/WebSCR.csproj.user index 3b3a0e7..3b11f8c 100644 --- a/WebSCR/WebSCR.csproj.user +++ b/WebSCR/WebSCR.csproj.user @@ -1,7 +1,7 @@  - WinLab-Rigamonti + IIS02 ShowAllFiles diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx b/WebSCR/WebUserControls/mod_filtroZona.ascx index 575f6db..7173b94 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx @@ -6,7 +6,6 @@
-
diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs index a281f13..2f4eb83 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs @@ -30,15 +30,6 @@ 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. /// diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index b9722af..7a2fbf0 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -6,7 +6,11 @@ @@ -29,17 +33,16 @@ BusinessEndsHour="22" ShowEventStartEnd="True" CellHeight="15" - TimeRangeSelectedHandling="CallBack" + TimeRangeSelectedHandling="JavaScript" EventMoveHandling="CallBack" EventClickHandling="JavaScript" EventClickJavaScript="eventClick(e)" Theme="calendar_white" OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender" - OnEventClick="DayPilotCalendar1_EventClick" Width="95%" HourFontSize="6" DayFontSize="8pt" - EventFontSize="7pt" Days="5"> + EventFontSize="7pt" Days="5" OnEventClick="DayPilotCalendar1_EventClick" OnEventMove="DayPilotCalendar1_EventMove" OnTimeRangeSelected="DayPilotCalendar1_TimeRangeSelected" TimeRangeSelectedJavaScript="newRange(start,end)"> diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 2d2c930..5b8e781 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -85,7 +85,7 @@ namespace WebSCR.WebUserControls { return memLayer.ML.QSS(nome); } - void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e) + protected void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e) { // sposto evento! DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart); @@ -122,12 +122,8 @@ namespace WebSCR.WebUserControls /// /// /// - void DayPilotCalendar1_TimeRangeSelected(object sender, DayPilot.Web.Ui.Events.TimeRangeSelectedEventArgs e) + protected void DayPilotCalendar1_TimeRangeSelected(object sender, DayPilot.Web.Ui.Events.TimeRangeSelectedEventArgs e) { - // 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) { @@ -150,10 +146,12 @@ namespace WebSCR.WebUserControls memLayer.ML.emptySessionVal("currDoc"); // rimuovo matrOp memLayer.ML.emptySessionVal("matrOp"); + // segno refresh FULL necessario + needRefresh = true; } else { - errMessGiorn = "Prego indicare coducmento OC/DC per procedere"; + errMessGiorn = "Prego indicare documento OC/DC per procedere"; } } else @@ -167,6 +165,20 @@ namespace WebSCR.WebUserControls } doUpdate(); } + /// + /// richiesta refresh COMPLETO della pagina + /// + public bool needRefresh + { + get + { + return memLayer.ML.BoolSessionObj("needRefresh"); + } + set + { + memLayer.ML.setSessionVal("needRefresh", value); + } + } public void doUpdate() { @@ -224,11 +236,33 @@ namespace WebSCR.WebUserControls { } } + public string matrOp + { + get + { + return memLayer.ML.StringSessionObj("matrOp"); + } + } + public string currDoc + { + get + { + return memLayer.ML.StringSessionObj("currDoc"); + } + } + public string codSquadra + { + get + { + return memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString(); + } + } 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_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index 289f514..4cdc95a 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -10,62 +10,79 @@ <%@ Register Src="~/WebUserControls/mod_fileImpegno.ascx" TagPrefix="uc1" TagName="mod_fileImpegno" %> <%@ 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
+ +
-
-
-
Ricerca per Periodo
- -
-
-
-
- -
-
- -   +
+
+ +
+
+ +   -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
- +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
-
- - +
+
+
+ +
+
+ + +
+
-
-
+ + diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 434b281..324c9ab 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -25,6 +25,11 @@ namespace WebSCR.WebUserControls mod_filtroPeriodo.numGG = memLayer.ML.confReadInt("numGgDef"); // reimposto selezione squadre... mod_selSquadre.selezionaDaSession(); + // se c'è imposto matricola... + if (matrOp != "") + { + txtMatrOp.Text = matrOp; + } refreshDetail(); } mod_filtroZona.eh_selIndir += mod_filtroZona_eh_selIndir; @@ -56,7 +61,6 @@ namespace WebSCR.WebUserControls catch { } Response.Redirect(string.Format("{0}?Data={1:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, adesso)); - //refreshDetail(); } /// /// recupera valore querystring @@ -85,6 +89,48 @@ namespace WebSCR.WebUserControls mod_fileImpegno.Visible = false; mod_fileUpload.Visible = false; mod_compSquadra.Visible = false; + + + + // 2016.01.20 controllo tipo azione: new/edit/... + if (qsVal("Action") == "NEW") + { + // creo NUOVO impegno + creaImpegno(); + + // ricarico!!! + Response.Redirect(devicesAuthProxy.pagCorrente); + } + else if (qsVal("Action") == "EDIT") + { + // controllo + if (qsVal("Data") != "") + { + if (qsVal("IdxImpegno") != "") + { + // salvo parametri in sessione + saveSessParam(); + + mod_impegno.Visible = true; + mod_dettInt.Visible = true; + mod_fileImpegno.Visible = true; + mod_fileUpload.Visible = true; + mod_compSquadra.Visible = true; + } + else + { + mod_giornata.Visible = true; + } + } + } + else + { + // mostro giornata + mod_giornata.Visible = true; + } + + +#if false if (qsVal("Data") != "") { if (qsVal("IdxImpegno") != "") @@ -102,6 +148,152 @@ namespace WebSCR.WebUserControls { mod_giornata.Visible = true; } + } +#endif + } + + /// + /// anno selezionato + /// + public int yearSel + { + get + { + int answ = DateTime.Now.Year; + if (memLayer.ML.isInSessionObject("yearSel")) + { + answ = memLayer.ML.IntSessionObj("yearSel"); + } + return answ; + } + } + public string codSquadra + { + get + { + string answ = ""; + try + { + answ = memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString(); + } + catch + { } + return answ; + } + } + public string matrOp + { + get + { + string answ = ""; + try + { + answ = memLayer.ML.StringSessionObj("matrOp"); + } + catch + { } + return answ; + } + } + public string currDoc + { + get + { + string answ = ""; + try + { + answ = memLayer.ML.StringSessionObj("currDoc"); + } + catch + { } + return answ; + } + } + /// + /// genera un nuovo impegno (oppure mostra warning...) + /// + private void creaImpegno() + { + string errMessGiorn = ""; + if (codSquadra != "") + { + // verifico di avere MatrOP selezionata + if (matrOp != "") + { + // verifico di avere DOC selezionato... + if (currDoc != "") + { + DateTime inizio = DateTime.Now; + DateTime adesso = inizio; + try + { + inizio = Convert.ToDateTime(qsVal("start")); + } + catch + { } + if (inizio != adesso) + { + +#if false + // 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(inizio, "INDIC", squadra, doc, yearSel); +#endif + // selezionato periodo, salvo evento inizio... + DtProxy.man.taImp.insertQuery(inizio, "INDIC", codSquadra, currDoc, yearSel); + // consumo il doc selezionato e quindi rimuovo da sessione... + memLayer.ML.emptySessionVal("currDoc"); + if (memLayer.ML.confReadBool("svuotaMatrOp")) + { + // rimuovo matrOp + memLayer.ML.emptySessionVal("matrOp"); + } + } + else + { + errMessGiorn = "Prego indicare inizio attività per procedere"; + } + } + else + { + errMessGiorn = "Prego indicare documento OC/DC per procedere"; + } + } + else + { + errMessGiorn = "Prego indicare Matricola Operatore per procedere"; + } + } + else + { + errMessGiorn = "Prego selezionare UNA squadra per procedere"; + } + lblWarning.Text = errMessGiorn; + } + + /// + /// reset dati documento e matricola (se richiesto) + /// + private void resetDocMatr() + { + if (needRefresh) + { + // se è vuoto doc resetto... + if (!memLayer.ML.isInSessionObject("currDoc")) + { + mod_filtroZona.doUpdate(); + } + + // update matrOp... + txtMatrOp.Text = memLayer.ML.StringSessionObj("matrOp"); + needRefresh = false; + //txtMatrOp.DataBind(); } } @@ -143,6 +335,7 @@ namespace WebSCR.WebUserControls } } + /// /// nuovo record impegno... /// @@ -160,6 +353,7 @@ namespace WebSCR.WebUserControls void mod_filtroZona_eh_selIndir(object sender, EventArgs e) { refreshDetail(); + mod_giornata.doUpdate(); } /// /// refresh detail @@ -188,17 +382,26 @@ namespace WebSCR.WebUserControls 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(); +#if false + // check reset data + resetDocMatr(); +#endif } + /// + /// richiesta refresh COMPLETO della pagina + /// + public bool needRefresh + { + get + { + return memLayer.ML.BoolSessionObj("needRefresh"); + } + set + { + memLayer.ML.setSessionVal("needRefresh", value); + } + } protected void lbLess_Click(object sender, EventArgs e) { int days = mod_giornata.day2show; @@ -230,27 +433,22 @@ namespace WebSCR.WebUserControls if (txtMatrOp.Text.Trim() != "") { memLayer.ML.setSessionVal("matrOp", txtMatrOp.Text.Trim()); + mod_giornata.doUpdate(); } else { memLayer.ML.emptySessionVal("matrOp"); } } -#if false - /// - /// matricola oepratore selezionata - /// - protected string matrOp + + protected override void OnUnload(EventArgs e) { - get - { - return memLayer.ML.StringSessionObj("matrOp"); - } - set - { - memLayer.ML.setSessionVal("matrOp", value); - } - } -#endif + base.OnUnload(e); + + // check reset data + resetDocMatr(); + + } + } } \ 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 8863b33..7a2b1c0 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -12,6 +12,15 @@ namespace WebSCR.WebUserControls { public partial class mod_pianificazione { + /// + /// upnTestata control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel upnTestata; + /// /// mod_filtroZona control. /// @@ -31,13 +40,13 @@ namespace WebSCR.WebUserControls { protected global::System.Web.UI.WebControls.TextBox txtMatrOp; /// - /// rfvDoc control. + /// lblWarning control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvDoc; + protected global::System.Web.UI.WebControls.Label lblWarning; /// /// mod_filtroPeriodo control. diff --git a/WebSCR/bin/AjaxMin.dll b/WebSCR/bin/AjaxMin.dll new file mode 100644 index 0000000..cada03b Binary files /dev/null and b/WebSCR/bin/AjaxMin.dll differ diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index b5dc05c..1c149cd 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 159dc16..696d4fa 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR.dll.config b/WebSCR/bin/WebSCR.dll.config index 9a8ed92..30697e4 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -65,6 +65,7 @@ --> + diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 4ccbaa9..3021b4f 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 b5dc05c..1c149cd 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 4ccbaa9..3021b4f 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/bin/Release/SteamWare.dll b/WebSCR_data/bin/Release/SteamWare.dll index 7138664..9ee53c8 100644 Binary files a/WebSCR_data/bin/Release/SteamWare.dll and b/WebSCR_data/bin/Release/SteamWare.dll differ diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index 073b719..92a9f75 100644 Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/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 b179131..9c3b4d8 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 4ccbaa9..3021b4f 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache index 0b60938..ddd75c5 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index 073b719..92a9f75 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ