Add dateFormat choice to charts and other hardcoded MM/DD/YYYY

This commit is contained in:
Verabird
2015-01-23 12:02:32 -05:00
parent 9b5b83871f
commit 3cb182fb53
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -111,7 +111,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
.controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members', 'Shared', '$http', 'Notification', 'Groups',
function($scope, $rootScope, Members, Shared, $http, Notification, Groups) {
$scope.timestamp = function(timestamp){
return moment(timestamp).format('MM/DD/YYYY');
return moment(timestamp).format(User.user.preferences.dateFormat.toUpperCase());
}
// We watch Members.selectedMember because it's asynchronously set, so would be a hassle to handle updates here
$scope.$watch( function() { return Members.selectedMember; }, function (member) {
+1 -1
View File
@@ -166,7 +166,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
}
matrix = [['Date', 'Score']];
_.each(history, function(obj) {
matrix.push([moment(obj.date).format('MM/DD/YY'), obj.value]);
matrix.push([moment(obj.date).format(User.user.preferences.dateFormat.toUpperCase()), obj.value]);
});
data = google.visualization.arrayToDataTable(matrix);
options = {