Browse Source

Fix problem on javascript runtime error on doughnut chart

christianesperar 9 years ago
parent
commit
fa2339c979
3 changed files with 176 additions and 38 deletions
  1. 37 17
      production/index.html
  2. 103 3
      production/index2.html
  3. 36 18
      production/index3.html

+ 37 - 17
production/index.html

@@ -1244,23 +1244,43 @@
 
   <!-- dashbord linegraph -->
   <script>
-    var doughnutData = [{
-      value: 30,
-      color: "#455C73"
-    }, {
-      value: 30,
-      color: "#9B59B6"
-    }, {
-      value: 60,
-      color: "#BDC3C7"
-    }, {
-      value: 100,
-      color: "#26B99A"
-    }, {
-      value: 120,
-      color: "#3498DB"
-    }];
-    var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData);
+    Chart.defaults.global.legend = {
+      enabled: false
+    };
+
+    var data = {
+      labels: [
+        "Symbian",
+        "Blackberry",
+        "Other",
+        "Android",
+        "IOS"
+      ],
+      datasets: [{
+        data: [15, 20, 30, 10, 30],
+        backgroundColor: [
+          "#BDC3C7",
+          "#9B59B6",
+          "#455C73",
+          "#26B99A",
+          "#3498DB"
+        ],
+        hoverBackgroundColor: [
+          "#CFD4D8",
+          "#B370CF",
+          "#34495E",
+          "#36CAAB",
+          "#49A9EA"
+        ]
+
+      }]
+    };
+
+    var canvasDoughnut = new Chart(document.getElementById("canvas1"), {
+      type: 'doughnut',
+      tooltipFillColor: "rgba(51, 51, 51, 0.55)",
+      data: data
+    });
   </script>
   <!-- /dashbord linegraph -->
   <!-- datepicker -->

+ 103 - 3
production/index2.html

@@ -996,9 +996,109 @@
         value: 120,
         color: "#3498DB"
       }];
-      var myDoughnut = new Chart(document.getElementById("canvas1i").getContext("2d")).Doughnut(doughnutData);
-      var myDoughnut = new Chart(document.getElementById("canvas1i2").getContext("2d")).Doughnut(doughnutData);
-      var myDoughnut = new Chart(document.getElementById("canvas1i3").getContext("2d")).Doughnut(doughnutData);
+
+      Chart.defaults.global.legend = {
+        enabled: false
+      };
+
+      var canvasDoughnut = new Chart(document.getElementById("canvas1i"), {
+        type: 'doughnut',
+        showTooltips: false,
+        tooltipFillColor: "rgba(51, 51, 51, 0.55)",
+        data: {
+          labels: [
+            "Symbian",
+            "Blackberry",
+            "Other",
+            "Android",
+            "IOS"
+          ],
+          datasets: [{
+            data: [15, 20, 30, 10, 30],
+            backgroundColor: [
+              "#BDC3C7",
+              "#9B59B6",
+              "#455C73",
+              "#26B99A",
+              "#3498DB"
+            ],
+            hoverBackgroundColor: [
+              "#CFD4D8",
+              "#B370CF",
+              "#34495E",
+              "#36CAAB",
+              "#49A9EA"
+            ]
+
+          }]
+        }
+      });
+
+      var canvasDoughnut = new Chart(document.getElementById("canvas1i2"), {
+        type: 'doughnut',
+        showTooltips: false,
+        tooltipFillColor: "rgba(51, 51, 51, 0.55)",
+        data: {
+          labels: [
+            "Symbian",
+            "Blackberry",
+            "Other",
+            "Android",
+            "IOS"
+          ],
+          datasets: [{
+            data: [15, 20, 30, 10, 30],
+            backgroundColor: [
+              "#BDC3C7",
+              "#9B59B6",
+              "#455C73",
+              "#26B99A",
+              "#3498DB"
+            ],
+            hoverBackgroundColor: [
+              "#CFD4D8",
+              "#B370CF",
+              "#34495E",
+              "#36CAAB",
+              "#49A9EA"
+            ]
+
+          }]
+        }
+      });
+
+      var canvasDoughnut = new Chart(document.getElementById("canvas1i3"), {
+        type: 'doughnut',
+        showTooltips: false,
+        tooltipFillColor: "rgba(51, 51, 51, 0.55)",
+        data: {
+          labels: [
+            "Symbian",
+            "Blackberry",
+            "Other",
+            "Android",
+            "IOS"
+          ],
+          datasets: [{
+            data: [15, 20, 30, 10, 30],
+            backgroundColor: [
+              "#BDC3C7",
+              "#9B59B6",
+              "#455C73",
+              "#26B99A",
+              "#3498DB"
+            ],
+            hoverBackgroundColor: [
+              "#CFD4D8",
+              "#B370CF",
+              "#34495E",
+              "#36CAAB",
+              "#49A9EA"
+            ]
+
+          }]
+        }
+      });
     });
   </script>
   <!-- -->

+ 36 - 18
production/index3.html

@@ -1044,26 +1044,44 @@
         minSpotColor: '#26B99A'
       });
 
-      var doughnutData = [{
-        value: 30,
-        color: "#455C73"
-      }, {
-        value: 30,
-        color: "#9B59B6"
-      }, {
-        value: 60,
-        color: "#BDC3C7"
-      }, {
-        value: 100,
-        color: "#26B99A"
-      }, {
-        value: 120,
-        color: "#3498DB"
-      }];
-      var myDoughnut = new Chart(document.getElementById("canvas1").getContext("2d")).Doughnut(doughnutData);
+      Chart.defaults.global.legend = {
+        enabled: false
+      };
 
+      var data = {
+        labels: [
+          "Symbian",
+          "Blackberry",
+          "Other",
+          "Android",
+          "IOS"
+        ],
+        datasets: [{
+          data: [15, 20, 30, 10, 30],
+          backgroundColor: [
+            "#BDC3C7",
+            "#9B59B6",
+            "#455C73",
+            "#26B99A",
+            "#3498DB"
+          ],
+          hoverBackgroundColor: [
+            "#CFD4D8",
+            "#B370CF",
+            "#34495E",
+            "#36CAAB",
+            "#49A9EA"
+          ]
+
+        }]
+      };
 
-    })
+      var canvasDoughnut = new Chart(document.getElementById("canvas1"), {
+        type: 'doughnut',
+        tooltipFillColor: "rgba(51, 51, 51, 0.55)",
+        data: data
+      });
+    });
   </script>
   <!-- -->
   <!-- datepicker -->