Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -384,10 +384,32 @@ Public Class ClsGenerales
|
||||
End Try
|
||||
|
||||
Return ds
|
||||
End Function
|
||||
|
||||
End Function
|
||||
|
||||
Public Function GetDashboardData(CveEmpresa As Integer) As DataSet
|
||||
Dim ds As New DataSet
|
||||
DataAdapter("PA_Gral_DashboardsGet")
|
||||
With SqlAdapter.SelectCommand.Parameters
|
||||
.Add("@Opcion", SqlDbType.Int).Value = 1
|
||||
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
|
||||
.Add("@FechaInicio", SqlDbType.Date).Value = Date.Now.AddYears(-1)
|
||||
.Add("@FechaFin", SqlDbType.Date).Value = Date.Now
|
||||
End With
|
||||
|
||||
Try
|
||||
SqlAdapter.Fill(ds)
|
||||
ds.Tables(0).TableName = "Indicadores"
|
||||
ds.Tables(1).TableName = "DetalleDia"
|
||||
Return ds
|
||||
Catch ex As Exception
|
||||
' Manejo de errores
|
||||
Return Nothing
|
||||
End Try
|
||||
End Function
|
||||
|
||||
|
||||
#End Region
|
||||
|
||||
|
||||
#Region " D I A S I N H A B I L E S "
|
||||
Public Function DiasInhabiles_Add(CveEmpresa As Integer, CveUsuario As Integer, DiaInhabil As String, Descripcion As String, Estatus As Integer, FechaInhabil As Date) As Boolean
|
||||
Dim Retorno As Boolean = False
|
||||
|
||||
@@ -10556,6 +10556,7 @@ Public Class ClsPaginas
|
||||
PaginaDict.Add("/General/CatMedidaEquivalencia.aspx".ToUpper(), 773)
|
||||
PaginaDict.Add("/General/RepIndicadorResumen.aspx".ToUpper(), 110)
|
||||
PaginaDict.Add("/General/SaldosMenores.aspx".ToUpper(), -1)
|
||||
PaginaDict.Add("/General/Dashboard.aspx".ToUpper(), 17)
|
||||
#End Region
|
||||
#Region "GPS"
|
||||
PaginaDict.Add("/GPS/RepTemperatura.aspx".ToUpper(), 681)
|
||||
|
||||
55
General/Dashboard.aspx
Normal file
55
General/Dashboard.aspx
Normal file
@@ -0,0 +1,55 @@
|
||||
<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="Dashboard.aspx.vb" Inherits="General_Dashboard" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="CP" Runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server">
|
||||
<style type="text/css">
|
||||
.dashboard-stat {
|
||||
padding: 15px;
|
||||
margin-bottom: 20px;
|
||||
border-radius: 4px;
|
||||
color: white;
|
||||
}
|
||||
.dashboard-stat .visual > i {
|
||||
font-size: 35px;
|
||||
opacity: 0.3;
|
||||
}
|
||||
.dashboard-stat .details {
|
||||
padding-right: 15px;
|
||||
}
|
||||
.blue { background: #3598dc; }
|
||||
.green { background: #32c5d2; }
|
||||
.purple { background: #8e44ad; }
|
||||
.red { background: #e7505a; }
|
||||
.indicador-valor { font-size: 24px; font-weight: bold; }
|
||||
.indicador-detalle { margin-top: 10px; }
|
||||
</style>
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="E" Runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="HB" Runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content5" ContentPlaceHolderID="H" Runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content6" ContentPlaceHolderID="HA" Runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content7" ContentPlaceHolderID="C" Runat="Server">
|
||||
<asp:UpdatePanel ID="UPDashboard" runat="server">
|
||||
<ContentTemplate>
|
||||
<div class="row" id="DivIndicadores" runat="server">
|
||||
<!-- Aquí se generarán los indicadores -->
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content8" ContentPlaceHolderID="JS" Runat="Server">
|
||||
<script type="text/javascript">
|
||||
function pageLoad() {
|
||||
$(document).ready(function(){
|
||||
// Inicializar tooltips
|
||||
$('.tooltips').tooltip();
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</asp:Content>
|
||||
|
||||
101
General/Dashboard.aspx.vb
Normal file
101
General/Dashboard.aspx.vb
Normal file
@@ -0,0 +1,101 @@
|
||||
|
||||
Imports System.Data
|
||||
Imports Extensiones
|
||||
Imports System.Web.Services
|
||||
Imports Newtonsoft.Json
|
||||
Imports ADSNetLibrary.SIGAPI.Models.CRM.Request
|
||||
Imports ADSNetLibrary.SIGAPI.Services.CRM
|
||||
|
||||
Partial Class General_Dashboard
|
||||
Inherits ClsPaginas
|
||||
|
||||
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If Not IsPostBack Then
|
||||
CargarIndicadores()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub CargarIndicadores()
|
||||
Dim Gral As New ClsGenerales
|
||||
Dim ds As DataSet = Gral.GetDashboardData(UsuarioActual.CveEmpresa)
|
||||
|
||||
If ds IsNot Nothing AndAlso ds.Tables.Count > 0 Then
|
||||
ProcesarDatosIndicadores(ds.Tables(0))
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ProcesarDatosIndicadores(dt As DataTable)
|
||||
If dt.Rows.Count > 0 Then
|
||||
Dim dr As DataRow = dt.Rows(0)
|
||||
|
||||
' Indicador Año
|
||||
MuestraIndicador(DivIndicadores, "blue", "fa fa-calendar", "Año Actual", dr("AcumAño").ToString.FormatoNumero(0), "#", "Acumulado",
|
||||
dr("AcumAñoPromedio").ToString.FormatoNumero(0), "#", "Promedio",
|
||||
dr("AcumAñoContado").ToString.FormatoNumero(0), "#", "Contado",
|
||||
dr("AcumAñoCredito").ToString.FormatoNumero(0), "#", "Crédito")
|
||||
|
||||
' Indicador Mes
|
||||
MuestraIndicador(DivIndicadores, "green", "fa fa-calendar-check-o", "Mes Actual",
|
||||
dr("AcumMes").ToString.FormatoNumero(0), "#", "Acumulado",
|
||||
dr("AcumMesPromedio").ToString.FormatoNumero(0), "#", "Promedio",
|
||||
dr("AcumMesContado").ToString.FormatoNumero(0), "#", "Contado",
|
||||
dr("AcumMesCredito").ToString.FormatoNumero(0), "#", "Crédito")
|
||||
|
||||
' Indicador Semana
|
||||
MuestraIndicador(DivIndicadores, "purple", "fa fa-calendar-minus-o", "Semana Actual",
|
||||
dr("AcumSemana").ToString.FormatoNumero(0), "#", "Acumulado",
|
||||
dr("AcumSemanaPromedio").ToString.FormatoNumero(0), "#", "Promedio",
|
||||
dr("AcumSemanaContado").ToString.FormatoNumero(0), "#", "Contado",
|
||||
dr("AcumSemanaCredito").ToString.FormatoNumero(0), "#", "Crédito")
|
||||
|
||||
|
||||
MuestraIndicador(DivIndicadores, "red", "fa fa-sun-o", "Hoy",
|
||||
"0".FormatoNumero(0), "#", "Acumulado",
|
||||
"0".FormatoNumero(0), "#", "Promedio",
|
||||
"0".FormatoNumero(0), "#", "Contado",
|
||||
"0".FormatoNumero(0), "#", "Crédito")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub MuestraIndicador(DIV As HtmlGenericControl, Color As String, Icono As String, Titulo As String, Comentario As String, Link As String, TitleComentario As String)
|
||||
Dim htmldiv As New StringBuilder
|
||||
htmldiv.AppendFormat("{0}<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12'><div class='dashboard-stat {1}'><div class='visual'><i class='{2}' '=''></i></div>", DIV.InnerHtml, Color, Icono)
|
||||
htmldiv.AppendFormat("<div class='details'><div class='number'>{0}</div><div class='desc'><label class='indicadortipo1 tooltips' data-original-title='{1}'>{2}", Titulo, TitleComentario, Comentario)
|
||||
htmldiv.AppendFormat("</label></div></div><a class='more' href='{0}'>Ver Más <i class='m-icon-swapright m-icon-white'></i></a></div></div>", Link)
|
||||
DIV.InnerHtml = htmldiv.ToString
|
||||
End Sub
|
||||
Private Sub MuestraIndicador(DIV As HtmlGenericControl, Color As String, Icono As String, Titulo As String, C1 As String, CL1 As String, CT1 As String, C2 As String, CL2 As String, CT2 As String)
|
||||
Dim htmldiv As New StringBuilder
|
||||
htmldiv.AppendFormat("{0}<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12'><div class='dashboard-stat {1}'><div class='visual'><i class='{2}' '=''></i></div>", DIV.InnerHtml, Color, Icono)
|
||||
htmldiv.AppendFormat("<div class='details'><div class='number'>{0}</div><div class='desc'>", Titulo)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo2 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT1, C1)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo2 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT2, C2)
|
||||
htmldiv.Append("</div></div><a class='more' href='javascript:;' data-toggle='dropdown' data-hover='dropdown' data-close-others='true' >Ver Más <i class='m-icon-swapright m-icon-white'></i></a>")
|
||||
htmldiv.AppendFormat("<ul class='dropdown-menu pull-right' style='margin:0px;' ><li><a href='{0}'>{1}</a></li><li><a href='{2}'>{3}</a></li>", CL1, CT1, CL2, CT2)
|
||||
htmldiv.Append("</ul></div></div>")
|
||||
DIV.InnerHtml = htmldiv.ToString
|
||||
End Sub
|
||||
Private Sub MuestraIndicador(DIV As HtmlGenericControl, Color As String, Icono As String, Titulo As String, C1 As String, CL1 As String, CT1 As String, C2 As String, CL2 As String, CT2 As String, C3 As String, CL3 As String, CT3 As String)
|
||||
Dim htmldiv As New StringBuilder
|
||||
htmldiv.AppendFormat("{0}<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12'><div class='dashboard-stat {1}'><div class='visual'><i class='{2}' '=''></i></div>", DIV.InnerHtml, Color, Icono)
|
||||
htmldiv.AppendFormat("<div class='details'><div class='number'>{0}</div><div class='desc'><label class='indicadortipo4 col-md-6 tooltips' data-original-title=''></label>", Titulo)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo4 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT1, C1)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo4 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT2, C2)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo4 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT3, C3)
|
||||
htmldiv.Append("</div></div><a class='more' href='javascript:;' data-toggle='dropdown' data-hover='dropdown' data-close-others='true' >Ver Más <i class='m-icon-swapright m-icon-white'></i></a>")
|
||||
htmldiv.AppendFormat("<ul class='dropdown-menu pull-right' style='margin:0px;' ><li><a href='{0}'>{1}</a></li><li><a href='{2}'>{3}</a></li><li><a href='{4}'>{5}</a></li>", CL1, CT1, CL2, CT2, CL3, CT3)
|
||||
htmldiv.Append("</ul></div></div>")
|
||||
DIV.InnerHtml = htmldiv.ToString
|
||||
End Sub
|
||||
Private Sub MuestraIndicador(DIV As HtmlGenericControl, Color As String, Icono As String, Titulo As String, C1 As String, CL1 As String, CT1 As String, C2 As String, CL2 As String, CT2 As String, C3 As String, CL3 As String, CT3 As String, C4 As String, CL4 As String, CT4 As String)
|
||||
Dim htmldiv As New StringBuilder
|
||||
htmldiv.AppendFormat("{0}<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12'><div class='dashboard-stat {1}'><div class='visual'><i class='{2}' '=''></i></div>", DIV.InnerHtml, Color, Icono)
|
||||
htmldiv.AppendFormat("<div class='details'><div class='number'>{0}</div><div class='desc'><label class='indicadortipo4 col-md-6 tooltips' data-original-title='{1}'>{2}</label>", Titulo, CT1, C1)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo4 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT2, C2)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo4 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT3, C3)
|
||||
htmldiv.AppendFormat("<label class='indicadortipo4 col-md-6 tooltips' data-original-title='{0}'>{1}</label>", CT4, C4)
|
||||
htmldiv.AppendFormat("</div></div><a class='more' href='{0}'>Ver Más <i class='m-icon-swapright m-icon-white'></i></a></div></div>", CL1)
|
||||
DIV.InnerHtml = htmldiv.ToString
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -747,7 +747,7 @@ Partial Class Ventas_PVCobranza
|
||||
|
||||
CveVentaRemision = HdnCveVenta.Value.ToEntero
|
||||
|
||||
respFactura = GenerarFactura(CveVendedor, VentaActual, ObjVentas2, ObjClientes, ObservacionesAlmacen, VentaContado, PlazoCobranza, Observaciones, PedidoContrato, OrdenCompra)
|
||||
respFactura = GenerarFactura(tCveCorte, CveVendedor, VentaActual, ObjVentas2, ObjClientes, ObservacionesAlmacen, VentaContado, PlazoCobranza, Observaciones, PedidoContrato, OrdenCompra)
|
||||
|
||||
If respFactura Is Nothing Then
|
||||
MsgError = "Ocurrió un error al generar la factura"
|
||||
@@ -1281,7 +1281,7 @@ Partial Class Ventas_PVCobranza
|
||||
UpL.Update()
|
||||
End Sub
|
||||
|
||||
Private Function GenerarFactura(CveVendedor As Integer, ByRef VentaRemision As Venta, ByRef ObjVentas As ClsVentas, ByRef ObjClientes As ClsClientes, ObservacionesAlmacen As String, VentaConta As Boolean, PlazoCobranza As Integer, Observaciones As String, PedidoContrato As String, OrdenCompra As String) As Modelos.Factura.MMensajeFactura
|
||||
Private Function GenerarFactura(CveCorte As Integer, CveVendedor As Integer, ByRef VentaRemision As Venta, ByRef ObjVentas As ClsVentas, ByRef ObjClientes As ClsClientes, ObservacionesAlmacen As String, VentaConta As Boolean, PlazoCobranza As Integer, Observaciones As String, PedidoContrato As String, OrdenCompra As String) As Modelos.Factura.MMensajeFactura
|
||||
Dim Retorno As Modelos.Factura.MMensajeFactura = Nothing
|
||||
Dim SbAlert As New StringBuilder()
|
||||
Dim SBAmortizaciones As New StringBuilder
|
||||
@@ -1466,6 +1466,8 @@ Partial Class Ventas_PVCobranza
|
||||
End If
|
||||
End If
|
||||
|
||||
ObjFactura.CveCorte = CveCorte
|
||||
|
||||
Retorno = ObjFactura.EmitirFactura(False, Transac:=ObjVentas.IniciaTransacSQL(), Modulo:="Cobranza/GuardarVenta", MostrarURL:=True)
|
||||
Retorno.Factura = ObjFactura
|
||||
|
||||
|
||||
Reference in New Issue
Block a user