mgt chart fix

maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java

@@ -18,7 +18,6 @@
 package org.maxkey.entity.apps;
 
 import java.io.Serializable;
-import java.util.Arrays;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -599,8 +598,6 @@ public class Apps extends JpaBaseEntity implements Serializable {
 		builder.append(protocol);
 		builder.append(", secret=");
 		builder.append(secret);
-		builder.append(", icon=");
-		builder.append(Arrays.toString(icon));
 		builder.append(", iconFile=");
 		builder.append(iconFile);
 		builder.append(", visible=");

maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl

@@ -38,7 +38,7 @@
 	<link   href="<@base />/static/jquery/metisMenu-v3.0.6/css/mm-vertical.css"  rel="stylesheet" >
 	<link   href="<@base />/static/jquery/metisMenu-v3.0.6/metisMenu.min.css"  rel="stylesheet" >
 	<script src ="<@base />/static/jquery/metisMenu-v3.0.6/metisMenu.min.js" type="text/javascript" ></script>
-	<script src ="<@base />/static/js/Chart.min.js" type="text/javascript" ></script>
+	<script src ="<@base />/static/js/chart.min.js" type="text/javascript" ></script>
 	<#-- multiple-select-1.5.2 -->
 	<script type="text/javascript" src="<@base />/static/jquery/multiple-select-1.5.2/multiple-select.min.js"></script>
 	<script type="text/javascript" src="<@base />/static/jquery/multiple-select-1.5.2/locale/multiple-select-<@locale/>.js"></script>

maxkey-web-manage/src/main/resources/templates/views/main.ftl

@@ -204,10 +204,15 @@
 				xAxes: [{
 					display: true,
 				}],
-				yAxes: [{
+				y: {
-					display: true,
+                        title: {
-					stacked: true
+                            display: true
-				}]
+                          },
+                         ticks: {
+                            precision : 0
+                        },
+                        beginAtZero: true
+                    }
 			}
 		}
 	};
@@ -231,21 +236,34 @@
 				},
 				scales: {
 					xAxes: [{
-						display: true,
+						display: true
 					}],
-					yAxes: [{
+					y: {
-						display: true,
+					    title: {
-						stacked: true
+                            display: true
-					}]
+                          },
+                         ticks: {
+                            precision : 0
+                         /*
+                            callback: function(value, index, values) {
+                                return  parseInt(value);
+                            }*/
+                        },
+                        beginAtZero: true
+                    }
 				}
 			}
 		};
+		
 	window.onload = function() {
+	    var ctxdh = document.getElementById('canvasDayHour').getContext('2d');
+        window.myLineDayHour = new Chart(ctxdh, configDayHour);
+        
+        
 		var ctx = document.getElementById('canvasMonth').getContext('2d');
 		window.myLineMonth = new Chart(ctx, configMonth);
 		
-		var ctxdh = document.getElementById('canvasDayHour').getContext('2d');
+		
-		window.myLineDayHour = new Chart(ctxdh, configDayHour);
 	};
 
 	</script>