diff --git a/Contabilidad2/RepEstadoResultadosHorizontal.aspx b/Contabilidad2/RepEstadoResultadosHorizontal.aspx
index 042341e93..3b9cb9c02 100644
--- a/Contabilidad2/RepEstadoResultadosHorizontal.aspx
+++ b/Contabilidad2/RepEstadoResultadosHorizontal.aspx
@@ -1397,40 +1397,40 @@
$('.LblTituloGraficaGral').text(Titulo);
cargaGraficaBarras2();
}
- function cargaGraficaBarras2() {
-
+ function cargaGraficaBarras2() {
+
//Hypgrafica
- $("#DivModalGraficaGral").modal();
- let infogral = $('#grafInfo');
- infogral.find('>*').remove();
- let items = []
- let data;
- let icolor = 0;
- let tipografica = $('.rdblistgrafica input:checked').val();
-
- $('.ajax__tab_panel:visible .chkgraf input:checked').each(function () {
+ $("#DivModalGraficaGral").modal();
+ let infogral = $('#grafInfo');
+ infogral.find('>*').remove();
+ let items = []
+ let data;
+ let icolor = 0;
+ let tipografica = $('.rdblistgrafica input:checked').val();
+
+ $('.ajax__tab_panel:visible .chkgraf input:checked').each(function () {
data = $(this).closest('tr').find('.Hypgrafica').data('values')
- let name = $(this).closest('td').text().trim()
+ let name = $(this).closest('td').text().trim()
items.push({ id: icolor, data: data, name: name, Color: Colores[icolor], tipografica })
gettitlegraf(infogral, icolor, Colores[icolor], name, tipografica);
icolor = icolor + 1;
if (icolor >= Colores.length) { icolor = 0; }
- });
- objetos = items;
-
+ });
+ objetos = items;
+
$(".chkonchange input").each(function () {
let _this = $(this)
_this.change(function () {
let _this = $(this)
let id = Number(_this.data('id'))
- objetos[id].tipografica = _this.is(':checked') ? 1 : 2;
+ objetos[id].tipografica = _this.is(':checked') ? 1 : 2;
ShowGraf2();
})
- });
+ });
$(function () {
$('.chkonchange').tooltip()
- });
- ShowGraf2();
+ });
+ ShowGraf2();
}
function gettitlegraf(infogral, id, Color, name, tipografica) {
let strtipografica = '';
@@ -1444,28 +1444,28 @@
/*contenedor.append(divcolspan);*/ contenedor.append(divcolor); contenedor.append(divtexto); contenedor.append(divtipografica);
}
function ShowGraf2() {
- let items = objetos;
- let series = [];
- if (items) {
- data = items[0].data;
- series.push((
- (items[0].tipografica == 1) ?
- {
- "balloonText": "[[title]]: [[value]] [[Moneda]]",
- "colorField": "Color",
- "fillAlphas": 1,
- "lineAlpha": 0.1,
- "type": "column",
- "title": items[0].name,
- "valueField": 'Valor'
+ let items = objetos;
+ let series = [];
+ if (items) {
+ data = items[0].data;
+ series.push((
+ (items[0].tipografica == 1) ?
+ {
+ "balloonText": "[[title]]: [[value]] [[Moneda]]",
+ "colorField": "Color",
+ "fillAlphas": 1,
+ "lineAlpha": 0.1,
+ "type": "column",
+ "title": items[0].name,
+ "valueField": 'Valor'
} :
{
- "balloonText": "[[title]]: [[value]] [[Moneda]]",
+ "balloonText": "[[title]]: [[value]] [[Moneda]]",
"colorField": "Color",
"bullet": "round",
"dashLength": 3,
- "colorField": "color",
- "type": "line",
+ "colorField": "color",
+ "type": "line",
"title": items[0].name,
"valueField": "Valor"
}
@@ -1475,7 +1475,7 @@
data[i]['Color'] = items[0].Color
}
- for (var indexcol = 1; indexcol < items.length; indexcol++) {
+ for (var indexcol = 1; indexcol < items.length; indexcol++) {
let cdatos = items[indexcol].data;
let valueField = 'Valor' + indexcol;
let colorField = 'Color' + indexcol;
@@ -1483,109 +1483,109 @@
for (var i = 0; i < cdatos.length; i++) {
data[i][valueField] = cdatos[i].Valor
data[i][colorField] = items[indexcol].Color
- }
- series.push((
- (items[indexcol].tipografica == 1) ?
- {
- "balloonText": "[[title]]: [[value]] [[Moneda]]",
- "colorField": colorField,
- "fillAlphas": 1,
- "lineAlpha": 0.1,
- "type": "column",
- "title": items[indexcol].name,
- "valueField": valueField
+ }
+ series.push((
+ (items[indexcol].tipografica == 1) ?
+ {
+ "balloonText": "[[title]]: [[value]] [[Moneda]]",
+ "colorField": colorField,
+ "fillAlphas": 1,
+ "lineAlpha": 0.1,
+ "type": "column",
+ "title": items[indexcol].name,
+ "valueField": valueField
} :
{
- "balloonText": "[[title]]: [[value]] [[Moneda]]",
+ "balloonText": "[[title]]: [[value]] [[Moneda]]",
"colorField": colorField,
"bullet": "round",
"dashLength": 3,
- "colorField": "color",
- "type": "line",
+ "colorField": "color",
+ "type": "line",
"title": items[indexcol].name,
"valueField": valueField
- }
- ));
- }
- var chart = AmCharts.makeChart("chartdivgral", {
- "type": "serial",
- "theme": "light",
- "dataProvider": data,
- "startDuration": 2, "legend": {
-
- "generateFromData": true // "data": data.map(function(num) { return {title:num.Texto ,color:num.Color}; })
- },
- "valueAxes": [{
- "position": "left",
- "title": "Ventas"
- }],
- "graphs": series,
- "depth3D": 20,
- "angle": 30,
- "chartCursor": {
- "categoryBalloonEnabled": false,
- "cursorAlpha": 0,
- "zoomable": false
- },
- "categoryField": "Texto",
- "categoryAxis": {
- "gridPosition": "start",
- "labelRotation": 90
- },
- "export": {
- "enabled": true
- }
- });
+ }
+ ));
+ }
+ var chart = AmCharts.makeChart("chartdivgral", {
+ "type": "serial",
+ "theme": "light",
+ "dataProvider": data,
+ "startDuration": 2, "legend": {
+
+ "generateFromData": true // "data": data.map(function(num) { return {title:num.Texto ,color:num.Color}; })
+ },
+ "valueAxes": [{
+ "position": "left",
+ "title": "Ventas"
+ }],
+ "graphs": series,
+ "depth3D": 20,
+ "angle": 30,
+ "chartCursor": {
+ "categoryBalloonEnabled": false,
+ "cursorAlpha": 0,
+ "zoomable": false
+ },
+ "categoryField": "Texto",
+ "categoryAxis": {
+ "gridPosition": "start",
+ "labelRotation": 90
+ },
+ "export": {
+ "enabled": true
+ }
+ });
}
}
function initamgrafica() {
- AmCharts.addInitHandler(function (chart) {
- function handleCustomMarkerToggle(legendEvent) {
- var dataProvider = legendEvent.chart.dataProvider;
- var itemIndex;
- legendEvent.chart.toggleLegend = true;
- if (undefined !== legendEvent.dataItem.hidden && legendEvent.dataItem.hidden) {
- legendEvent.dataItem.hidden = false;
- dataProvider.push(legendEvent.dataItem.storedObj);
- legendEvent.dataItem.storedObj = undefined;
- dataProvider.sort(function (lhs, rhs) {
- return lhs.dataIdx - rhs.dataIdx;
- });
- } else {
- legendEvent.dataItem.hidden = true;
- for (var i = 0; i < dataProvider.length; ++i) {
- if (dataProvider[i].dataIdx === legendEvent.dataItem.dataIdx) {
- itemIndex = i;
- break;
- }
- }
- legendEvent.dataItem.storedObj = dataProvider[itemIndex];
- dataProvider.splice(itemIndex, 1);
- }
- legendEvent.chart.validateData();
- }
- if (!chart.legend || !chart.legend.enabled || !chart.legend.generateFromData) {
- return;
- }
- var categoryField = chart.categoryField;
- var colorField = chart.graphs[0].lineColorField || chart.graphs[0].fillColorsField || chart.graphs[0].colorField;
- var legendData = chart.dataProvider.map(function (data, idx) {
- var markerData = {
- "title": data[categoryField],
- "color": data[colorField],
- "dataIdx": idx
- };
- if (!markerData.color) {
- markerData.color = chart.graphs[0].lineColor;
- }
- data.dataIdx = idx;
- return markerData;
- });
-
- chart.legend.data = legendData;
- chart.legend.switchable = true;
- chart.legend.addListener("clickMarker", handleCustomMarkerToggle);
-
+ AmCharts.addInitHandler(function (chart) {
+ function handleCustomMarkerToggle(legendEvent) {
+ var dataProvider = legendEvent.chart.dataProvider;
+ var itemIndex;
+ legendEvent.chart.toggleLegend = true;
+ if (undefined !== legendEvent.dataItem.hidden && legendEvent.dataItem.hidden) {
+ legendEvent.dataItem.hidden = false;
+ dataProvider.push(legendEvent.dataItem.storedObj);
+ legendEvent.dataItem.storedObj = undefined;
+ dataProvider.sort(function (lhs, rhs) {
+ return lhs.dataIdx - rhs.dataIdx;
+ });
+ } else {
+ legendEvent.dataItem.hidden = true;
+ for (var i = 0; i < dataProvider.length; ++i) {
+ if (dataProvider[i].dataIdx === legendEvent.dataItem.dataIdx) {
+ itemIndex = i;
+ break;
+ }
+ }
+ legendEvent.dataItem.storedObj = dataProvider[itemIndex];
+ dataProvider.splice(itemIndex, 1);
+ }
+ legendEvent.chart.validateData();
+ }
+ if (!chart.legend || !chart.legend.enabled || !chart.legend.generateFromData) {
+ return;
+ }
+ var categoryField = chart.categoryField;
+ var colorField = chart.graphs[0].lineColorField || chart.graphs[0].fillColorsField || chart.graphs[0].colorField;
+ var legendData = chart.dataProvider.map(function (data, idx) {
+ var markerData = {
+ "title": data[categoryField],
+ "color": data[colorField],
+ "dataIdx": idx
+ };
+ if (!markerData.color) {
+ markerData.color = chart.graphs[0].lineColor;
+ }
+ data.dataIdx = idx;
+ return markerData;
+ });
+
+ chart.legend.data = legendData;
+ chart.legend.switchable = true;
+ chart.legend.addListener("clickMarker", handleCustomMarkerToggle);
+
}, ["serial"]);
}