Adds statistics_app

- Adds statistics_app - moves workshop_stats to statistics_app - changes urls of workshop_stats to statistics - adds public_stats - modified form.py to get off regex warning - updates urls.py
author: Akshen 2017-09-25 12:31:24 +0530
committer: Akshen 2017-09-25 12:31:24 +0530
commit: 8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37 (patch)
tree: 0a1dcaea3eff5c9a75e3b736f37836622e676e4b /workshop_app/templates
parent: 71b2b649629de30ef133ce2dd9c8e855abe66a31 (diff)
download: workshop_booking-8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37.tar.gz
workshop_booking-8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37.tar.bz2
workshop_booking-8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37.zip
8 files changed, 21 insertions, 52 deletions
diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html
index 685b8ad..192fb14 100644
--- a/workshop_app/templates/workshop_app/create_workshop.html
+++ b/workshop_app/templates/workshop_app/create_workshop.html
@@ -21,7 +21,7 @@
         <li class="active"><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 }}/scheduled_workshops/">Scheduled Workshops</a></li>
+       <li><a href="{{ URL_ROOT }}/statistics/">Workshop stats</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
@@ -46,4 +46,4 @@
       <button class="btn btn-success" type="submit">Save</button>
     </form>
   </div>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html
index 70ad417..17a07c2 100644
--- a/workshop_app/templates/workshop_app/edit_profile.html
+++ b/workshop_app/templates/workshop_app/edit_profile.html
@@ -15,7 +15,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>
           </ul>
         {% else %}
          <div class="navbar-header">
@@ -51,4 +51,4 @@
         <button class="btn btn-primary pull-right" type="submit">Save Profile</button>
     </form>
   </div>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index ec2f4eb..5d9f872 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -34,7 +34,6 @@
 <body>
 
     <!-- Navigation -->
-    
       
         <div class="container">
 
@@ -48,7 +47,7 @@
             <div id="first-right">
                <div class="label-bar">
                <a href="http://python.fossee.in/about/"
-        target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a href="http://fossee.in/fossee-stats" target="_blank" > Past Workshops</a>
+        target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a onclick="window.open('http://fossee.in/fossee-stats'); window.open('/statistics/public_stats/')" target="_blank" > Past Workshops</a>
         </div>
         <br> <br>
         <img src=" {{ URL_ROOT }}/static/workshop_app/img/img_1.png" ><br>
diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html
index 97f1604..9f0c94f 100644
--- a/workshop_app/templates/workshop_app/manage.html
+++ b/workshop_app/templates/workshop_app/manage.html
@@ -10,7 +10,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>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
 		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html
index abeb3de..495a6ed 100644
--- a/workshop_app/templates/workshop_app/profile_updated.html
+++ b/workshop_app/templates/workshop_app/profile_updated.html
@@ -15,7 +15,7 @@
         <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
         <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> 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>
       </ul>
       {% else %}
       <div class="navbar-header">
diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html
index 8f1fbae..be06808 100644
--- a/workshop_app/templates/workshop_app/view_profile.html
+++ b/workshop_app/templates/workshop_app/view_profile.html
@@ -15,7 +15,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>
           </ul>
         {% else %}
         <div class="navbar-header">
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html
index 75cee32..1777307 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_list.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html
@@ -15,7 +15,7 @@
 		<ul class="nav navbar-nav">
 		{% if request.user.profile.position == 'instructor'%}
 		  <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-		  <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li>
+		  <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
 		{% else %}
 		  <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
 		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
@@ -96,4 +96,4 @@
 		</nav>
 		</div>
 	</div>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html
index ba597dc..4f6533d 100644
--- a/workshop_app/templates/workshop_app/workshop_stats.html
+++ b/workshop_app/templates/workshop_app/workshop_stats.html
@@ -204,7 +204,7 @@
 	<br>
 	<div class="col-md-12 ">
 		<br>
-		<canvas id="myChartPie" ></canvas>
+		<canvas id="myChartPie"  width="60px" height="21px"></canvas>
 		<script>
 			$( function() {
 			    $( "fieldset" ).controlgroup();
@@ -219,27 +219,12 @@
 			            if(myChart){
 			        	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, {
 					    type: 'bar',
 					    data: {
-					        labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', '	December'],
+					        labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
 							datasets: [{
 							label: 'Number of workshops per Month for '+ dateToday.getFullYear(),
 					            data: {{ workshop_count }},
@@ -257,8 +242,8 @@
 					                'rgba(219, 10, 91, 0.2)',
 					                'rgba(191, 191, 191, 0.2)'
 					            ],
-					            borderColor: [
-									'rgba(255, 99, 132, 1)',
+				            borderColor: [
+							'rgba(255, 99, 132, 1)',
 					                'rgba(54, 162, 235, 1)',
 					                'rgba(255, 206, 86, 1)',
 					                'rgba(75, 192, 192, 1)',
@@ -291,21 +276,6 @@
 			        	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',
@@ -318,7 +288,7 @@
 				                'rgba(153, 102, 255, 1)',
 				                'rgba(191, 191, 1, 1)',
 				                'rgba(75, 192, 192, 1)',
-					            'rgba(153, 102, 255, 1)'
+				                'rgba(153, 102, 255, 1)'
 				           ] 
 				        }]
 				    },
@@ -330,16 +300,16 @@
 
 				else if (this.value == 'MOIN') {
 			            if(myChart){
-			        		myChart.destroy();
+		        		myChart.destroy();
 			            }
 
-				    var dWidth = $(window).width() * 0.9;
+			        var dWidth = $(window).width() * 0.9;
 			        var dHeight = $(window).height() * 0.9;
                 
 			        $( "#visualization" ).dialog({
 					resizable: false,
 					draggable: true,
-			        title: 'Map of India',
+			                title: 'Map of India',
 					closeOnEscape: true,
 					stack: true,
 					zIndex: 10000,
@@ -348,13 +318,13 @@
 					modal: true
 					});
 	
-					document.getElementById("visualization").style.visibility='visible';
+			document.getElementById("visualization").style.visibility='visible';
 			        function drawVisualization() {
 					    var data = google.visualization.arrayToDataTable(
 						{{ india_map | safe }}
 						);
 
-					var opts = {
+			                    var opts = {
 					    region: 'IN',
 					    domain: 'IN',
 					    displayMode: 'regions',
author	Akshen	2017-09-25 12:31:24 +0530
committer	Akshen	2017-09-25 12:31:24 +0530
commit	8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37 (patch)
tree	0a1dcaea3eff5c9a75e3b736f37836622e676e4b /workshop_app/templates
parent	71b2b649629de30ef133ce2dd9c8e855abe66a31 (diff)
download	workshop_booking-8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37.tar.gz workshop_booking-8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37.tar.bz2 workshop_booking-8a0dcbf56d6a5a8ab389a0879c0da7a426de0d37.zip