Commit 94ced372 authored by Tania Gómez's avatar Tania Gómez

style changes

parent 454f13d3
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<!-- middle container --> <!-- middle container -->
<div class="container-fluid d-flex flex-fill"> <div class="container-fluid d-flex flex-fill">
<div class="row d-flex flex-fill"> <div class="row d-flex flex-fill">
<div class="col-md-6" id="mexmap"> <div class="col-6" id="mexmap">
<div class="picker"> <div class="picker">
<select id="indicatorSelect"></select> <select id="indicatorSelect"></select>
</div> </div>
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
</div> </div>
</div> </div>
<div class="col-md-6" id="overlaydiv"></div> <div class="col-6" id="overlaydiv"></div>
<div class="col-md-6" id="story"> <div class="col-6" id="story">
<div class="loader"></div> <div class="loader"></div>
<div class="row h-50 border-bottom"> <div class="row h-50 border-bottom">
<div class="col"> <div class="col">
...@@ -81,14 +81,14 @@ ...@@ -81,14 +81,14 @@
</div> </div>
<div class="row h-50"> <div class="row h-50">
<div class="col-6 border-right"> <div class="col-6 border-right" id="chordChart2">
<div class="row h-100"> <div class="row h-100">
<div id="chordChart"></div> <div id="chordChart"></div>
<div id="pieChart"></div> <div id="pieChart"></div>
</div> </div>
</div> </div>
<div class="col-6 align-self-center" id="odTableRow"> <div class="col-6 align-self-center" id="odTableRow">
<div class="row h-100 justify-content-center"> <div class="row h-100 justify-content-center" id="radarChart2">
<div id="radarChart"></div> <div id="radarChart"></div>
<div class="card text-center" id="odCard"> <div class="card text-center" id="odCard">
<div class="card-body"> <div class="card-body">
......
...@@ -1033,7 +1033,7 @@ const createFlowLayer = (geojson, type, addOnCreate) => { ...@@ -1033,7 +1033,7 @@ const createFlowLayer = (geojson, type, addOnCreate) => {
let odChart = am4core.registry.baseSprites.find(c => c.htmlContainer.id === "odChart"); let odChart = am4core.registry.baseSprites.find(c => c.htmlContainer.id === "odChart");
odChart.data = newData; odChart.data = newData;
let chordChart = am4core.registry.baseSprites.find(c => c.htmlContainer.id === "chordChart"); let chordChart = am4core.registry.baseSprites.find(c => c.htmlContainer.id === "chordChart2");
chordChart.data = newData; chordChart.data = newData;
chordChart.data = chordChart.data.filter(function(e) { return e.flowCount > 0 }); chordChart.data = chordChart.data.filter(function(e) { return e.flowCount > 0 });
} }
......
...@@ -250,7 +250,7 @@ am4core.ready(function() { ...@@ -250,7 +250,7 @@ am4core.ready(function() {
am4core.useTheme(am4themes_animated); am4core.useTheme(am4themes_animated);
// Themes end // Themes end
var cd_chart = am4core.create("chordChart", am4charts.ChordDiagram); var cd_chart = am4core.create("chordChart2", am4charts.ChordDiagram);
var cd_title = cd_chart.titles.create(); var cd_title = cd_chart.titles.create();
//cd_title.text = "Viajes de ocupados desde centros de mercado"; //cd_title.text = "Viajes de ocupados desde centros de mercado";
...@@ -288,7 +288,7 @@ am4core.ready(function() { ...@@ -288,7 +288,7 @@ am4core.ready(function() {
bullet.locationX = 0.5; bullet.locationX = 0.5;
// create animations // create animations
//cd_chart.events.once("over", function() { //cd_chart.events.once("over", function()
nodeTemplate.events.on("ready", function() { nodeTemplate.events.on("ready", function() {
for (var i = 0; i < cd_chart.links.length; i++) { for (var i = 0; i < cd_chart.links.length; i++) {
var link = cd_chart.links.getIndex(i); var link = cd_chart.links.getIndex(i);
......
...@@ -140,9 +140,9 @@ am4core.ready(function() { ...@@ -140,9 +140,9 @@ am4core.ready(function() {
// pie chart // pie chart
let pchart = am4core.create("pieChart", am4charts.PieChart); let pchart = am4core.create("chordChart2", am4charts.PieChart);
let query2 = `${baseUrl}/query/${table}?columns=sum(area) as area,DATE_PART('year',date) as yy&group=yy&sort=yy`; // &sort=yeartrimes`; let query2 = `${baseUrl}/query/${table}?columns=sum(area)/10000 as area,DATE_PART('year',date) as yy&group=yy&sort=yy`; // &sort=yeartrimes`;
d3.json(query2).then(d => pchart.data = d); d3.json(query2).then(d => pchart.data = d);
let ptitle = pchart.titles.create(); let ptitle = pchart.titles.create();
...@@ -190,7 +190,7 @@ am4core.ready(function() { ...@@ -190,7 +190,7 @@ am4core.ready(function() {
am4core.useTheme(am4themes_animated); am4core.useTheme(am4themes_animated);
// Themes end // Themes end
var rchart = am4core.create("radarChart", am4charts.RadarChart); var rchart = am4core.create("radarChart2", am4charts.RadarChart);
// chart.hiddenState.properties.opacity = 0; // this creates initial fade-in // chart.hiddenState.properties.opacity = 0; // this creates initial fade-in
//const baseUrl = new URL(`/data`, window.location.href).href; //const baseUrl = new URL(`/data`, window.location.href).href;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment