Display log events in user time
Allows user to display events in their timezone or in UTC.
Previously allowed either ETC or UTC, but listed ETC as
'user timezone'. Updates date time page from GMT offset to
UTC offset for overall consistency. Also updates overview
page to list critical events in user timezone
Resolves openbmc/phosphor-webui#36
Tested: changed timezone settings locally and validated
that correct timezone and UTC offset was presented in
the UI.
Change-Id: I89ca5045eeb789527aa07f5b1baebaa3fbd6b1fa
Signed-off-by: beccabroek <beccabroek@gmail.com>
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index 5a05bc2..48ede3e 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -85,7 +85,7 @@
</a>
<div class="quick-links__item no-icon">
<p class="inline quick-links__label">BMC time</p>
- <p class="inline courier-bold float-right">{{bmc_time | date:'medium'}}</p>
+ <p class="inline courier-bold float-right bmc-time">{{(bmc_time | date:'medium') + ' ' + tmz}}</p>
</div>
<div class="quick-links__item no-icon">
<p class="inline quick-links__label">Turn <span ng-if="dataService.LED_state == 'off'">on</span><span ng-if="dataService.LED_state == 'on'">off</span> server LED</p>
@@ -132,7 +132,7 @@
<p class="inline event__id">#{{event.Id}}</p>
<p class="inline event__priority high-priority">High</p>
<p class="inline event__severity high-priority">{{event.severity_code}}</p>
- <p class="inline event__timestamp">{{(event.Timestamp | date:'medium': tmz) + ' ' + tmz}}</p>
+ <p class="inline event__timestamp">{{(event.Timestamp | date:'medium') + ' ' + tmz}}</p>
<div>
<p class="inline event__description">{{getEventLogTitle(event)}}</p>
</div>
diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
index e7d9c6b..6393ebc 100644
--- a/app/overview/controllers/system-overview-controller.js
+++ b/app/overview/controllers/system-overview-controller.js
@@ -14,7 +14,7 @@
function($scope, $window, APIUtils, dataService, Constants, $q) {
$scope.dataService = dataService;
$scope.dropdown_selected = false;
- $scope.tmz = 'EDT';
+ $scope.tmz = getUserTimezone();
$scope.logs = [];
$scope.server_info = {};
$scope.bmc_firmware = '';
@@ -159,6 +159,9 @@
}
return title;
};
+ function getUserTimezone() {
+ return new Date().toString().match(/\(([A-Za-z\s].*)\)/)[1];
+ }
}
]);
})(angular);