diff --git a/webpage/templates/webpages/relatorios.html b/webpage/templates/webpages/relatorios.html
index ed82166..bd7ab6c 100644
--- a/webpage/templates/webpages/relatorios.html
+++ b/webpage/templates/webpages/relatorios.html
@@ -7,15 +7,20 @@
{{ block.super }}
@@ -44,6 +47,10 @@
var data = google.visualization.arrayToDataTable({{db_data|safe}});
var options = {
title: '{{title_chart}}',
+ // legend: {position: 'right', maxLines: 1},
+ bar: { groupWidth: '30%' },
+ chartArea:{width:"50%"},
+ titlePosition: 'out',
vAxis: {
title: '{{title_vAxis}}',
ticks: [0, .20, .40, .60, .80, 1],
@@ -60,23 +67,32 @@
if (selectedItem) {
var col = data.getColumnLabel(selectedItem.column);
var element = '
\
- {{history_table}}\
+ {{history_table}}\
';
if (col == "{{n_did_table}}" && text("#title-table") != "{{n_did_table}}"){
if (length("#link-history") <= 0){
add(element,"#view-table",true);
}
altertitle("{{n_did_table}}");
- drawTable(column_n_did,json_n_did["data"],false);
- // console.log("n_did_table");
+ search = [];
+ for (var i in json_n_did["data"]){
+ search.push([json_n_did["data"][i][0],json_n_did["data"][i][1]]);
+ }
+ drawTable(column_n_did,pagination(json_n_did["data"],1),false);
+ putpagination(json_n_did["data"]);
} else if (col == "{{did_table}}" && text("#title-table") != "{{did_table}}"){
if (length("#link-history") <= 0){
add(element,"#view-table",true);
}
altertitle("{{did_table}}");
- drawTable(column_did,json_did["data"],true,3);
- // console.log("did_table");
+ search = [];
+ for (var i in json_did["data"]){
+ search.push([json_did["data"][i][0],json_did["data"][i][1],
+ json_did["data"][i][2],json_did["data"][i][3]]);
+ }
+ drawTable(column_did,pagination(json_did["data"],1),true,3);
+ putpagination(json_did["data"]);
}
}
chart.setSelection([])
@@ -87,7 +103,7 @@
chart.draw(data, options);
}
- function drawTable(columns = column_history,rows = json_history["data"],isdate = true,columndate = 3) {
+ function drawTable(columns = column_history,rows = pagination(json_history["data"],1),isdate = true,columndate = 3) {
var data_table = new google.visualization.DataTable();
for (var i in columns){
for (var item in columns[i]){
@@ -131,59 +147,95 @@
{% endfor %}
{% endif %}
-
-
-
-
{% trans "Report of the resource webpage" %}
+
+
+
+
+
{% trans "Report of the resource " %}{{webpage}}
+
+
+
{% trans "Select the period: " %}
-
{% trans "Select the period" %}
-
-
-
-
-
-
-
-
-
+
{% endblock %}
--
libgit2 0.21.2