foltik/shimapan
1
0
Fork 0
mirror of https://github.com/Foltik/Shimapan synced 2024-12-03 10:59:13 -05:00
Code Issues Releases Wiki Activity

Fix date and label calculation

Browse Source
This commit is contained in:
Jack Foltz 2018-09-15 14:00:20 -04:00
parent 9e7679e539
commit 18d33de0c5
Signed by: foltik
GPG Key ID: 303F88F996E95541
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/public/panel/controllers/DashCtrl.js
View File

@ -3,14 +3,14 @@ var angular = require('angular');
angular.module('DashCtrl', ['chart.js']).controller('DashController', ['$scope', $scope => {
const colorScheme = ['#2a9fd6'];
let weekDays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
for(let i = 0; i < 6 - (new Date()).getDay(); i++) {
const back = weekDays.pop();
weekDays.unshift(back);
}
// Calculate and format descending dates back one week
const currentDate = new Date();
const oneDay = 1000 * 60 * 60 * 24;
let dates = Array.from({length: 7}, (date, i) => new Date(currentDate - oneDay * (6 - i)));
let labels = dates.map(date => date.toISOString().substr(5, 5));
$scope.uploadColors = colorScheme;
$scope.uploadLabels = weekDays;
$scope.uploadLabels = labels;
$scope.uploadSeries = ['Uploads'];
$scope.uploadData = [[10, 20, 30, 20, 15, 20, 45]];
$scope.uploadOptions = {
@ -21,7 +21,7 @@ angular.module('DashCtrl', ['chart.js']).controller('DashController', ['$scope',
};
$scope.viewColors = colorScheme;
$scope.viewLabels = weekDays;
$scope.viewLabels = labels;
$scope.viewSeries = ['Views'];
$scope.viewData = [[5, 11, 4, 3, 7, 9, 21]];
$scope.viewOptions = {