diff --git a/Transportes/RepContratosCalendario.aspx b/Transportes/RepContratosCalendario.aspx index b8ab0b757..be43ad1ff 100644 --- a/Transportes/RepContratosCalendario.aspx +++ b/Transportes/RepContratosCalendario.aspx @@ -21,7 +21,7 @@ #chartdiv { width: 100%; - height: 500px; + height: 700px; } @@ -613,9 +613,15 @@ orientation: "horizontal" }); + var scrollbarY = am5.Scrollbar.new(root, { + orientation: "vertical" + }); + chart.set("scrollbarX", scrollbarX); chart.bottomAxesContainer.children.push(scrollbarX); + chart.set("scrollbarY", scrollbarY); + // Make stuff animate on load // https://www.amcharts.com/docs/v5/concepts/animations/ series.appear(); diff --git a/Transportes/RepContratosCalendario.aspx.vb b/Transportes/RepContratosCalendario.aspx.vb index 91813e109..383b245e7 100644 --- a/Transportes/RepContratosCalendario.aspx.vb +++ b/Transportes/RepContratosCalendario.aspx.vb @@ -62,11 +62,13 @@ Partial Class RepContratosCalendario Private Sub CargaCronograma() If DtAvance IsNot Nothing Then - For Each Row As DataRow In DtAvance.Rows - If String.IsNullOrEmpty(Row("CodigoAF").ToString()) Then - Row("CodigoAF") = "Unidad no asignada" - End If - Next + Dim DtUnidades As DataTable = GlobalDTActivoFijos(UsuarioActual.CveEmpresa).FiltraParametros("Codigo <> '' AND MedidaVehicular IN (2,3)", "Codigo", {"Codigo"}) + + 'For Each Row As DataRow In DtAvance.Rows + ' If String.IsNullOrEmpty(Row("CodigoAF").ToString()) Then + ' Row("CodigoAF") = "Unidad no asignada" + ' End If + 'Next Dim jsonData As New JArray() Dim jsonCategorias As New JArray() @@ -87,10 +89,10 @@ Partial Class RepContratosCalendario jsonData.Add(obj) Next - 'CATEGORIAS - For Each Row As DataRow In DtAvance.FiltraParametros("CodigoAF <> ''", "", {"CodigoAF"}).Rows + 'CATEGORIAS 'AGREGAR TODAS LAS UNIDADES + For Each Row As DataRow In DtUnidades.Rows Dim obj As New JObject( - New JProperty("category", Row("CodigoAF")) + New JProperty("category", Row("Codigo")) ) jsonCategorias.Add(obj) Next