Fix grafico Dashboard + aggiunto elemento Ciclo Attivo

This commit is contained in:
Samuele E. Locatelli
2018-05-04 21:27:01 +02:00
parent d9d365f053
commit bcbbae27cb
9 changed files with 94 additions and 26 deletions
+12 -9
View File
@@ -5,27 +5,30 @@
<%@ Register Src="~/WebUserContols/mod_warnings.ascx" TagPrefix="uc1" TagName="mod_warnings" %>
<%@ Register Src="~/WebUserContols/mod_graficiRow.ascx" TagPrefix="uc1" TagName="mod_graficiRow" %>
<%@ Register Src="~/WebUserContols/mod_inScadenza.ascx" TagPrefix="uc1" TagName="mod_inScadenza" %>
<%@ Register Src="~/WebUserContols/mod_contabilita.ascx" TagPrefix="uc1" TagName="mod_contabilita" %>
<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
<div class="jumbotron p-2">
<div class="jumbotron p-2 my-1">
<uc1:mod_statusRow runat="server" ID="mod_statusRow" />
</div>
<div class="container-fluid mt-3 bg-light">
<div class="container-fluid my-1 bg-light">
<div class="row p-2">
<div class="col-12 my-1">
</div>
<div class="col-12 my-1">
<div class="col-sm-8 my-1">
<uc1:mod_graficiRow runat="server" ID="mod_graficiRow" />
</div>
<div class="col-sm-4">
<div class="col-sm-4 my-1">
<uc1:mod_inCorso runat="server" ID="mod_inCorso" />
</div>
<div class="col-sm-4">
<div class="col-sm-4 my-1">
<uc1:mod_warnings runat="server" ID="mod_warnings" />
</div>
<div class="col-sm-4 my-1">
<uc1:mod_inScadenza runat="server" ID="mod_inScadenza" />
</div>
<div class="col-sm-4">
<uc1:mod_warnings runat="server" ID="mod_warnings" />
<div class="col-sm-4 my-1">
<uc1:mod_contabilita runat="server" id="mod_contabilita" />
</div>
</div>
</div>
+11 -2
View File
@@ -39,6 +39,15 @@ namespace PUB.PBO {
/// </remarks>
protected global::PUB.WebUserContols.mod_inCorso mod_inCorso;
/// <summary>
/// Controllo mod_warnings.
/// </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_warnings mod_warnings;
/// <summary>
/// Controllo mod_inScadenza.
/// </summary>
@@ -49,12 +58,12 @@ namespace PUB.PBO {
protected global::PUB.WebUserContols.mod_inScadenza mod_inScadenza;
/// <summary>
/// Controllo mod_warnings.
/// Controllo mod_contabilita.
/// </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_warnings mod_warnings;
protected global::PUB.WebUserContols.mod_contabilita mod_contabilita;
}
}
+8
View File
@@ -199,6 +199,7 @@
<Content Include="WebUserContols\mod_anagAziende.ascx" />
<Content Include="WebUserContols\mod_anagCondomini.ascx" />
<Content Include="WebUserContols\mod_anagServizi.ascx" />
<Content Include="WebUserContols\mod_contabilita.ascx" />
<Content Include="WebUserContols\mod_graficiRow.ascx" />
<Content Include="WebUserContols\mod_inCorso.ascx" />
<Content Include="WebUserContols\mod_inScadenza.ascx" />
@@ -369,6 +370,13 @@
<Compile Include="WebUserContols\mod_anagServizi.ascx.designer.cs">
<DependentUpon>mod_anagServizi.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserContols\mod_contabilita.ascx.cs">
<DependentUpon>mod_contabilita.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserContols\mod_contabilita.ascx.designer.cs">
<DependentUpon>mod_contabilita.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserContols\mod_graficiRow.ascx.cs">
<DependentUpon>mod_graficiRow.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+18
View File
@@ -0,0 +1,18 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_contabilita.ascx.cs" Inherits="PUB.WebUserContols.mod_contabilita" %>
<div class="card">
<h5 class="card-header alert alert-success text-uppercase"><a href="#detailContab" data-toggle="collapse">Ciclo Attivo</a></h5>
<div class="card-body collapse" id="detailContab">
<h5 class="card-title">Gestione Contabile</h5>
<ul>
<li>Periodo</li>
<li>Fatture da Emettere</li>
<li>Fatture Emesse</li>
<li>Fatture Scadute</li>
<li>Fatture Emesse</li>
<li>Fatture Scadute</li>
</ul>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-success">Gestione Fatture</a>
</div>
</div>
@@ -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.WebUserContols
{
public partial class mod_contabilita : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+15
View File
@@ -0,0 +1,15 @@
//------------------------------------------------------------------------------
// <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.WebUserContols {
public partial class mod_contabilita {
}
}
+8 -10
View File
@@ -1,13 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_graficiRow.ascx.cs" Inherits="PUB.WebUserContols.mod_graficiRow" %>
<div class="container">
<div class="row">
<div class="col-sm-8">
<img src="../images/GraphDemo.png" class="img-fluid" alt="Responsive image" />
</div>
<div class="col-sm-4">
<img src="../images/RadarDemo.png" class="img-fluid" alt="Responsive image" />
<br />
<img src="../images/ParetoDemo.png" class="img-fluid" alt="Responsive image" />
</div>
<div class="row">
<div class="col-sm-8">
<img src="../images/GraphDemo.png" class="img-fluid" alt="Responsive image" />
</div>
<div class="col-sm-4">
<img src="../images/RadarDemo.png" class="img-fluid" alt="Responsive image" />
<br />
<img src="../images/ParetoDemo.png" class="img-fluid" alt="Responsive image" />
</div>
</div>
+2 -2
View File
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_inScadenza.ascx.cs" Inherits="PUB.WebUserContols.mod_inScadenza" %>
<div class="card">
<h5 class="card-header alert alert-warning text-uppercase">Scadenze</h5>
<div class="card-body">
<h5 class="card-header alert alert-warning text-uppercase"><a href="#detailScad" data-toggle="collapse">Scadenze</a></h5>
<div class="card-body collapse" id="detailScad">
<h5 class="card-title">Elenco scadenze attive</h5>
<ul>
<li>Prima scadenza</li>
+3 -3
View File
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_warnings.ascx.cs" Inherits="PUB.WebUserContols.mod_warnings" %>
<div class="card">
<h5 class="card-header alert alert-danger text-uppercase">Avvisi</h5>
<div class="card-body">
<h5 class="card-header alert alert-danger text-uppercase"><a href="#detailWarnings" data-toggle="collapse">Avvisi</a></h5>
<div class="card-body collapse" id="detailWarnings">
<h5 class="card-title">Avvisi importanti</h5>
<ul>
<li>Prima scadenza</li>
@@ -15,4 +15,4 @@
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-danger">Gestione Avvisi</a>
</div>
</div>
</div>