diff --git a/Contabilidad/RepAnexoCatalogoCC.aspx b/Contabilidad/RepAnexoCatalogoCC.aspx index 548cdf295..507990549 100644 --- a/Contabilidad/RepAnexoCatalogoCC.aspx +++ b/Contabilidad/RepAnexoCatalogoCC.aspx @@ -359,7 +359,13 @@ let currentid = 1; function HandlerGraf(obj, evt) { $("#DivModalGrafica").modal(); - cdatos = $(obj).data('values'); + + //cdatos = $(obj).data('values'); + + cdatos = $(obj).data('values').sort(function (a, b) { + return b.Valor - a.Valor; + }); + if (currentid == 1) { CargaGraficaBarras(); } else { @@ -369,6 +375,9 @@ } function CargaGraficaBarras() { let data = cdatos; + //let data = cdatos.sort(function (a, b) { + // return b.Valor - a.Valor; + //}); var chart = AmCharts.makeChart("chartdiv", { "type": "serial", "theme": "light", @@ -406,6 +415,11 @@ function CargaGraficaPastel() { let data = cdatos; + + //let data = cdatos.sort(function (a, b) { + // return b.Valor - a.Valor; + //}); + var chart = AmCharts.makeChart("chartdiv", { "type": "pie", "theme": "light", diff --git a/Contabilidad/RepAnexoCatalogoCC.aspx.vb b/Contabilidad/RepAnexoCatalogoCC.aspx.vb index 154ae0b6e..22ce9b1b2 100644 --- a/Contabilidad/RepAnexoCatalogoCC.aspx.vb +++ b/Contabilidad/RepAnexoCatalogoCC.aspx.vb @@ -237,7 +237,7 @@ Partial Class Contabilidad2_RepAnexoCatalogoCC Dim CveCunetaRow As Integer = e.Row.DataKey("CveCuenta").ToEntero If e.Row.Cells(2).Text.ToDecimal <> 0 Then - e.Row.Cells(2).Text = $"{ If(DdlDivisor.SelectedValue.ToEntero > 1, e.Row.Cells(2).Text.ToDecimal.ToString("###,###,##0"), e.Row.Cells(2).Text.ToDecimal.ToString("###,###,###.00")) }" + e.Row.Cells(2).Text = $"{ If(DdlDivisor.SelectedValue.ToEntero > 1, e.Row.Cells(2).Text.ToDecimal.ToString("###,###,##0"), e.Row.Cells(2).Text.ToDecimal.ToString("###,###,###.00")) }" Else e.Row.Cells(2).Text = $"-" End If @@ -255,7 +255,7 @@ Partial Class Contabilidad2_RepAnexoCatalogoCC End If If Importe <> 0 Then - e.Row.Cells(Index).Text = $"{ If(DdlDivisor.SelectedValue.ToEntero > 1, Importe.ToString("###,###,##0"), Importe.ToString("###,###,###.00")) }" + e.Row.Cells(Index).Text = $"{ If(DdlDivisor.SelectedValue.ToEntero > 1, Importe.ToString("###,###,##0"), Importe.ToString("###,###,###.00")) }" End If Index += 1 diff --git a/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx b/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx index 2499e6d64..b39faeb0a 100644 --- a/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx +++ b/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx @@ -51,7 +51,7 @@