diff options
Diffstat (limited to 'statistics_app')
3 files changed, 9 insertions, 36 deletions
diff --git a/statistics_app/templates/statistics_app/profile_stats.html b/statistics_app/templates/statistics_app/profile_stats.html index 2653d9d..c342898 100644 --- a/statistics_app/templates/statistics_app/profile_stats.html +++ b/statistics_app/templates/statistics_app/profile_stats.html @@ -14,7 +14,7 @@ <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/workshop_stats/" >Workshop Stats</a></li> + <li><a href="{{ URL_ROOT }}/statistics/" >Workshop Stats</a></li> <li class="active"><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li> </ul> <ul class="nav navbar-nav navbar-right"> diff --git a/statistics_app/templates/statistics_app/workshop_public_stats.html b/statistics_app/templates/statistics_app/workshop_public_stats.html index 237bcbc..486c154 100644 --- a/statistics_app/templates/statistics_app/workshop_public_stats.html +++ b/statistics_app/templates/statistics_app/workshop_public_stats.html @@ -303,7 +303,7 @@ $( "#visualization" ).dialog({ resizable: false, draggable: true, - title: 'State wise Completed Workshops(Map of India)', + title: 'State wise(Map of India)', closeOnEscape: true, stack: true, zIndex: 10000, @@ -321,10 +321,11 @@ var opts = { region: 'IN', domain: 'IN', - displayMode: 'regions', + displayMode: 'regions', resolution: 'provinces', - colorAxis: {colors: ['lightyellow', 'orange']}, - legend: {position: 'top'}, + colorAxis: {colors: ['lightyellow','orange']}, + + }; var geochart = new google.visualization.GeoChart( diff --git a/statistics_app/templates/statistics_app/workshop_stats.html b/statistics_app/templates/statistics_app/workshop_stats.html index 5328b2b..3bfce07 100644 --- a/statistics_app/templates/statistics_app/workshop_stats.html +++ b/statistics_app/templates/statistics_app/workshop_stats.html @@ -3,6 +3,7 @@ {% block title %} Statistics {% endblock %} + {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> @@ -13,7 +14,7 @@ <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li class="active"><a href="{{ URL_ROOT }}/workshop_stats/" >Workshop Stats</a></li> + <li class="active"><a href="{{ URL_ROOT }}/statistics/" >Workshop Stats</a></li> <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li> </ul> <ul class="nav navbar-nav navbar-right"> @@ -224,20 +225,6 @@ myChart.destroy(); } - var dWidth = $(window).width() * 0.9; - var dHeight = $(window).height() * 0.9; - - $( "#myChartPie" ).dialog({ - resizable: false, - draggable: true, - title: 'Bar Chart', - closeOnEscape: true, - stack: true, - zIndex: 10000, - width: dWidth, - height: dHeight, - modal: true - }); document.getElementById("visualization").style.visibility='hidden'; myChart = new Chart(ctx1, { @@ -294,22 +281,7 @@ if(myChart){ myChart.destroy(); } - - var dWidth = $(window).width() * 0.9; - var dHeight = $(window).height() * 0.9; - - $( "#myChartPie" ).dialog({ - resizable: false, - draggable: true, - title: 'Pie Chart', - closeOnEscape: true, - stack: true, - zIndex: 10000, - width: dWidth, - height: dHeight, - modal: true - }); - + document.getElementById("visualization").style.visibility='hidden'; myChart = new Chart(ctx1, { type: 'pie', |