Fixed #54 Integration Done for Rescue Time + Google Charts.

Merge pull request #60 from SensehacK/rescueTime Rescue time Merge #2
SensehacK · Jul 4, 2018 · a9ca9e6 · a9ca9e6
2 parents e1572af + f0c9052
commit a9ca9e6
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/index.html b/index.html
@@ -575,30 +575,20 @@ <h1>
         <div class="row skill" id="developer">
 
             <div class="twelveC columns collapsed">
-                <h1>Check out Time Usage.</h1>
-
+                <h1>
+                    <span>Rescue Time Analysis.</span>
+                </h1>
                 <div class="six columns header-col">
-                    <h1>
-                        <span>Rescue Time Analysis.</span>
-                    </h1>
-                    <h1> Yesterday Analysis</h1>
+                    <h1> Pie Chart</h1>
                     <div id="rescueTimeChartPie_div3"></div>
                     <!-- end skill-bars -->
 
-
-
                 </div>
                 <div class="six columns header-col">
-                    <h1>
-                        <span>Rescue Time Analysis2.</span>
-                    </h1>
-                    <h1> Overall Analysis</h1>
+                    <h1> Bar Chart</h1>
 
                     <div id="rescueTimeChartBar_div3"></div>
                     <!-- end skill-bars -->
-
-
-
                 </div>
 
 
@@ -2795,8 +2785,10 @@ <h4 class="widget-title">Latest Tweets</h4>
 
                     console.log("end of Rescue Time call");
 
-                    rescueTimeChart();
-                    rescueTimeChartBar();
+                    // rescueTimeChart();
+                    console.log("end of Rescue Time call 1 rescueTimeChart ");
+                    // rescueTimeChartBar();
+                    console.log("end of Rescue Time call 1 rescueTimeChartBar ");
 
                 }
 
@@ -2821,7 +2813,7 @@ <h4 class="widget-title">Latest Tweets</h4>
 
 
         function rescueTimeChart() {
-
+            console.log("start of rescueTimeChart");
             var rescueData2 = new google.visualization.DataTable();
             rescueData2.addColumn('string', 'Topping');
             rescueData2.addColumn('number', 'Slices');
@@ -2837,20 +2829,25 @@ <h4 class="widget-title">Latest Tweets</h4>
             console.log("In drawChart3 google 23 piechart");
             var rescueTimeOptions = {
                 'title': 'How Much Time I utilize yesterday.',
-                'width': 600,
                 'height': 400
+                // 'width': 600,
+
             };
 
             var rescueTimeChart2 = new google.visualization.PieChart(document.getElementById(
                 'rescueTimeChartPie_div3'));
             rescueTimeChart2.draw(rescueData2, rescueTimeOptions);
+            console.log("end of rescueTimeChart");
+
+            //Call the bar Function on load.
+            rescueTimeChartBar()
         }
 
         function rescueTimeChartBar() {
-
+            console.log("start of rescueTimeChartBar");
             var rescueDataBar2 = new google.visualization.DataTable();
             rescueDataBar2.addColumn('string', 'Topping');
-            rescueDataBar2.addColumn('number', 'Slices');
+            rescueDataBar2.addColumn('number', 'Percent');
             // rescueData2.addColumn('number', 'Percentage');
 
             rescueDataBar2.addRows([
@@ -2860,16 +2857,18 @@ <h4 class="widget-title">Latest Tweets</h4>
                 ['Distracting', rTdistracting_percentage],
                 ['Very Distracting', rTvery_distracting_percentage]
             ]);
-            console.log("In drawChart3 google 23 piechart");
+            console.log("In drawChart3 google 23 barchart");
             var rescueTimeBarOptions = {
                 'title': 'How Much Time I utilize yesterday.',
-                'width': 600,
                 'height': 400
+                // 'width': 600,
+
             };
 
             var rescueTimeChartBar2 = new google.visualization.BarChart(document.getElementById(
                 'rescueTimeChartBar_div3'));
             rescueTimeChartBar2.draw(rescueDataBar2, rescueTimeBarOptions);
+            console.log("end of rescueTimeChartBar");
         }
     </script>
     <!-- RescueTime + Google Charts end