Business intelligence made simple
Fixed order and added loading
Andrew Kaneae821e1c27e8
diff --git a/app/views/blazer/dashboards/_form.html.erb b/app/views/blazer/dashboards/_form.html.erbindex 517cfea2..a7d2386f 100644--- a/app/views/blazer/dashboards/_form.html.erb+++ b/app/views/blazer/dashboards/_form.html.erb@@ -22,7 +22,7 @@ li:hover .glyphicon-remove {<div class="form-group <%= "hide" if (@queries || @dashboard.blazer_queries).empty? %>"><%= f.label :charts %><ul class="list-group">- <% (@queries || @dashboard.blazer_queries).each do |query| %>+ <% (@queries || @dashboard.blazer_dashboard_queries.order(:position).map(&:blazer_query)).each do |query| %><li class="list-group-item"><span class="glyphicon glyphicon-remove" aria-hidden="true" style="float: right; margin-top: 3px;"></span><%= query.name %>diff --git a/app/views/blazer/dashboards/show.html.erb b/app/views/blazer/dashboards/show.html.erbindex d1cc6da6..18b097d3 100644--- a/app/views/blazer/dashboards/show.html.erb+++ b/app/views/blazer/dashboards/show.html.erb@@ -21,7 +21,7 @@<% @dashboard.blazer_dashboard_queries.order(:position).map(&:blazer_query).each_with_index do |query, i| %><div style="margin-top: 40px;"><h4 style="text-align: center;"><%= link_to query.name, query_path(query), style: "color: inherit;" %></h4>- <div id="chart-<%= i %>" style="height: 300px; text-align: center; line-height: 300px;"></div>+ <div id="chart-<%= i %>" style="height: 300px; text-align: center; line-height: 300px;">Loading...</div></div><script>$.post("<%= run_queries_path %>", <%= json_escape({statement: query.statement, query_id: query.id, only_chart: true}.to_json).html_safe %>, function (data) {