diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index da3b221..fa4ba47 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 f22f5e0..8523297 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.049.156")] -[assembly: AssemblyFileVersion("1.4.049.156")] +[assembly: AssemblyVersion("1.5.051.169")] +[assembly: AssemblyFileVersion("1.5.051.169")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 7c03f8a..c1a632c 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.049.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.4.049.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.5.051.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.5.051.<#= 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 e63bf2e..c753d73 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 03a07e4..a40e634 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 b687c7d..e50f848 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.dll b/VersGen/obj/Debug/VersGen.dll index e63bf2e..c753d73 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 e0277a5..a7f004c 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 03a07e4..a40e634 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index bc3e72d..d46738d 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -36,6 +36,10 @@ + + + + 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_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index 970c6c8..143f484 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -25,11 +25,11 @@ HeaderDateFormat="dddd dd/MM" TimeFormat="Clock24Hours" ToolTip="NomeImpegno" - BusinessBeginsHour="7" - BusinessEndsHour="21" - HeightSpec="Full" + HeightSpec="BusinessHours" + BusinessBeginsHour="6" + BusinessEndsHour="22" ShowEventStartEnd="True" - CellHeight="11" + CellHeight="15" TimeRangeSelectedHandling="CallBack" EventMoveHandling="CallBack" EventClickHandling="JavaScript" @@ -40,7 +40,7 @@ Width="95%" HourFontSize="6" DayFontSize="8pt" - EventFontSize="7pt" Days="7"> + EventFontSize="7pt" Days="5"> diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 03e4a5d..74dab60 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -32,6 +32,28 @@ namespace WebSCR.WebUserControls } DayPilotCalendar1.TimeRangeSelected += DayPilotCalendar1_TimeRangeSelected; DayPilotCalendar1.EventMove += DayPilotCalendar1_EventMove; + DayPilotCalendar1.Days = day2show; + } + + 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 { @@ -96,7 +118,7 @@ namespace WebSCR.WebUserControls doUpdate(); } - private void doUpdate() + public void doUpdate() { //ods.DataBind(); //rblSquadre.SelectedIndex = -1; diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index 4822fd2..8262465 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -27,7 +27,14 @@
- +
+ +
+
+ +   + +
@@ -49,7 +56,7 @@
- +
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 1afa3a7..70076db 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -176,5 +176,26 @@ namespace WebSCR.WebUserControls mod_dettInt.doUpdate(); } + protected void lbLess_Click(object sender, EventArgs e) + { + int days = mod_giornata.day2show; + // se è almeno 2... + if (days > memLayer.ML.CRI("minDays")) + { + mod_giornata.day2show = mod_giornata.day2show - 1; + Response.Redirect(devicesAuthProxy.pagCorrente); + } + } + + protected void lbMore_Click(object sender, EventArgs e) + { + int days = mod_giornata.day2show; + // se è meno di 8 2... + if (days < memLayer.ML.CRI("maxDays")) + { + mod_giornata.day2show = mod_giornata.day2show + 1; + Response.Redirect(devicesAuthProxy.pagCorrente); + } + } } } \ 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 d723b2b..44c911f 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -39,6 +39,24 @@ namespace WebSCR.WebUserControls { /// protected global::WebSCR.WebUserControls.mod_selSquadre mod_selSquadre; + /// + /// lbLess control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbLess; + + /// + /// lbMore control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbMore; + /// /// mod_dispPeriodo control. /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index ebfe80c..c3ed188 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/SteamWare.xml b/WebSCR/bin/SteamWare.xml index 4157f50..192d270 100644 --- a/WebSCR/bin/SteamWare.xml +++ b/WebSCR/bin/SteamWare.xml @@ -1534,6 +1534,16 @@ + + + imposta la lingua utente dal valore della riga DB + + + + + oggetto lingua utente con metodi get/set + + pagina correntemente visualizzata (URL in sessione) diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index f6f61bb..991e70c 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 bc3e72d..d46738d 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -36,6 +36,10 @@ + + + + diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index e8f2959..72b7766 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index 30d4583..e7013bb 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -3866,7 +3866,7 @@ namespace WebSCR_data { this.columnIdxImpegno.ReadOnly = true; this.columnIdxImpegno.Unique = true; this.columnNomeImpegno.ReadOnly = true; - this.columnNomeImpegno.MaxLength = 103; + this.columnNomeImpegno.MaxLength = 500; this.columnInizio.AllowDBNull = false; this.columnFine.ReadOnly = true; this.columnCodSquadra.AllowDBNull = false; diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 974c20f..4502544 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -777,7 +777,7 @@ FROM v_elencoImpegni - + SELECT * FROM dbo.v_ImpegniCal @@ -1166,7 +1166,7 @@ FROM v_AssSqDip - + dbo.stp_AsSq_delete @@ -1191,7 +1191,7 @@ FROM v_AssSqDip - + dbo.stp_AsSq_insert @@ -1270,7 +1270,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1302,7 +1302,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1338,7 +1338,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1363,7 +1363,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1447,7 +1447,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1585,7 +1585,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1595,7 +1595,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1611,14 +1611,14 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + - + @@ -1641,7 +1641,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1658,7 +1658,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1693,7 +1693,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1748,7 +1748,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1894,7 +1894,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -1923,7 +1923,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - + @@ -2019,9 +2019,9 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) - - - + + + \ No newline at end of file diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 57a64ed..54d227d 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -13,7 +13,7 @@ - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index ccc02c3..a6aa70f 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/SteamWare.xml b/WebSCR_data/bin/Debug/SteamWare.xml index 4157f50..192d270 100644 --- a/WebSCR_data/bin/Debug/SteamWare.xml +++ b/WebSCR_data/bin/Debug/SteamWare.xml @@ -1534,6 +1534,16 @@ + + + imposta la lingua utente dal valore della riga DB + + + + + oggetto lingua utente con metodi get/set + + pagina correntemente visualizzata (URL in sessione) diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 9aa5e9f..1d761da 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 ebfe80c..c3ed188 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 e8f2959..72b7766 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/DesignTimeResolveAssemblyReferences.cache b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 83da710..a5546dc 100644 Binary files a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 7ed95f8..bf2656b 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 9369a14..de9566d 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 9aa5e9f..1d761da 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/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 6c8f340..eb0f8de 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache index 6ee4d55..aa26dc0 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 e8f2959..72b7766 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ