Egalware/WebSCR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix allegati aperti in nuova pagina...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-02-09 18:23:45 +01:00
parent cb7528cbdf
commit db7a973d98
17 changed files with 189 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
DataUploader/GestData.cs
+1 -1
View File
@@ -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];
DataUploader/bin/DataUploader.dll
BIN
View File
Binary file not shown.
VersGen/WebSC.cs
+2 -2
View File
@@ -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")]
VersGen/WebSC.tt
+2 -2
View File
@@ -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")]
<#+
VersGen/obj/Release/TempPE/WebSC.cs.dll
BIN
View File
Binary file not shown.
WebSCR/Allegati.aspx
+9
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="false" showOpenNewTab="false" />
</asp:Content>
WebSCR/Allegati.aspx.cs
+17
View File
@@ -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)
{
}
}
}
WebSCR/Allegati.aspx.designer.cs
Generated
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebSCR {
public partial class Allegati {
/// <summary>
/// mod_fileUpload control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebSCR.WebUserControls.mod_fileUpload mod_fileUpload;
}
}
WebSCR/Squadra.aspx
+1 -1
View File
@@ -18,7 +18,7 @@
<uc1:mod_gestIntSquadre runat="server" ID="mod_gestIntSquadre" />
<uc1:mod_ImpegnoSmall runat="server" ID="mod_ImpegnoSmall" />
<div id="divFile" runat="server" style="text-align: center; margin: 2px auto; padding: 2px; border: 1px solid #333333;" class="ui-shadow ui-corner-all">
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="true" />
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="true" showOpenNewTab="false" />
</div>
<uc1:mod_dettInt runat="server" ID="mod_dettInt" disableEdit="true" />
</div>
WebSCR/WebSCR.csproj
+8
View File
@@ -103,6 +103,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Allegati.aspx" />
<Content Include="App_Readme\Elmah.txt" />
<Content Include="Clienti.aspx" />
<Content Include="Content\font-awesome.css" />
@@ -449,6 +450,13 @@
<Compile Include="..\VersGen\WebSC.cs">
<Link>WebSC.cs</Link>
</Compile>
<Compile Include="Allegati.aspx.cs">
<DependentUpon>Allegati.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Allegati.aspx.designer.cs">
<DependentUpon>Allegati.aspx</DependentUpon>
</Compile>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="Clienti.aspx.cs">
WebSCR/WebUserControls/mod_fileUpload.ascx
+81 -73
View File
@@ -1,79 +1,87 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="WebSCR.WebUserControls.mod_fileUpload" %>
<div id="divNewEdit" runat="server">
<asp:Button ID="btnAdd" runat="server" Text="Nuovo Allegato" OnClick="btnAdd_Click" Enabled='<%# enableMod %>' />
<asp:Button ID="btnCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" />
<div runat="server" id="divOpenNew">
<asp:HyperLink runat="server" ID="hlOpenNew" NavigateUrl="~/showFile" Target="_blank">Mostra Allegati</asp:HyperLink>
</div>
<div id="divFileUpl" runat="server">
<div style="width: 100%;">
<asp:FileUpload ID="FileUpload1" runat="server" />
<div runat="server" id="divNormal">
<div id="divNewEdit" runat="server">
<asp:Button ID="btnAdd" runat="server" Text="Nuovo Allegato" OnClick="btnAdd_Click" Enabled='<%# enableMod %>' />
<asp:Button ID="btnCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" />
</div>
<div style="width: 100%;">
<asp:Button ID="btnUpload" runat="server" Text="Upload" OnClick="Upload" data-theme="b" />
</div>
</div>
<asp:GridView ID="grView" runat="server" Width="100%" AutoGenerateColumns="False" DataSourceID="odsFile" DataKeyNames="idxFile" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<EditRowStyle BackColor="#2461BF" />
<FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" />
<RowStyle BackColor="#EFF3FB" HorizontalAlign="Left" />
<SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" />
<SortedAscendingCellStyle BackColor="#F5F7FB" />
<SortedAscendingHeaderStyle BackColor="#6D95E1" />
<SortedDescendingCellStyle BackColor="#E9EBEF" />
<SortedDescendingHeaderStyle BackColor="#4870BE" />
<AlternatingRowStyle BackColor="White" />
<Columns>
<asp:TemplateField HeaderText="Documento">
<EditItemTemplate>
<asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("FileName") %>'></asp:TextBox>
</EditItemTemplate>
<ItemTemplate>
<div>
<asp:LinkButton ID="lnkDownload" runat="server" OnClick="DownloadFile"
CommandArgument='<%# Eval("idxFile") %>'>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("FileName") %>' />
</asp:LinkButton></div><div>
<asp:Label CssClass="flLeft" ID="lblDataMod" runat="server" Text='<%# Eval("DataMod","{0:yyyy-MM-dd HH:mm}") %>' Font-Size="0.7em" />
<asp:Label CssClass="flRight" ID="lblSize" runat="server" Text='<%# Eval("Size","{0:N0} kb") %>' Font-Size="0.8em" />
</div>
</ItemTemplate>
<ItemStyle HorizontalAlign="Left" />
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="right">
<ItemTemplate>
<div id="Div1" runat="server" visible='<%# isWriteEnabled %>'>
<asp:LinkButton ID="lnkSelect" runat="server" CausesValidation="False" CommandName="Select" Text="Select" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-notext ui-btn-inline" ToolTip="Modifica" Visible='<%# enableMod %>' />
<asp:LinkButton ID="lnkDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-delete ui-btn-icon-notext ui-btn-inline" ToolTip="Elimina" OnClientClick="return confirm('Sei sicuro di voler eliminare il file?')" Visible='<%# enableMod %>' />
</div>
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsFile" runat="server" DeleteMethod="DeleteQuery" OldValuesParameterFormatString="original_{0}" SelectMethod="getByImpegno" TypeName="WebSCR_Data.DS_UtilityTableAdapters.tblFilesTableAdapter" InsertMethod="InsertQuery" UpdateMethod="UpdateQuery">
<SelectParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
</SelectParameters>
<DeleteParameters>
<asp:Parameter Name="Original_idxFile" Type="Int32" />
</DeleteParameters>
<InsertParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
<asp:Parameter Name="IdxRapportino" DefaultValue="0" Type="Int32" />
<asp:Parameter Name="FileName" Type="String" />
<asp:Parameter Name="ContentType" Type="String" />
<asp:Parameter Name="Data" Type="Object" />
</InsertParameters>
<UpdateParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
<asp:Parameter Name="IdxRapportino" DefaultValue="0" Type="Int32" />
<asp:Parameter Name="FileName" Type="String" />
<asp:Parameter Name="ContentType" Type="String" />
<asp:Parameter Name="Data" Type="Object" />
<asp:Parameter Name="Original_idxFile" Type="Int32" />
</UpdateParameters>
</asp:ObjectDataSource>
<div id="divFileUpl" runat="server">
<div style="width: 100%;">
<asp:FileUpload ID="FileUpload1" runat="server" />
</div>
<div style="width: 100%;">
<asp:Button ID="btnUpload" runat="server" Text="Upload" OnClick="Upload" data-theme="b" />
</div>
</div>
<asp:GridView ID="grView" runat="server" Width="100%" AutoGenerateColumns="False" DataSourceID="odsFile" DataKeyNames="idxFile" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<EditRowStyle BackColor="#2461BF" />
<FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" />
<RowStyle BackColor="#EFF3FB" HorizontalAlign="Left" />
<SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" />
<SortedAscendingCellStyle BackColor="#F5F7FB" />
<SortedAscendingHeaderStyle BackColor="#6D95E1" />
<SortedDescendingCellStyle BackColor="#E9EBEF" />
<SortedDescendingHeaderStyle BackColor="#4870BE" />
<AlternatingRowStyle BackColor="White" />
<Columns>
<asp:TemplateField HeaderText="Documento">
<EditItemTemplate>
<asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("FileName") %>'></asp:TextBox>
</EditItemTemplate>
<ItemTemplate>
<div>
<asp:LinkButton ID="lnkDownload" runat="server" OnClick="DownloadFile" CommandArgument='<%# Eval("idxFile") %>'>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("FileName") %>' />
</asp:LinkButton>
</div>
<div>
<asp:Label CssClass="flLeft" ID="lblDataMod" runat="server" Text='<%# Eval("DataMod","{0:yyyy-MM-dd HH:mm}") %>' Font-Size="0.7em" />
<asp:Label CssClass="flRight" ID="lblSize" runat="server" Text='<%# Eval("Size","{0:N0} kb") %>' Font-Size="0.8em" />
</div>
</ItemTemplate>
<ItemStyle HorizontalAlign="Left" />
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="right">
<ItemTemplate>
<div id="Div1" runat="server" visible='<%# isWriteEnabled %>'>
<asp:LinkButton ID="lnkSelect" runat="server" CausesValidation="False" CommandName="Select" Text="Select" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-notext ui-btn-inline" ToolTip="Modifica" Visible='<%# enableMod %>' />
<asp:LinkButton ID="lnkDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-delete ui-btn-icon-notext ui-btn-inline" ToolTip="Elimina" OnClientClick="return confirm('Sei sicuro di voler eliminare il file?')" Visible='<%# enableMod %>' />
</div>
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsFile" runat="server" DeleteMethod="DeleteQuery" OldValuesParameterFormatString="original_{0}" SelectMethod="getByImpegno" TypeName="WebSCR_Data.DS_UtilityTableAdapters.tblFilesTableAdapter" InsertMethod="InsertQuery" UpdateMethod="UpdateQuery">
<SelectParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
</SelectParameters>
<DeleteParameters>
<asp:Parameter Name="Original_idxFile" Type="Int32" />
</DeleteParameters>
<InsertParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
<asp:Parameter Name="IdxRapportino" DefaultValue="0" Type="Int32" />
<asp:Parameter Name="FileName" Type="String" />
<asp:Parameter Name="ContentType" Type="String" />
<asp:Parameter Name="Data" Type="Object" />
</InsertParameters>
<UpdateParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
<asp:Parameter Name="IdxRapportino" DefaultValue="0" Type="Int32" />
<asp:Parameter Name="FileName" Type="String" />
<asp:Parameter Name="ContentType" Type="String" />
<asp:Parameter Name="Data" Type="Object" />
<asp:Parameter Name="Original_idxFile" Type="Int32" />
</UpdateParameters>
</asp:ObjectDataSource>
</div>
WebSCR/WebUserControls/mod_fileUpload.ascx.cs
+15
View File
@@ -20,6 +20,20 @@ namespace WebSCR.WebUserControls
/// abilita modifica/cancellazione allegati
/// </summary>
public bool enableMod { get; set; }
public bool showOpenNewTab
{
get
{
return divOpenNew.Visible;
}
set
{
divOpenNew.Visible = value;
divNormal.Visible = !value;
}
}
/// <summary>
/// caricamento pagina
/// </summary>
@@ -29,6 +43,7 @@ namespace WebSCR.WebUserControls
{
if (!IsPostBack)
{
hlOpenNew.NavigateUrl = string.Format("~/Allegati?IdxImpegno={0}", memLayer.ML.QSI("idxImpegno"));
fisVisFU(false);
grView.DataBind();
}
WebSCR/WebUserControls/mod_fileUpload.ascx.designer.cs
Generated
+27
View File
@@ -12,6 +12,33 @@ namespace WebSCR.WebUserControls {
public partial class mod_fileUpload {
/// <summary>
/// divOpenNew control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divOpenNew;
/// <summary>
/// hlOpenNew control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlOpenNew;
/// <summary>
/// divNormal control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNormal;
/// <summary>
/// divNewEdit control.
/// </summary>
WebSCR/WebUserControls/mod_pianificazione.ascx
+2 -1
View File
@@ -77,7 +77,7 @@
</div>
<div class="ui-body">
<uc1:mod_fileImpegno runat="server" ID="mod_fileImpegno" />
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="false" />
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="false" showOpenNewTab="true" />
</div>
</div>
</div>
@@ -86,3 +86,4 @@
</div>
</ContentTemplate>
</asp:UpdatePanel>
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.