diff --git a/static/js/controllers/dateController.js b/static/js/controllers/dateController.js index e634999..3cee847 100644 --- a/static/js/controllers/dateController.js +++ b/static/js/controllers/dateController.js @@ -24,7 +24,7 @@ * Go to to a next page * * @param {int} next if < 0, goes to older dates, if > 0 goes to newer dates - */ + */ $scope.nextPage = function (next) { var currentDate = $location.search().from || Date.now(), @@ -42,17 +42,21 @@ //build blocks $scope.blocks = dates.map(function (item) { - + + var itemDate = $rootScope.timezoneDate(item.date); + console.log(item.date); + console.log(itemDate); + return { type : 'date', - messageTop : $filter('date')(item.date, 'MMM'), - message : $filter('date')(item.date, 'd'), - messageBottom : $filter('date')(item.date, 'yyyy'), + messageTop : $filter('date')(itemDate, 'MMM'), + message : $filter('date')(itemDate, 'd'), + messageBottom : $filter('date')(itemDate, 'yyyy'), click : function () { //save files logs.setLogs(item.files.map(function (el, index) { return { - selected : index === 0, //select the first by default + selected : index === 0, //select the first by default name : el.name, path : el.path }; @@ -62,7 +66,7 @@ $rootScope.go('logs'); } }; - + }); } ]); diff --git a/static/js/controllers/folderController.js b/static/js/controllers/folderController.js index f2e59a2..d0f3bc3 100644 --- a/static/js/controllers/folderController.js +++ b/static/js/controllers/folderController.js @@ -12,14 +12,14 @@ 'logs', 'folder', function ($scope, $rootScope, logs, folder) { - + //reset $rootScope.sidebar = false; $scope.onlyFiles = true; //build each block $scope.blocks = folder.map(function (item) { - + if (item.type !== 'file') { $scope.onlyFiles = false; } @@ -28,7 +28,7 @@ message : item.name, click : function () { if (item.type === 'file') { - + //Save all current files of the folder //But select only the clicked one var newFiles = folder.map(function (file) { diff --git a/static/js/controllers/homeController.js b/static/js/controllers/homeController.js index c9a4d8d..a001f1a 100644 --- a/static/js/controllers/homeController.js +++ b/static/js/controllers/homeController.js @@ -17,7 +17,7 @@ //build block for each logWriter $scope.blocks = $rootScope.logWriters.map(function (item) { - + return { message : item, click : function () { diff --git a/static/js/directives/log.js b/static/js/directives/log.js index 25710b3..42e199f 100644 --- a/static/js/directives/log.js +++ b/static/js/directives/log.js @@ -69,7 +69,9 @@ templateUrl : 'partials/elements/log.html', replace : true, - controller : ['$scope', function ($scope) { + controller : ['$rootScope', '$scope', function ($rootScope, $scope) { + + $scope.timezoneDate = $rootScope.timezoneDate; /** * $scope.handleTags diff --git a/static/partials/elements/log.html b/static/partials/elements/log.html index 40c0225..ea7dfe1 100644 --- a/static/partials/elements/log.html +++ b/static/partials/elements/log.html @@ -13,13 +13,13 @@ - {{log.context.time | date: 'EEE MMM dd yyyy'}} + {{timezoneDate(log.context.time) | date: 'EEE MMM dd yyyy'}} - {{log.context.time | date: 'yyyy-MM-ddTHH:mm:ss:Z'}} + {{timezoneDate(log.context.time) | date: 'yyyy-MM-ddTHH:mm:ss:Z'}} diff --git a/static/partials/elements/sidebarLoggers.html b/static/partials/elements/sidebarLoggers.html index c676dd7..a31ac55 100644 --- a/static/partials/elements/sidebarLoggers.html +++ b/static/partials/elements/sidebarLoggers.html @@ -5,11 +5,11 @@