From a290b4e22b87ec14a5bc1ac2780b4e4c896b37b1 Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Mon, 3 Nov 2014 16:55:37 -0800 Subject: [PATCH 1/2] Implement absolute date preference --- _attachments/partials/admin.html | 4 ++++ _attachments/script/BugsBrowserControllers.js | 2 +- _attachments/script/DashboardControllers.js | 4 ++-- _attachments/script/service.reportsstore.js | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/_attachments/partials/admin.html b/_attachments/partials/admin.html index c490848..43e9eba 100644 --- a/_attachments/partials/admin.html +++ b/_attachments/partials/admin.html @@ -22,6 +22,10 @@

Your default reports database is

+

Display dates as  timestamps +  relative dates +

+
diff --git a/_attachments/script/BugsBrowserControllers.js b/_attachments/script/BugsBrowserControllers.js index 093aa8b..9775026 100644 --- a/_attachments/script/BugsBrowserControllers.js +++ b/_attachments/script/BugsBrowserControllers.js @@ -126,7 +126,7 @@ mergeBugsLists($scope.bugsList, data.rows); $scope.totalBugs = data.total_rows; for(var row = 0; row < $scope.bugsList.length; row++) { - $scope.bugsList[row].latest = moment($scope.bugsList[row].value.latest).fromNow(); + $scope.bugsList[row].latest = acralyzerConfig.formatDate($scope.bugsList[row].value.latest); } $scope.loading = false; }, diff --git a/_attachments/script/DashboardControllers.js b/_attachments/script/DashboardControllers.js index 497f57e..5b1a77e 100644 --- a/_attachments/script/DashboardControllers.js +++ b/_attachments/script/DashboardControllers.js @@ -49,7 +49,7 @@ $scope.reports = data.rows; $scope.totalReports = data.total_rows; for(var row = 0; row < $scope.reports.length; row++) { - $scope.reports[row].displayDate = moment($scope.reports[row].key).fromNow(); + $scope.reports[row].displayDate = acralyzerConfig.formatDate($scope.reports[row].key); } }, function(response, getResponseHeaders){ @@ -126,7 +126,7 @@ mergeBugsLists($scope.bugs, data.rows); $scope.totalBugs = data.total_rows; for(var row = 0; row < $scope.bugs.length; row++) { - $scope.bugs[row].latest = moment($scope.bugs[row].value.latest).fromNow(); + $scope.bugs[row].latest = acralyzerConfig.formatDate($scope.bugs[row].value.latest); } }, function(response, getResponseHeaders){ diff --git a/_attachments/script/service.reportsstore.js b/_attachments/script/service.reportsstore.js index fa172d5..b908c62 100644 --- a/_attachments/script/service.reportsstore.js +++ b/_attachments/script/service.reportsstore.js @@ -108,7 +108,7 @@ data.next_row = data.rows.splice(reportsCount,1)[0]; } for(var row = 0; row < data.rows.length; row++) { - data.rows[row].displayDate = moment(data.rows[row].key).fromNow(); + data.rows[row].displayDate = acralyzerConfig.formatDate(data.rows[row].key); } cb(data); }; @@ -147,11 +147,11 @@ for(var row = 0; row < data.rows.length; row++) { if(filterName === "bug") { - data.rows[row].displayDate = moment(data.rows[row].key[3]).fromNow(); + data.rows[row].displayDate = acralyzerConfig.formatDate(data.rows[row].key[3]); } else if(filterName === "bug-by-installation-id") { - data.rows[row].displayDate = moment(data.rows[row].key[4]).fromNow(); + data.rows[row].displayDate = acralyzerConfig.formatDate(data.rows[row].key[4]); } else { - data.rows[row].displayDate = moment(data.rows[row].key[1]).fromNow(); + data.rows[row].displayDate = acralyzerConfig.formatDate(data.rows[row].key[1]); } } From c095cb85014bc4c19c8f48b0450df3f54f5b23c3 Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Wed, 5 Nov 2014 15:06:54 -0800 Subject: [PATCH 2/2] Add helper function --- _attachments/script/config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_attachments/script/config.js b/_attachments/script/config.js index c6692d0..b3f0012 100644 --- a/_attachments/script/config.js +++ b/_attachments/script/config.js @@ -5,7 +5,12 @@ acralyzerConfig.backgroundPollingOnStartup = true; acralyzerConfig.appDBPrefix = "acra-"; + acralyzerConfig.displayRelativeDates = true; // Helper functions + acralyzerConfig.formatDate = function(d) { + var m = moment(d); + return acralyzerConfig.displayRelativeDates ? m.fromNow() : m.format(); + }; }( window.acralyzerConfig = window.acralyzerConfig || {} ));