Aggiunta allegati x PAM

This commit is contained in:
Samuele E. Locatelli
2018-08-10 09:27:06 +02:00
parent 50b4856217
commit 966deff524
11 changed files with 159 additions and 56 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=139']) {
withEnv(['NEXT_BUILD_NUMBER=140']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SOSCONDOMINI'
+11
View File
@@ -0,0 +1,11 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SitePAM.master" AutoEventWireup="true" CodeBehind="Allegati.aspx.cs" Inherits="PUB.PAM.Allegati" %>
<%@ Register Src="~/WebUserContols/mod_allegatiInterv.ascx" TagPrefix="uc1" TagName="mod_allegatiInterv" %>
<asp:Content ID="Content1" ContentPlaceHolderID="NoAjaxContent" runat="server">
<div class="container-fluid my-1 bg-light px-1">
<uc1:mod_allegatiInterv runat="server" ID="mod_allegatiInterv" />
</div>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
</asp:Content>
+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 PUB.PAM
{
public partial class Allegati : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace PUB.PAM {
public partial class Allegati {
/// <summary>
/// Controllo mod_allegatiInterv.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::PUB.WebUserContols.mod_allegatiInterv mod_allegatiInterv;
}
}
+8
View File
@@ -177,6 +177,7 @@
<Content Include="jumper.aspx" />
<Content Include="Login.aspx" />
<Content Include="MainMenu.aspx" />
<Content Include="PAM\Allegati.aspx" />
<Content Include="PAM\Conclusi.aspx" />
<Content Include="PAM\Condomini.aspx" />
<Content Include="PAM\Default.aspx" />
@@ -404,6 +405,13 @@
<Compile Include="MainMenu.aspx.designer.cs">
<DependentUpon>MainMenu.aspx</DependentUpon>
</Compile>
<Compile Include="PAM\Allegati.aspx.cs">
<DependentUpon>Allegati.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PAM\Allegati.aspx.designer.cs">
<DependentUpon>Allegati.aspx</DependentUpon>
</Compile>
<Compile Include="PAM\Conclusi.aspx.cs">
<DependentUpon>Conclusi.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+5 -1
View File
@@ -3,8 +3,12 @@
<asp:Content ID="Content1" ContentPlaceHolderID="JumboTronContent" runat="server">
<uc1:mod_statusRowPAM runat="server" id="mod_statusRowPAM" />
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="NoAjaxContent" runat="server">
<asp:ContentPlaceHolder ID="NoAjaxContent" runat="server">
</asp:ContentPlaceHolder>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</asp:Content>
+9
View File
@@ -21,6 +21,15 @@ namespace PUB {
/// </remarks>
protected global::PUB.WebUserContols.mod_statusRowPAM mod_statusRowPAM;
/// <summary>
/// Controllo NoAjaxContent.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder NoAjaxContent;
/// <summary>
/// Controllo MainContent.
/// </summary>
+19 -33
View File
@@ -17,41 +17,41 @@
</div>
</div>
</asp:HyperLink>
</div>
<%--<div class="col p-1" runat="server" id="divDetail">
<asp:HyperLink runat="server" ID="HyperLink2" NavigateUrl="~/PAM/DettaglioIntervento" CssClass="btn btn-light text-default btn-block p-1">
</div>
<div class="col p-1" runat="server" id="divDetail">
<asp:HyperLink runat="server" ID="hlDetail" NavigateUrl="~/PAM/DettaglioIntervento?idxRichiesta=" CssClass="btn btn-light text-success btn-block p-1">
<div class="d-flex align-items-left">
<div class="icona px-1 small">
<i class="fas fa-tachometer-alt text-default"></i>
<i class="fas fa-search text-default"></i>
</div>
<div class="px-2 text-left">
<div class="text-secondary">
<b>Dashboard</b> amministratore
<b>Dettaglio</b> Richiesta
</div>
<div class="text-primary text-uppercase">
<b><%: nomeAmm %></b>
<div class="text-success text-uppercase">
<b>num. <%: idxRichiesta %></b>
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divFiles">
<asp:HyperLink runat="server" ID="HyperLink3" NavigateUrl="~/PAM/Allegati" CssClass="btn btn-light text-default btn-block p-1">
<asp:HyperLink runat="server" ID="hlFiles" NavigateUrl="~/PAM/Allegati?idxRichiesta=" CssClass="btn btn-light text-success btn-block p-1">
<div class="d-flex align-items-left">
<div class="icona px-1 small">
<i class="fas fa-tachometer-alt text-default"></i>
<i class="fas fa-file-alt text-default"></i>
</div>
<div class="px-2 text-left">
<div class="text-secondary">
<b>Dashboard</b> amministratore
<b>Allegati</b> Richiesta
</div>
<div class="text-primary text-uppercase">
<b><%: nomeAmm %></b>
<div class="text-success text-uppercase">
<b>num. <%: idxRichiesta %></b>
</div>
</div>
</div>
</asp:HyperLink>
</div>--%>
</div>
<asp:Repeater ID="repStats" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="col p-1" runat="server" id="divCond" visible='<%# (bool)(titolo=="MyDashboard") %>'>
@@ -69,9 +69,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divRich" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divRich" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="hlRichieste" NavigateUrl="~/PAM/Richieste" CssClass="btn btn-light text-danger btn-block p-1">
<div class="d-flex align-items-left">
<div class="icona px-1 small">
@@ -85,9 +83,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divInterv" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divInterv" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="hlAziende" NavigateUrl="~/PAM/Interventi" CssClass="btn btn-light text-warning btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -101,9 +97,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divSospese" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divSospese" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="HyperLink5" NavigateUrl="~/PAM/Sospesi" CssClass="btn btn-light text-danger btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -117,9 +111,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divChiusi" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divChiusi" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="hlInterventi" NavigateUrl="~/PAM/Conclusi" CssClass="btn btn-light text-success btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -133,9 +125,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divFatt" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divFatt" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="HyperLink7" NavigateUrl="~/PAM/Fatture" CssClass="btn btn-light text-success btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -150,11 +140,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.PAM_DashStatsTableAdapter">
</asp:HyperLink></div></ItemTemplate></asp:Repeater><asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.PAM_DashStatsTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
</SelectParameters>
@@ -7,7 +7,30 @@ namespace PUB.WebUserContols
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
fixLinks();
}
}
/// <summary>
/// Sistema i link (visibilità ed URL)
/// </summary>
private void fixLinks()
{
divDetail.Visible = (titolo != "MyDashboard" && titolo != "DettaglioIntervento");
divFiles.Visible = (titolo != "MyDashboard" && titolo != "Allegati");
hlDetail.NavigateUrl = string.Format("~/PAM/DettaglioIntervento?idxRichiesta={0}", idxRichiesta);
hlFiles.NavigateUrl = string.Format("~/PAM/Allegati?idxRichiesta={0}", idxRichiesta);
}
public int idxRichiesta
{
get
{
int answ = 0;
int.TryParse(Request.QueryString["idxRichiesta"], out answ);
return answ;
}
}
/// <summary>
/// titolo pagina
+36
View File
@@ -30,6 +30,42 @@ namespace PUB.WebUserContols {
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink HyperLink1;
/// <summary>
/// Controllo divDetail.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail;
/// <summary>
/// Controllo hlDetail.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlDetail;
/// <summary>
/// Controllo divFiles.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFiles;
/// <summary>
/// Controllo hlFiles.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlFiles;
/// <summary>
/// Controllo repStats.
/// </summary>
+6 -21
View File
@@ -69,9 +69,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divRich" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divRich" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="hlRichieste" NavigateUrl="~/PAZ/Richieste" CssClass="btn btn-light text-danger btn-block p-1">
<div class="d-flex align-items-left">
<div class="icona px-1 small">
@@ -85,9 +83,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divInterv" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divInterv" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="hlAziende" NavigateUrl="~/PAZ/Interventi" CssClass="btn btn-light text-warning btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -101,9 +97,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divSospese" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divSospese" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="HyperLink3" NavigateUrl="~/PAZ/Sospesi" CssClass="btn btn-light text-danger btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -117,9 +111,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divChiusi" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divChiusi" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="hlInterventi" NavigateUrl="~/PAZ/Conclusi" CssClass="btn btn-light text-success btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -133,9 +125,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
<div class="col p-1" runat="server" id="divFatt" visible='<%# (bool)(titolo=="MyDashboard") %>'>
</asp:HyperLink></div><div class="col p-1" runat="server" id="divFatt" visible='<%# (bool)(titolo=="MyDashboard") %>'>
<asp:HyperLink runat="server" ID="HyperLink2" NavigateUrl="~/PAZ/Fatture" CssClass="btn btn-light text-success btn-block p-1">
<div class="d-flex align-items-center">
<div class="icona px-1 small">
@@ -150,12 +140,7 @@
</div>
</div>
</div>
</asp:HyperLink>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.PAZ_DashStatsTableAdapter">
</asp:HyperLink></div></ItemTemplate></asp:Repeater></div><asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.PAZ_DashStatsTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="idxFornitore" SessionField="idxFornitore" Type="Int32" />
</SelectParameters>