Procházet zdrojové kódy

changing country bar chart to pie chart

solr_update
Simon Bowie před 2 roky
rodič
revize
82ecc08144
2 změnil soubory, kde provedl 8 přidání a 19 odebrání
  1. +7
    -2
      web/app/data.py
  2. +1
    -17
      web/app/templates/data.html

+ 7
- 2
web/app/data.py Zobrazit soubor

@@ -38,11 +38,16 @@ def main_data():
country_labels = []
country_numbers = []
country_dataset = []
background_colours = []
for i in range(0, len(country_data)):
if i % 2:
country_numbers.append(country_data[i])
random_colour = "#" + "%06x" % random.randint(0, 0xFFFFFF)
country_dict = {"label": "number of records", "data": country_numbers, "backgroundColor": random_colour}
x = 0
while x <= len(country_data):
random_colour = "#" + "%06x" % random.randint(0, 0xFFFFFF)
background_colours.append(random_colour)
x += 1
country_dict = {"label": "number of records", "data": country_numbers, "backgroundColor": background_colours}
else:
country = pycountry.countries.get(alpha_2=country_data[i])
if country is not None:

+ 1
- 17
web/app/templates/data.html Zobrazit soubor

@@ -102,7 +102,7 @@ There are a total of {{ total_number }} patents.
};

var config = {
type: 'bar',
type: 'pie',
data: data,
options: {
plugins: {
@@ -112,22 +112,6 @@ There are a total of {{ total_number }} patents.
},
},
responsive: true,
scales: {
x: {
title: {
display: true,
text: 'country'
},
stacked: true,
},
y: {
title: {
display: true,
text: 'number of records'
},
stacked: true
}
}
}
};


Načítá se…
Zrušit
Uložit