Dashboard Page Changes, User Page added, Role page added! Device Detail page is not finished yet

Author: Shabir Ahmad

device.html

@@ -39,4 +39,16 @@
     background-color:#222d32 !important;
 }
 
-button.gm-ui
+#piChartWrapper .box {
+    width: auto;
+    position: relative;
+    border-radius: 3px;
+    background: #ffffff;
+    border-top: 3px solid #d2d6de;
+    border-top-color: rgb(210, 214, 222);
+    margin-bottom: 20px;
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+}
+#platforms div.inner {
+    color: #FFF;}
+.disappeared {visibility: hidden;}

dist/css/custom-styles.css

@@ -207,4 +207,6 @@ $(function () {
     }
   });
 
+
+
 });

dist/js/functions.js

@@ -4,7 +4,7 @@ marker_callback([{
 	"devices": [{
 		"id": "1",
 		"properties": {
-			"title": 5.4,
+			"title": "Dust Sensor",
 			"link": "",
 			"url": "http://watson-iot/dev1",
 			"status": "",
@@ -13,12 +13,13 @@ marker_callback([{
 		"geometry": {
 			"type": "marker",
 			"coordinates": [33.4890, 126.4983]
-		}
+		},
+		"sensor_reading":"30"
 	},
     {
 		"id": "2",
 		"properties": {
-			"title": 5.4,
+			"title": "Temperature Sensor",
 			"link": "",
 			"url": "http://watson-iot/dev2",
 			"status": "pending",
@@ -32,7 +33,7 @@ marker_callback([{
     {
 		"id": "3",
 		"properties": {
-			"title": 5.4,
+			"title": "Humidity Sensor",
 			"link": "",
 			"url": "http://watson-iot/dev3",
 			"status": "",
@@ -46,15 +47,15 @@ marker_callback([{
     {
 		"id": "4",
 		"properties": {
-			"title": "Watson IoT Device 3",
+			"title": "Pressure Sensor",
 			"link": "",
 			"url": "http://watson-iot/dev4",
 			"status": "",
 			"date":"11-7-2019"
 		},
 		"geometry": {
 			"type": "marker",
-			"coordinates": [34.4890, 121.4983]
+			"coordinates": [31.4890, 121.4983]
 		}
 	}],
 	"id": "ibmwattson1"
@@ -72,8 +73,48 @@ marker_callback([{
 		},
 		"geometry": {
 			"type": "marker",
-			"coordinates": [35.252115, 128.378728]
+			"coordinates": [31.252115, 128.378728]
 		}
 	}],
 	"id": "ocf-dev"
-}]);
+}, {
+	"type": "OneM2M",
+	 "color_code":"00a65a",
+	"devices": [{
+		"id": "1",
+		"properties": {
+			"title": "OCF Device 2",
+			"link": "",
+			"url": "http://ocf-iot/dev1",
+			"status": "",
+			"date":"11-7-2019"
+		},
+		"geometry": {
+			"type": "marker",
+			"coordinates": [32.252115, 128.378728]
+		}
+	}],
+	"id": "m2m-dev"
+},
+	{
+	"type": "GS1",
+	 "color_code":"f39c12",
+	"devices": [{
+		"id": "1",
+		"properties": {
+			"title": "OCF Device 2",
+			"link": "",
+			"url": "http://ocf-iot/dev1",
+			"status": "",
+			"date":"11-7-2019"
+		},
+		"geometry": {
+			"type": "marker",
+			"coordinates": [33.252115, 124.378728]
+		}
+	}],
+	"id": "gs1-dev"
+}
+
+
+]);

dist/js/pages/dashboard.js

@@ -36,6 +36,7 @@
     "bootstrap-slider": "^9.8.0",
     "bootstrap-timepicker": "^0.5.2",
     "chart.js": "1.0.*",
+    "chartjs-plugin-labels": "^1.1.0",
     "ckeditor": "^4.11.2",
     "datatables.net": "^1.10.19",
     "datatables.net-bs": "^1.10.19",