-- cambio para highcharts

This commit is contained in:
2025-04-06 20:22:31 -07:00
parent 5d7b4dfebd
commit c4b4481340
4 changed files with 36 additions and 15 deletions

View File

@@ -28,13 +28,17 @@ Public Class BundleConfig
"~/Scripts/gridviewScroll.js",
"~/Metronic/Carusel/slick.min.js",
"~/Metronic/assets/global/plugins/fullcalendar/lib/moment.min.js",
"~/Metronic/assets/global/plugins/fullcalendar/fullcalendar.js",
"~/Scripts/highcharts.js",
"~/Scripts/exporting.js",
"~/Scripts/offline-exporting.js",
"~/Scripts/export-data.js"
))
"~/Metronic/assets/global/plugins/fullcalendar/fullcalendar.js"
))
bundles.Add(New Bundle("~/bundles/highcharts").Include(
"~/Scripts/highcharts/highcharts.js",
"~/Scripts/Highcharts/datagrid.js",
"~/Scripts/Highcharts/dashboards.js",
"~/Scripts/Highcharts/data.js",
"~/Scripts/Highcharts/exporting.js",
"~/Scripts/Highcharts/accessibility.js"
))
bundles.Add(New ScriptBundle("~/Metronic/assets/global/scripts/JSNoCustom").Include(
"~/Metronic/assets/global/plugins/bootstrap/js/bootstrap.min.js",
"~/Metronic/assets/global/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js",
@@ -358,6 +362,12 @@ Public Class BundleConfig
"~/Metronic/assets/global/plugins/codemirror/theme/material.css",
"~/Metronic/assets/global/plugins/codemirror/theme/neo.css",
"~/Metronic/assets/global/plugins/codemirror/addon/hint/show-hint.css"))
'"~/Scripts/Highcharts/layout.js"
End Sub
End Class

View File

@@ -1973,12 +1973,16 @@
<%--<script src="/Metronic/assets/admin/pages/scripts/index.js" type="text/javascript"></script>--%>
<script src="/Metronic/assets/global/plugins/jquery.pulsate.min.js"></script>
<script src="/Scripts/Highcharts/layout.js"></script>
<%-- <script src="/Scripts/Highcharts/datagrid.js"></script>--%>
<%-- <script src="/Scripts/Highcharts/highcharts.js"></script>
<script src="/Scripts/Highcharts/modules/data.js"></script>
<script src="/Scripts/Highcharts/modules/exporting.js"></script>
<script src="/Scripts/Highcharts/modules/accessibility.js"></script>
<script src="/Scripts/Highcharts/modules/dashboards.js"></script>--%>
<script src="https://code.highcharts.com/highcharts.js"></script>
<script src="https://code.highcharts.com/dashboards/datagrid.js"></script>
<script src="https://code.highcharts.com/dashboards/dashboards.js"></script>
<script src="https://code.highcharts.com/dashboards/modules/layout.js"></script>
<script src="https://code.highcharts.com/modules/accessibility.js"></script>
<script type="text/javascript">
function pageLoad() {

View File

@@ -191,7 +191,7 @@ Partial Class Inicio
If UsuarioActual.TienePermisoProceso(343) Then MuestraPsProximosAVencer()
If UsuarioActual.TienePermisoProceso(344) Then MuestraRSCOProximosAVencer()
If UsuarioActual.Empresa.Funcionalidad(578) = "1" Then
If UsuarioActual.Empresa.Funcionalidad(578) = "1" AndAlso UsuarioActual.CveRol.Contiene(1577, 1639, 1573) Then
CargaKPICirugias()
End If
@@ -1629,7 +1629,10 @@ Partial Class Inicio
Opcion = 2 'gerente ventas
End If
If Gral.GetSMSIndicadores(Opcion, "2025/03/01".ToDate, "2025/03/31".ToDate, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then
Dim FechaI As Date = Now.FirstDayOfMonth
Dim FechaF As Date = Now.LastDayOfMonth
If Gral.GetSMSIndicadores(Opcion, FechaI, FechaF, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then
ds = Gral.DataSetResultados
End If
'0-ventas totales, 1-comisiones totales, 2-medicos sin consumo, 3-top10medicos, 4-top5marcas, 5-num pacientes
@@ -1848,7 +1851,7 @@ Partial Class Inicio
fontWeight: 'bold'
}
},style: {
maxHeight: '250px',
maxHeight: '350px',
overflowY: 'auto'
},
credits: { enabled: false }
@@ -2146,7 +2149,7 @@ Partial Class Inicio
fontWeight: 'bold'
}
},style: {
maxHeight: '250px',
maxHeight: '350px',
overflowY: 'auto'
},
credits: { enabled: false }

View File

@@ -694,8 +694,12 @@
<script type="text/javascript" src="/Scripts/jquery.signalR-2.4.1.min.js"></script>
<script type="text/javascript" src="/signalr/signalr/hubs"></script>
<%: Scripts.Render("~/Metronic/assets/global/scripts/JS") %>
<%: Scripts.Render("~/bundles/highcharts") %>
<script type="text/javascript" src="/Scripts/Notificaciones.js?var1=1"></script>
<script type="text/javascript">
NotificacionesADS.init();