diff --git a/.gitignore b/.gitignore index a0a0e98..75cca80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ \.DS_Store config.json +mywebsite +mywebsite.exe diff --git a/config-template.json b/config-template.json index 1846113..b53d7fb 100644 --- a/config-template.json +++ b/config-template.json @@ -9,4 +9,4 @@ "server": { "port": "" } -} +} \ No newline at end of file diff --git a/mywebsite b/mywebsite deleted file mode 100755 index c1f5af6..0000000 Binary files a/mywebsite and /dev/null differ diff --git a/public/js/SensorInfoController.js b/public/js/SensorInfoController.js index 2d732c7..3e8d05a 100644 --- a/public/js/SensorInfoController.js +++ b/public/js/SensorInfoController.js @@ -10,7 +10,7 @@ app.controller('SensorInfoController', function($scope, $http, $routeParams) { if ($scope.list.length > 0) { $scope.selectedObject = $scope.list[0]; - $scope.selectedMonth = $scope.list[0].months[$scope.list.months.length]; + $scope.selectedMonth = $scope.list[0].months[$scope.list[0].months.length - 1]; $scope.loadingMonth = true; $scope.loadingYear = true; @@ -20,7 +20,7 @@ app.controller('SensorInfoController', function($scope, $http, $routeParams) { $scope.loadingYear = false; }); }); - displayChart("info-chart-month", "legend-month", $scope.location, $scope.list[0].year, $scope.list[0].months[0], function() { + displayChart("info-chart-month", "legend-month", $scope.location, $scope.list[0].year, $scope.selectedMonth, function() { $scope.$apply(function() { $scope.loadingMonth = false; });