From 86a855ea200dfc6f2bb9a08ea11a4f1a02ec0988 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 11 Apr 2018 10:47:46 +0200 Subject: [PATCH] typo pre modifica --- .vs/WebSCR/v15/.suo | Bin 582656 -> 582656 bytes WebSCR/WebUserControls/mod_giornata.ascx.cs | 432 ++++++++++---------- WebSCR/WebUserControls/mod_impegno.ascx.cs | 2 +- 3 files changed, 217 insertions(+), 217 deletions(-) diff --git a/.vs/WebSCR/v15/.suo b/.vs/WebSCR/v15/.suo index f1233d0ab2d7a097cfaea9d9219e27e8b69cfea4..3c1656319248ab7a0d683a10e20fbf7c4fd5fcdc 100644 GIT binary patch delta 1065 zcmbV}Uq}=|9LM)JyL;Z*C8u2(dYz}PWpahqJy=Pa{bBPV!-{(F!Gsbj!i)YrL>UCV zSl;c_4M8tfE)hZL8XG-CP=ry0l!U=iQ6@?TRz@$?^_{S=*A_l}XTCGP@BC)AW1zHS zpfpjl@T{UJIpAj|lYuDe^!ze3j}&DXI+uD|vzgxFYdjR^an{7|t5wbv^AmfgaHcKw zJ(rt7hOh9pW!Ix@31&USuW5UD&^KXu_UW6)ZXb<1anEbYEy9K%Hu#|p&@kWWt^K!b zH9hC!-bN~MR`?!!gl1BVR|ouJok=F|3rR-WM+ z5lSzz!t+naa23H)m%9H}d3sVMHz{r;-kn`ERH@uxjd3WI)9x56Y)^dHn+ulHlxpt5- zyOs7?2TI(MxAcnaK?+#mSgtJl(=W1>AIX#Xyg7XRZ_0>0AEh~r@s7iWW6Voas-A`1 z&uE77etxr1a|3C0l0-)%Gfo?u7*K%*bl?G5uCd9RKK~2HcuGeA delta 3341 zcmZA33vg7`9mnx|PIi|hJi2)hV)I%yn+FeRVi0+3c!ZD#fjkJHB6cJwVnSQc6d9=5 zKs(hzTa(<9JGH17A+=z~N|dd&rBx_Kp^)$fLkO=BXrQPO6(Q;Oz}cA$cjhy{|NoqG z&%HN$VYj+DvAQ|2#+w{03}c947`=UceS{H&H=)J`Gk2UkVZ2)wD(%kvL5s?pRybZ3 zGFF(17M3QURXeK#Xnq@Y3@A97MR4L79KyZG zmF8Akxh#}sl-=!^#zr%wIoZBM=18;Ap5@49WR^6q+N$EV7ZN)ZqGv;Pn zwrxAxGk1 zvBd^#gzD#$`*f}PU$E{GcHGU_!(TsyJ z!1201InYPo>SqpP*)k z>+vvh6XT)qQjbT3y8W=18@Yw9{yY`*AhlCIwLhLy5muG^~a6du2) zQ?vq8=n?qefLw1 z!vh$P37CjU@FEkFF$GgG4Oy6uY|KCoa*>C8%tQfZVK&s?vWP533Fe>_b8WnN^C;$H zg;nyQs0ewQ@)`8juFa^MNJ9TRL@_@5meY9yf6dz379%UqnK!8(@`e7ZHPlX+sc-a7(-|5M349V6&%q zo4G7Gue3O2Q9{Z!tKk3{`Zo}L7Gu~4#PK@t;${q0I1E_8OMt+FDW2YYb zNT-_rn0gm>=V2YH{Fb*Zpbo zjIPg;=Wreu(1{-PJbWichFqspXA4X05HYni&Nvyww*YLg!+~I^Rk3>2*!(y~;xSy$ zs98_HI*B?NDM-Z#jKnC6fm*MQY`vq`H-pg}|< z`iH0=#sWNog?JP{#$!-x7LjFGjK_nFaN`MzC3q4`QLS$++p12N{6Cx~+w9``+k^HO zn6K0GgVO8i)RuwcmAm@a?&`PcGo!_RT`l(=U`-2JaS(@a1ZvNtCXHjFbkd0m`cN`UN>35$LZwPDpF_Br{C1S0rcDvI*I!hiFjqNP! rMxK=QSH-Rnp&nWNR;#N>_4iyAql2Dz6-ubI!43xo_+5p;9UJ}+K4A|K diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 160bcde..166b239 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -9,222 +9,222 @@ using WebSCR_data; namespace WebSCR.WebUserControls { - public partial class mod_giornata : System.Web.UI.UserControl + public partial class mod_giornata : System.Web.UI.UserControl + { + public event EventHandler eh_newData; + /// + /// solleva evento selezione data + /// + protected void reportEvent() { - 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.Days = day2show; - // controllo SE si tratta di reload faccio update... - if (memLayer.ML.BoolSessionObj("forceUpdate")) - { - memLayer.ML.setSessionVal("forceUpdate", false); - doUpdate(); - } - } - - - public int day2show - { - get - { - int answ = memLayer.ML.CRI("day2show"); - try - { - answ = memLayer.ML.IntSessionObj("day2show"); - if (answ < 1) answ = memLayer.ML.CRI("day2show"); - } - catch - { } - return answ; - } - set - { - memLayer.ML.setSessionVal("day2show", value); - doUpdate(); - } - } - 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) - { - return memLayer.ML.QSS(nome); - } - protected void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e) - { - // controllo se sia EFFETTIVO spostamento (altrimenti è edit...) - if (e.NewStart == e.OldStart && e.NewEnd == e.OldEnd) - { - // rimando a edit!!! - Response.Redirect(string.Format("{0}?Action=EDIT&CodCliente={1}&Indir={2}&Data={3}&IdxImpegno={4}", devicesAuthProxy.pagCorrente, CodCliente, Indir, Data, e.Id)); - } - else - { - // controllo che sia presente matricola altrimenti NON lo permetto... - if (matrOp != "") - { - // sposto evento! - DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart, matrOp, DateTime.Now); - if (memLayer.ML.confReadBool("svuotaMatrOpMove")) - { - // rimuovo matrOp - memLayer.ML.emptySessionVal("matrOp"); - errorMess = "spostamento effettuato"; - } - doUpdate(); - Response.Redirect(devicesAuthProxy.pagCorrente); - } - else - { - errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento."; - Response.Redirect(devicesAuthProxy.pagCorrente); - } - } - } - /// - /// anno selezionato - /// - public int yearSel - { - get - { - int answ = DateTime.Now.Year; - if (memLayer.ML.isInSessionObject("yearSel")) - { - answ = memLayer.ML.IntSessionObj("yearSel"); - } - return answ; - } - } - /// - /// anno selezionato - /// - public string errorMess - { - set - { - memLayer.ML.setSessionVal("errorMess", value); - - } - } - - public void doUpdate() - { - 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... - } - - /// - /// 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(Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in cambio colore evento:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); - } - } - - 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(); - } - } - + // 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.Days = day2show; + // controllo SE si tratta di reload faccio update... + if (memLayer.ML.BoolSessionObj("forceUpdate")) + { + memLayer.ML.setSessionVal("forceUpdate", false); + doUpdate(); + } + } + + + public int day2show + { + get + { + int answ = memLayer.ML.CRI("day2show"); + try + { + answ = memLayer.ML.IntSessionObj("day2show"); + if (answ < 1) answ = memLayer.ML.CRI("day2show"); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("day2show", value); + doUpdate(); + } + } + 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) + { + return memLayer.ML.QSS(nome); + } + protected void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e) + { + // controllo se sia EFFETTIVO spostamento (altrimenti è edit...) + if (e.NewStart == e.OldStart && e.NewEnd == e.OldEnd) + { + // rimando a edit!!! + Response.Redirect(string.Format("{0}?Action=EDIT&CodCliente={1}&Indir={2}&Data={3}&IdxImpegno={4}", devicesAuthProxy.pagCorrente, CodCliente, Indir, Data, e.Id)); + } + else + { + // controllo che sia presente matricola altrimenti NON lo permetto... + if (matrOp != "") + { + // sposto evento! + DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart, matrOp, DateTime.Now); + if (memLayer.ML.confReadBool("svuotaMatrOpMove")) + { + // rimuovo matrOp + memLayer.ML.emptySessionVal("matrOp"); + errorMess = "spostamento effettuato"; + } + doUpdate(); + Response.Redirect(devicesAuthProxy.pagCorrente); + } + else + { + errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento."; + Response.Redirect(devicesAuthProxy.pagCorrente); + } + } + } + /// + /// anno selezionato + /// + public int yearSel + { + get + { + int answ = DateTime.Now.Year; + if (memLayer.ML.isInSessionObject("yearSel")) + { + answ = memLayer.ML.IntSessionObj("yearSel"); + } + return answ; + } + } + /// + /// anno selezionato + /// + public string errorMess + { + set + { + memLayer.ML.setSessionVal("errorMess", value); + + } + } + + public void doUpdate() + { + 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... + } + + /// + /// 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 (Exception exc) + { + logger.lg.scriviLog(string.Format("Eccezione in cambio colore evento:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + } + } + + 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(); + } + } + + } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs index 6f54045..74d115d 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx.cs +++ b/WebSCR/WebUserControls/mod_impegno.ascx.cs @@ -62,7 +62,7 @@ namespace WebSCR.WebUserControls } } /// - /// verifica se ci sia matricola in sessione (CON VALORE > 1000... + /// verifica se ci sia matricola in sessione (CON VALORE > 1000...) /// public bool hasMatricolaKilo {