diff --git a/DataUploader.7z b/DataUploader.7z new file mode 100644 index 0000000..45d79c3 Binary files /dev/null and b/DataUploader.7z differ diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index a58b7db..5ded782 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 42b3ead..082f86b 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.035.51")] -[assembly: AssemblyFileVersion("1.1.035.51")] +[assembly: AssemblyVersion("1.1.036.68")] +[assembly: AssemblyFileVersion("1.1.036.68")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 91f4988..024bd66 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.035.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.1.035.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.1.036.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.1.036.<#= 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 6e05dec..3888fea 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index ee3ca68..3101e49 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 6e05dec..3888fea 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 dda888d..f4c93de 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.v11.suo b/WebSCR.v11.suo index e8ab2ca..0b752a3 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Squadra.aspx b/WebSCR/Squadra.aspx index 86aacd1..e819593 100644 --- a/WebSCR/Squadra.aspx +++ b/WebSCR/Squadra.aspx @@ -15,8 +15,8 @@
- +
- + diff --git a/WebSCR/WebUserControls/mod_consegne.ascx b/WebSCR/WebUserControls/mod_consegne.ascx index 706622b..74386b3 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx +++ b/WebSCR/WebUserControls/mod_consegne.ascx @@ -76,6 +76,7 @@ + diff --git a/WebSCR/WebUserControls/mod_elencoRichResetUtenti.ascx.cs b/WebSCR/WebUserControls/mod_elencoRichResetUtenti.ascx.cs index 543062b..0322059 100644 --- a/WebSCR/WebUserControls/mod_elencoRichResetUtenti.ascx.cs +++ b/WebSCR/WebUserControls/mod_elencoRichResetUtenti.ascx.cs @@ -86,7 +86,7 @@ namespace WebSCR.WebUserControls if (USER_NAME != "" && AuthKey != "") { // invio email! - devicesAuthProxy.stObj.sendEmailAuthKey(USER_NAME, AuthKey); + devicesAuthProxy.stObj.sendEmailAuthKey(USER_NAME, AuthKey,"WebSCR authorization"); } break; default: diff --git a/WebSCR/WebUserControls/mod_squadre.ascx.cs b/WebSCR/WebUserControls/mod_squadre.ascx.cs index 1143126..41305ed 100644 --- a/WebSCR/WebUserControls/mod_squadre.ascx.cs +++ b/WebSCR/WebUserControls/mod_squadre.ascx.cs @@ -48,6 +48,7 @@ namespace WebSCR.WebUserControls memLayer.ML.setCookieVal("SquadraCurr", riga.DescrSquadra, DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); memLayer.ML.setCookieVal("DataRif", DateTime.Now.ToString("yyyy-MM-dd"), DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); memLayer.ML.setCookieVal("NumGg", "2", DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); + memLayer.ML.setCookieVal("RecAgeDd", "1000", DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra"))); // ricarico! Response.Redirect(devicesAuthProxy.pagCorrente); } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index c59ec2b..30a77f2 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 f03f09e..1485da2 100644 --- a/WebSCR/bin/SteamWare.xml +++ b/WebSCR/bin/SteamWare.xml @@ -1389,7 +1389,7 @@ - + invia email ad utente con url x enroll @@ -2332,12 +2332,26 @@ The _nome file. + + + cerca di caricare il fileinfo o da httpcontext-application re-position o direttamente come workpath + nomefile + + The _path. + The _nome file. + + cerca di caricare la directoryInfo o da httpcontext-application re-position o direttamente come workpath + + + imposta la directory richiesta... + + + Legge i dati da uno stream fino a quando arriva alla fine. diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index a7da7b7..369a00a 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 042041e..1769ee4 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index b52b2d5..852f327 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -1152,7 +1152,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1184,7 +1184,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1220,7 +1220,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1245,7 +1245,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1329,7 +1329,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1467,7 +1467,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1477,7 +1477,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1493,7 +1493,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1523,7 +1523,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1540,7 +1540,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1575,7 +1575,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1630,7 +1630,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1821,7 +1821,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + \ No newline at end of file diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index c59ec2b..da739a7 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 f03f09e..1485da2 100644 --- a/WebSCR_data/bin/Debug/SteamWare.xml +++ b/WebSCR_data/bin/Debug/SteamWare.xml @@ -1389,7 +1389,7 @@ - + invia email ad utente con url x enroll @@ -2332,12 +2332,26 @@ The _nome file. + + + cerca di caricare il fileinfo o da httpcontext-application re-position o direttamente come workpath + nomefile + + The _path. + The _nome file. + + cerca di caricare la directoryInfo o da httpcontext-application re-position o direttamente come workpath + + + imposta la directory richiesta... + + + Legge i dati da uno stream fino a quando arriva alla fine. diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 042041e..95ff3ab 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 dc2439b..30a77f2 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 ea16053..1769ee4 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 56bb1c8..d1bff9b 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 3064272..b5909f5 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 71b6615..1b1c548 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 042041e..95ff3ab 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 ea4b106..16e02a9 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 045c9cf..5b0155a 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 ea16053..1769ee4 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ