diff --git a/Transportes/RepContratosCalendario.aspx b/Transportes/RepContratosCalendario.aspx index aa7504d5c..a2ecaae35 100644 --- a/Transportes/RepContratosCalendario.aspx +++ b/Transportes/RepContratosCalendario.aspx @@ -21,7 +21,7 @@ #chartdiv { width: 100%; - height: 700px; + height: 600px; } @@ -280,36 +280,33 @@ - - -
-
-
- -
-
-
- - -
- - - - + +
+
+
+ +
+
+
+ +
+ + + + +
+
-
-
- - + +
-
+
- @@ -526,7 +523,6 @@ "February": "Febrero", "March": "Marzo", "April": "Abril", - "May": "Mayo", "June": "Junio", "July": "Julio", "August": "Agosto", @@ -537,7 +533,7 @@ }; - function cargaDiagramaGrant(data, categorias) { + function cargaDiagramaGrant(data, categorias, TipoVista) { am5.ready(function () { //SI YA HAY GRAFICA, QUITA LA ACTUAL PARA HACER UNA NUEVA @@ -566,7 +562,7 @@ layout: root.verticalLayout, paddingLeft: 0 })); - + // Add legend // https://www.amcharts.com/docs/v5/charts/xy-chart/legend-xy-series/ var legend = chart.children.push(am5.Legend.new(root, { @@ -650,23 +646,24 @@ chart.set("scrollbarY", scrollbarY); - /// evento para ajustar el alto del row - var cellSize = 30; - chart.events.on("datavalidated", function (ev) { + + series.events.on("datavalidated", function (ev) { + let cellSize = 45; - // Get objects of interest - var chart = ev.target; - var categoryAxis = chart.yAxes.getIndex(0); + if (TipoVista == 1) { + cellSize = 60; + } + //let series = ev.target; + //let chart = series.chart; + let xAxis = chart.xAxes.getIndex(0); // Calculate how we need to adjust chart height - var adjustHeight = chart.data.length * cellSize - categoryAxis.pixelHeight; - - // get current chart height - var targetHeight = chart.pixelHeight + adjustHeight; + let chartHeight = categorias.length * cellSize + xAxis.height() + chart.get("paddingTop", 0) + chart.get("paddingBottom", 0); // Set it on chart's container - chart.svgContainer.htmlElement.style.height = targetHeight + "px"; + chart.root.dom.style.height = chartHeight + "px"; }); + //root.language.setTranslationAny("May", "Mayo"); // Make stuff animate on load // https://www.amcharts.com/docs/v5/concepts/animations/ @@ -713,12 +710,12 @@ if (event.NombreComercial !== null) { - $('#HidModClienteNombre').val(''); + $('#HidModClienteNombre').val(''); } else { $('#HidModClienteNombre').val(event.NombreComercial); - } + } - $('#HidModCveCliente').val(event.CveCliente); + $('#HidModCveCliente').val(event.CveCliente); $('#<%=BtnModal.ClientID%>').click(); } diff --git a/Transportes/RepContratosCalendario.aspx.vb b/Transportes/RepContratosCalendario.aspx.vb index 81f09aa7f..bff2a01e6 100644 --- a/Transportes/RepContratosCalendario.aspx.vb +++ b/Transportes/RepContratosCalendario.aspx.vb @@ -103,7 +103,7 @@ Partial Class RepContratosCalendario jsonCategorias.Add(obj) Next - RegistraScript($"cargaDiagramaGrant({jsonData.ToString()},{jsonCategorias.ToString()});", "A1") + RegistraScript($"cargaDiagramaGrant({jsonData.ToString()},{jsonCategorias.ToString()},{TipoVista});", "A1") UPPGantt.Update() End If End Sub