--V&A Cambios en cronograma

This commit is contained in:
2024-04-19 18:00:14 -07:00
parent 0b7b21c1f4
commit d60bd65e5f
2 changed files with 17 additions and 9 deletions

View File

@@ -21,7 +21,7 @@
#chartdiv { #chartdiv {
width: 100%; width: 100%;
height: 500px; height: 700px;
} }
</style> </style>
</asp:Content> </asp:Content>
@@ -613,9 +613,15 @@
orientation: "horizontal" orientation: "horizontal"
}); });
var scrollbarY = am5.Scrollbar.new(root, {
orientation: "vertical"
});
chart.set("scrollbarX", scrollbarX); chart.set("scrollbarX", scrollbarX);
chart.bottomAxesContainer.children.push(scrollbarX); chart.bottomAxesContainer.children.push(scrollbarX);
chart.set("scrollbarY", scrollbarY);
// Make stuff animate on load // Make stuff animate on load
// https://www.amcharts.com/docs/v5/concepts/animations/ // https://www.amcharts.com/docs/v5/concepts/animations/
series.appear(); series.appear();

View File

@@ -62,11 +62,13 @@ Partial Class RepContratosCalendario
Private Sub CargaCronograma() Private Sub CargaCronograma()
If DtAvance IsNot Nothing Then If DtAvance IsNot Nothing Then
For Each Row As DataRow In DtAvance.Rows Dim DtUnidades As DataTable = GlobalDTActivoFijos(UsuarioActual.CveEmpresa).FiltraParametros("Codigo <> '' AND MedidaVehicular IN (2,3)", "Codigo", {"Codigo"})
If String.IsNullOrEmpty(Row("CodigoAF").ToString()) Then
Row("CodigoAF") = "Unidad no asignada" 'For Each Row As DataRow In DtAvance.Rows
End If ' If String.IsNullOrEmpty(Row("CodigoAF").ToString()) Then
Next ' Row("CodigoAF") = "Unidad no asignada"
' End If
'Next
Dim jsonData As New JArray() Dim jsonData As New JArray()
Dim jsonCategorias As New JArray() Dim jsonCategorias As New JArray()
@@ -87,10 +89,10 @@ Partial Class RepContratosCalendario
jsonData.Add(obj) jsonData.Add(obj)
Next Next
'CATEGORIAS 'CATEGORIAS 'AGREGAR TODAS LAS UNIDADES
For Each Row As DataRow In DtAvance.FiltraParametros("CodigoAF <> ''", "", {"CodigoAF"}).Rows For Each Row As DataRow In DtUnidades.Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("CodigoAF")) New JProperty("category", Row("Codigo"))
) )
jsonCategorias.Add(obj) jsonCategorias.Add(obj)
Next Next