diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 19ba114..0923c40 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/DataUploader/GestData.cs b/DataUploader/GestData.cs index 62f87e3..a849f84 100644 --- a/DataUploader/GestData.cs +++ b/DataUploader/GestData.cs @@ -217,7 +217,7 @@ namespace DataUploader logger.Info("Inizio getNewDocsUrls"); } - // ipotesi: si caricano maxDocsToUpload documenti alal volta (e quindi altrettanti clienti) + // ipotesi: si caricano maxDocsToUpload documenti alla volta (e quindi altrettanti clienti) int maxDocsToUpload = num2reload + 1; string[] answ = new string[maxDocsToUpload * 2]; // 2 stringhe, una x doc e 1 x cliente x ogni invio... string[] rDoc = new string[20]; diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 9a7c0d9..7ef590e 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 5eb1e99..43d1881 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.098.309")] -[assembly: AssemblyFileVersion("2.0.098.309")] +[assembly: AssemblyVersion("2.0.099.314")] +[assembly: AssemblyFileVersion("2.0.099.314")] [assembly: AssemblyCopyright("Steamware © 2015-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 233c72e..2b7ef6b 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.098.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.098.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.099.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.099.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 17f77a2..883ab7f 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/Allegati.aspx b/WebSCR/Allegati.aspx new file mode 100644 index 0000000..c8fe196 --- /dev/null +++ b/WebSCR/Allegati.aspx @@ -0,0 +1,9 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Allegati.aspx.cs" Inherits="WebSCR.Allegati" %> + +<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> + + + + + + diff --git a/WebSCR/Allegati.aspx.cs b/WebSCR/Allegati.aspx.cs new file mode 100644 index 0000000..1e30c6f --- /dev/null +++ b/WebSCR/Allegati.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace WebSCR +{ + public partial class Allegati : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/Allegati.aspx.designer.cs b/WebSCR/Allegati.aspx.designer.cs new file mode 100644 index 0000000..74c1ddc --- /dev/null +++ b/WebSCR/Allegati.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WebSCR { + + + public partial class Allegati { + + /// + /// mod_fileUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_fileUpload mod_fileUpload; + } +} diff --git a/WebSCR/Squadra.aspx b/WebSCR/Squadra.aspx index 5ea254e..c2da644 100644 --- a/WebSCR/Squadra.aspx +++ b/WebSCR/Squadra.aspx @@ -18,7 +18,7 @@
- +
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index a1bded2..7eeaa02 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -103,6 +103,7 @@ + @@ -449,6 +450,13 @@ WebSC.cs + + Allegati.aspx + ASPXCodeBehind + + + Allegati.aspx + diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx b/WebSCR/WebUserControls/mod_fileUpload.ascx index 9c3a657..0c931d6 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx @@ -1,79 +1,87 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="WebSCR.WebUserControls.mod_fileUpload" %> -
- - + +
+ Mostra Allegati
-
-
- +
+
+ +
-
- -
-
- - - - - - - - - - - - - - - - - - -
- - -
- - -
- - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + +
+ + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs index 30ab5bd..cec4e56 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs @@ -20,6 +20,20 @@ namespace WebSCR.WebUserControls /// abilita modifica/cancellazione allegati /// public bool enableMod { get; set; } + + public bool showOpenNewTab + { + get + { + return divOpenNew.Visible; + } + set + { + divOpenNew.Visible = value; + divNormal.Visible = !value; + } + } + /// /// caricamento pagina /// @@ -29,6 +43,7 @@ namespace WebSCR.WebUserControls { if (!IsPostBack) { + hlOpenNew.NavigateUrl = string.Format("~/Allegati?IdxImpegno={0}", memLayer.ML.QSI("idxImpegno")); fisVisFU(false); grView.DataBind(); } diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx.designer.cs b/WebSCR/WebUserControls/mod_fileUpload.ascx.designer.cs index 5951f8e..3a8d5d3 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx.designer.cs @@ -12,6 +12,33 @@ namespace WebSCR.WebUserControls { public partial class mod_fileUpload { + /// + /// divOpenNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divOpenNew; + + /// + /// hlOpenNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlOpenNew; + + /// + /// divNormal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNormal; + /// /// divNewEdit control. /// diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index c045785..2dda35f 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -77,7 +77,7 @@
- +
@@ -86,3 +86,4 @@ + diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 58c7df4..64b7b2b 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR_data/bin/Release/SteamWare.dll b/WebSCR_data/bin/Release/SteamWare.dll index fa7305a..7138664 100644 Binary files a/WebSCR_data/bin/Release/SteamWare.dll and b/WebSCR_data/bin/Release/SteamWare.dll differ