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

completata revisione file upload, gestione con DNS fixed x avere portatile allineato... OK!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-02-03 23:06:17 +01:00
parent 066dcbde48
commit 7c8d1d19b8
14 changed files with 120 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/config/applicationhost.config
+2 -2
View File
@@ -162,7 +162,7 @@
</site>
<site name="GIM_site" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_site" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:59788:localhost" />
@@ -170,7 +170,7 @@
</site>
<site name="GIM_data" id="3">
<application path="/" applicationPool="Clr2IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_data" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_data" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:51125:localhost" />
GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
GIM_data/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GIM_site/AllegatiRichiesta.aspx
+3 -1
View File
@@ -9,5 +9,7 @@
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MConAlt" runat="server">
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="true" modoContr="editEnabled" />
<div class="container">
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="true" modoContr="editEnabled" />
</div>
</asp:Content>
GIM_site/AllegatiRichiesta.aspx.cs
+3 -6
View File
@@ -12,12 +12,9 @@ namespace GIM_site
{
protected void Page_Load(object sender, EventArgs e)
{
//if (!Page.IsPostBack)
//{
mod_fileUpload.numIntMtz = memLayer.ML.QSI("numIntMtz");
mod_fileUpload.enableMod = true;
mod_fileUpload.doUpdate();
//}
mod_fileUpload.numIntMtz = memLayer.ML.QSI("numIntMtz");
mod_fileUpload.enableMod = true;
mod_fileUpload.doUpdate();
}
}
}
GIM_site/WebUserControls/mod_elencoRichieste.ascx
+3 -8
View File
@@ -37,14 +37,9 @@
</HeaderTemplate>
<ItemTemplate>
<span style="white-space: nowrap;">
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
Visible='<%# !isPrInCarEnabl(Eval("numIntMtz")) %>' ToolTip='<%# traduci("ShowDetails") %>'
ImageUrl="~/images/view_s.png" />
<asp:HyperLink runat="server" ID="hlExportPdf" ToolTip='<%# traduci("exportRichiestaPDF") %>'
ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# formattaUrl(Eval("numIntMtz")) %>' />
<asp:ImageButton runat="server" ID="btnPrendeInCarico" ImageUrl="~/images/print_s.png"
CommandArgument='<%# Eval("numIntMtz")%>' ToolTip='<%# traduci("prendeInCaricoRichiesta") %>'
OnClick="btnPrendeInCarico_Click" Visible='<%# isPrInCarEnabl(Eval("numIntMtz")) %>' />
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select" Visible='<%# !isPrInCarEnabl(Eval("numIntMtz")) %>' ToolTip='<%# traduci("ShowDetails") %>' ImageUrl="~/images/view_s.png" />
<asp:HyperLink runat="server" ID="hlExportPdf" ToolTip='<%# traduci("exportRichiestaPDF") %>' ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# formattaUrl(Eval("numIntMtz")) %>' />
<asp:ImageButton runat="server" ID="btnPrendeInCarico" ImageUrl="~/images/print_s.png" CommandArgument='<%# Eval("numIntMtz")%>' ToolTip='<%# traduci("prendeInCaricoRichiesta") %>' OnClick="btnPrendeInCarico_Click" Visible='<%# isPrInCarEnabl(Eval("numIntMtz")) %>' />
</span>
</ItemTemplate>
<ItemStyle HorizontalAlign="Center" />
GIM_site/WebUserControls/mod_fileUpload.ascx
+76 -66
View File
@@ -1,75 +1,85 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="GIM_site.WebUserControls.mod_fileUpload" %>
<div runat="server" id="divOpenNew" class="bg-info" style="text-align: center; margin: auto; font-size: 1.5em;">
<b>
<asp:HyperLink runat="server" ID="hlOpenNew" NavigateUrl="~/showFile" Target="_blank"><%: numAllegati %> files allegati</asp:HyperLink></b>
</div>
<div runat="server" id="divNormal">
<div id="divNewEdit" runat="server">
<asp:Button ID="btnAdd" CssClass="btn btn-info" runat="server" Text="Nuovo Allegato" OnClick="btnAdd_Click" Enabled='<%# enableMod %>' />
<asp:Button ID="btnCancel" CssClass="btn btn-warning" runat="server" Text="Annulla" OnClick="btnCancel_Click" />
</div>
<div id="divFileUpl" runat="server">
<div style="width: 100%;">
<asp:FileUpload ID="FileUpload1" runat="server" />
<div class="row">
<div class="col-xs-3">
<div id="divNewEdit" runat="server">
<asp:Button ID="btnAdd" CssClass="btn btn-info btn-block" runat="server" Text="Nuovo Allegato" OnClick="btnAdd_Click" Enabled='<%# enableMod %>' />
<asp:Button ID="btnCancel" CssClass="btn btn-warning btn-block" runat="server" Text="Annulla" OnClick="btnCancel_Click" />
</div>
</div>
<div style="width: 100%;">
<asp:Button ID="btnUpload" CssClass="btn btn-success" runat="server" Text="Upload" OnClick="Upload" data-theme="b" />
<div class="col-xs-9">
<div id="divFileUpl" runat="server" class="row">
<div class="col-xs-8">
<asp:FileUpload ID="FileUpload1" runat="server" />
</div>
<div class="col-xs-4">
<asp:Button ID="btnUpload" CssClass="btn btn-success btn-block" runat="server" Text="Upload" OnClick="Upload" data-theme="b" />
</div>
</div>
</div>
</div>
<div runat="server" id="divOpenNew" class="row bg-info" style="text-align: center; margin: auto; font-size: 1.5em;">
<div class="col-xs-12">
<b>
<asp:HyperLink runat="server" ID="hlOpenNew" NavigateUrl="~/showFile" Target="_blank"><%: numAllegati %> files allegati</asp:HyperLink></b>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<asp:GridView ID="grView" runat="server" Width="100%" AutoGenerateColumns="False" DataSourceID="odsFile" DataKeyNames="Nome" 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("Nome") %>'></asp:TextBox>
</EditItemTemplate>
<ItemTemplate>
<div>
<asp:HyperLink runat="server" ID="hlFile" Target="_blank" NavigateUrl='<%# fileUrl(Eval("Nome")) %>'>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("Nome") %>' />
</asp:HyperLink>
</div>
<div>
<asp:Label CssClass="flLeft" ID="lblDataMod" runat="server" Text='<%# Eval("dataCreaz","{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='<%# enableMod %>'>
<asp:LinkButton ID="lnkSelect" runat="server" CausesValidation="False" CommandName="Select" Text="Select" CssClass="btn btn-success" ToolTip="Modifica" Visible='<%# enableMod %>' />&nbsp;
<asp:LinkButton ID="lnkDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" CssClass="btn btn-danger" 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" OldValuesParameterFormatString="Original_{0}" SelectMethod="elencoFiles" TypeName="WebGimUtils" DeleteMethod="eliminaFile" OnDeleting="odsFile_Deleting">
<SelectParameters>
<asp:ControlParameter DefaultValue="0" Name="numInt" ControlID="hfNumIntMtz" Type="Int32" />
</SelectParameters>
<DeleteParameters>
<asp:ControlParameter DefaultValue="0" Name="numInt" ControlID="hfNumIntMtz" Type="Int32" />
<asp:Parameter Name="Original_Nome" Type="String" />
</DeleteParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfNumIntMtz" />
</div>
</div>
<asp:GridView ID="grView" runat="server" Width="100%" AutoGenerateColumns="False" DataSourceID="odsFile" DataKeyNames="Nome" 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("Nome") %>'></asp:TextBox>
</EditItemTemplate>
<ItemTemplate>
<div>
<asp:HyperLink runat="server" ID="hlFile" Target="_blank" NavigateUrl='<%# fileUrl(Eval("Nome")) %>'>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("Nome") %>' />
</asp:HyperLink>
</div>
<div>
<asp:Label CssClass="flLeft" ID="lblDataMod" runat="server" Text='<%# Eval("dataCreaz","{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='<%# enableMod %>'>
<asp:LinkButton ID="lnkSelect" runat="server" CausesValidation="False" CommandName="Select" Text="Select" CssClass="btn btn-success fa fa-edit" ToolTip="Modifica" Visible='<%# enableMod %>' />&nbsp;
<asp:LinkButton ID="lnkDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" CssClass="btn btn-danger fa fa-trash" 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" OldValuesParameterFormatString="Original_{0}" SelectMethod="elencoFiles" TypeName="WebGimUtils" DeleteMethod="eliminaFile" OnDeleting="odsFile_Deleting">
<SelectParameters>
<asp:ControlParameter DefaultValue="0" Name="numInt" ControlID="hfNumIntMtz" Type="Int32" />
</SelectParameters>
<DeleteParameters>
<asp:ControlParameter DefaultValue="0" Name="numInt" ControlID="hfNumIntMtz" Type="Int32" />
<asp:Parameter Name="Original_Nome" Type="String" />
</DeleteParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfNumIntMtz" />
</div>
GIM_site/WebUserControls/mod_fileUpload.ascx.cs
+5 -1
View File
@@ -43,6 +43,10 @@ namespace GIM_site.WebUserControls
{
if (!IsPostBack)
{
if (memLayer.ML.QSI("numIntMtz") != 0)
{
numIntMtz = memLayer.ML.QSI("numIntMtz");
}
hlOpenNew.NavigateUrl = string.Format("~/AllegatiRichiesta?numIntMtz={0}", numIntMtz);
fisVisFU(false);
grView.DataBind();
@@ -199,7 +203,7 @@ namespace GIM_site.WebUserControls
fileMover.obj.setDirectoryMapPath(WebGimUtils.dirPathIntMtz(numIntMtz));
fileMover.obj.eliminaFile(e.InputParameters["Original_Nome"].ToString());
// fermo procedura...
e.Cancel=true;
e.Cancel = true;
}
}
}
GIM_site/WebUserControls/mod_fileUpload.ascx.designer.cs
Generated
+18 -18
View File
@@ -12,24 +12,6 @@ namespace GIM_site.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>
@@ -93,6 +75,24 @@ namespace GIM_site.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnUpload;
/// <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>
/// grView control.
/// </summary>
GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GIM_site/dettaglioIntervento.aspx.cs
+9 -1
View File
@@ -9,7 +9,15 @@ public partial class dettaglioIntervento : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
mod_dettaglioIntervento1.eh_chiudi += new EventHandler(mod_dettaglioIntervento1_eh_chiudi);
if (!Page.IsPostBack)
{
// se ho valore in URL lo salvo in sessione...
if (memLayer.ML.QSS("numIntMtz") != "")
{
memLayer.ML.setSessionVal("numIntMtz_sel", memLayer.ML.QSI("numIntMtz"));
}
}
mod_dettaglioIntervento1.eh_chiudi += new EventHandler(mod_dettaglioIntervento1_eh_chiudi);
}
/// <summary>
/// resetto selezione, nascondo dettaglio
GIM_site/elencoRichieste.aspx.cs
+1 -3
View File
@@ -41,8 +41,6 @@ public partial class elencoRichieste : UserPage
/// <param name="e"></param>
void mod_elencoRichieste1_eh_selValore(object sender, EventArgs e)
{
Response.Redirect("dettaglioIntervento.aspx");
Response.Redirect(string.Format("dettaglioIntervento.aspx?numIntMtz={0}", memLayer.ML.IntSessionObj("numIntMtz_sel")));
}
}
GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.