--FIX recarga de diagrama

--poner código en el renglón
This commit is contained in:
2024-04-12 17:25:14 -07:00
parent 22742cc055
commit 1d58181e3a
2 changed files with 66 additions and 55 deletions

View File

@@ -485,16 +485,9 @@
<script src="https://cdn.amcharts.com/lib/5/xy.js"></script> <script src="https://cdn.amcharts.com/lib/5/xy.js"></script>
<script src="https://cdn.amcharts.com/lib/5/themes/Animated.js"></script> <script src="https://cdn.amcharts.com/lib/5/themes/Animated.js"></script>
<script> <script>
function cargaDiagramaGrant(data, categorias) {
am5.ready(function () {
// Create root element // Create root element
// https://www.amcharts.com/docs/v5/getting-started/#Root_element // https://www.amcharts.com/docs/v5/getting-started/#Root_element
var root = am5.Root.new("chartdiv"); var root = am5.Root.new("chartdiv");
root.dateFormatter.setAll({
dateFormat: "dd/MM/yyyy HH:mm",
dateFields: ["valueX", "openValueX"]
});
var am5locales_es_ES = { var am5locales_es_ES = {
"Jan": "Enero", "Jan": "Enero",
@@ -523,12 +516,18 @@
"November": "Noviembre", "November": "Noviembre",
"December": "Diciembre", "December": "Diciembre",
} };
//root.language.setTranslationsAny({ function cargaDiagramaGrant(data, categorias) {
// "January!": "¡Hola!",
// "Bye": "Adios" am5.ready(function () {
//}); //SI YA HAY GRAFICA, QUITA LA ACTUAL PARA HACER UNA NUEVA
root.container.children.clear();
root.dateFormatter.setAll({
dateFormat: "dd/MM/yyyy HH:mm",
dateFields: ["valueX", "openValueX"]
});
root.locale = am5locales_es_ES; root.locale = am5locales_es_ES;
@@ -549,7 +548,6 @@
paddingLeft: 0 paddingLeft: 0
})); }));
// Add legend // Add legend
// https://www.amcharts.com/docs/v5/charts/xy-chart/legend-xy-series/ // https://www.amcharts.com/docs/v5/charts/xy-chart/legend-xy-series/
var legend = chart.children.push(am5.Legend.new(root, { var legend = chart.children.push(am5.Legend.new(root, {
@@ -577,16 +575,20 @@
yAxis.data.setAll(categorias); yAxis.data.setAll(categorias);
var xAxis = chart.xAxes.push( var dateAxis = am5xy.DateAxis.new(root, {
am5xy.DateAxis.new(root, {
baseInterval: { timeUnit: "minute", count: 1 }, baseInterval: { timeUnit: "minute", count: 1 },
renderer: am5xy.AxisRendererX.new(root, { renderer: am5xy.AxisRendererX.new(root, {
minorGridEnabled: true, minorGridEnabled: true,
minGridDistance: 90 minGridDistance: 90
}) })
}) });
var xAxis = chart.xAxes.push(
dateAxis
); );
chart.topAxesContainer.children.push(dateAxis);
// Add series // Add series
// https://www.amcharts.com/docs/v5/charts/xy-chart/series/ // https://www.amcharts.com/docs/v5/charts/xy-chart/series/
var series = chart.series.push(am5xy.ColumnSeries.new(root, { var series = chart.series.push(am5xy.ColumnSeries.new(root, {
@@ -611,9 +613,17 @@
series.data.setAll(data); series.data.setAll(data);
// Add scrollbars // Add scrollbars
chart.set("scrollbarX", am5.Scrollbar.new(root, { //chart.set("scrollbarX", am5.Scrollbar.new(root, {
// orientation: "horizontal"
//}));
// Scrollbar X
var scrollbarX = am5.Scrollbar.new(root, {
orientation: "horizontal" orientation: "horizontal"
})); });
chart.set("scrollbarX", scrollbarX);
chart.bottomAxesContainer.children.push(scrollbarX);
// 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/

View File

@@ -63,8 +63,8 @@ Partial Class RepContratosCalendario
If DtAvance IsNot Nothing Then If DtAvance IsNot Nothing Then
For Each Row As DataRow In DtAvance.Rows For Each Row As DataRow In DtAvance.Rows
If String.IsNullOrEmpty(Row("NombreAF").ToString()) Then If String.IsNullOrEmpty(Row("NoSerie").ToString()) Then
Row("NombreAF") = "Unidad no asignada" Row("NoSerie") = "Unidad no asignada"
End If End If
Next Next
@@ -74,22 +74,23 @@ Partial Class RepContratosCalendario
Dim random = New Random() Dim random = New Random()
'DATOS 'DATOS
For Each Row As DataRow In DtAvance.FiltraParametros("NombreAF <> ''").Rows For Each Row As DataRow In DtAvance.FiltraParametros("NoSerie <> ''").Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("NombreAF")), New JProperty("category", Row("NoSerie")),
New JProperty("fromDate", Row("FechaInicial").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()), New JProperty("fromDate", Row("FechaInicial").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()),
New JProperty("toDate", Row("FechaFinal").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()), New JProperty("toDate", Row("FechaFinal").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()),
New JProperty("columnSettings", New JObject( New JProperty("columnSettings", New JObject(
New JProperty("fill", String.Format("#{0:X6}", random.Next(16777216))) New JProperty("fill", String.Format("#{0:X6}", random.Next(16777216)))
)) )),
New JProperty("task", Row("NombreAF"))
) )
jsonData.Add(obj) jsonData.Add(obj)
Next Next
'CATEGORIAS 'CATEGORIAS
For Each Row As DataRow In DtAvance.FiltraParametros("NombreAF <> ''", "", {"NombreAF"}).Rows For Each Row As DataRow In DtAvance.FiltraParametros("NoSerie <> ''", "", {"NoSerie"}).Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("NombreAF")) New JProperty("category", Row("NoSerie"))
) )
jsonCategorias.Add(obj) jsonCategorias.Add(obj)
Next Next