Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195996
Change subject: Fix time display, remove refresh and profile btns
......................................................................
Fix time display, remove refresh and profile btns
Change-Id: Ia0bbb34c0101647d5e17317453db763e94e93db8
---
M src/components/boards/generic-board/generic-board.html
M src/components/nav-bar/nav-bar.html
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
4 files changed, 32 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/96/195996/1
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index dcdcc9e..7797fae 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -6,9 +6,9 @@
<p data-bind="text: displayDate"></p>
</div>
<div class="col-md-8 titleCol">
- <div class="btn-group btn-group-xs pull-right">
+ <!-- <div class="btn-group btn-group-xs pull-right">
<button type="button" class="btn btn-default"
data-bind="click: reloadBoard"><i class="fa fa-refresh"
style="padding-right:5px"></i> Refresh</button>
- </div>
+ </div> -->
</div>
</div>
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index b1fb42a..6e2a1c1 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -27,7 +27,7 @@
<div class="hide subNavBoardOpts
subNavButton" id="profileLinks">
<ul>
<li><a
href="/logout">Log out</a></li>
- <li id="Profile"
data-bind="click: $parent.setDisplayPage">Profile</li>
+ <!-- <li id="Profile"
data-bind="click: $parent.setDisplayPage">Profile</li> -->
</ul>
</div>
</span>
diff --git a/src/components/widgets/x-by-y/x-by-y.html
b/src/components/widgets/x-by-y/x-by-y.html
index 3229239..210f9ec 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -97,7 +97,7 @@
<div class="row-fluid" data-bind="if:
chartLoaded">
- <h1 data-bind="text: title"></h1>
+ <h2 data-bind="text: title"></h2>
<h4 data-bind="visible:
chosenFilters > 0">Narrowed by:
<span data-bind="foreach:
chosenFilters">
<span class='label
label-success' data-bind="text: $data"></span>
@@ -152,7 +152,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span
aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- <h4 class="modal-title">Fraud Gauge SQL:</h4>
+ <h4 class="modal-title">Chart SQL:</h4>
</div>
<div class="modal-body" data-bind="text: queryStringSQL"></div>
</div><!-- /.modal-content -->
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 7a36515..cbbaea3 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -11,19 +11,21 @@
function XByYChartViewModel( params ){
WidgetBase.call( this, params );
- var self = this,
- wasSaved = self.chartSaved(); //populateChoices() may
overwrite
- self.showSlice = ko.observable();
- self.bySlice = ko.observable();
- self.timeChoice = ko.observable();
- self.queryRequest = {};
- self.queryString = '';
- self.chosenFilters = ko.observableArray();
- self.subChoices = ko.observableArray();
+ var self = this,
+ wasSaved = self.chartSaved(); //populateChoices() may
overwrite
+
+ self.showSlice = ko.observable();
+ self.bySlice = ko.observable();
+ self.timeChoice = ko.observable();
+ self.displayedTimeChoice = ko.observable('');
+ self.queryRequest = {};
+ self.queryString = '';
+ self.chosenFilters = ko.observableArray();
+ self.subChoices = ko.observableArray();
self.chartWidth(950);
self.title = ko.computed(function(){
- return self.showSlice(); //+ ' by ' + self.bySlice();
+ return self.showSlice() + ' from ' +
self.displayedTimeChoice();
});
self.makeChart = function(data){
@@ -322,6 +324,21 @@
//self.queryRequest.additionalFilters =
self.chosenFilters();
self.queryRequest.timeBreakout = self.timeChoice();
+ //convert time choice into actual time descriptor for display
+ var from = '';
+ switch(self.timeChoice()){
+ case 'Year':
+ from = moment().subtract(1, 'year').format('MMMM Do,
YYYY');
+ break;
+ case 'Month':
+ from = moment().subtract(1, 'month').format('MMMM Do,
YYYY');
+ break;
+ case 'Day':
+ from = moment().subtract(1, 'day').format('MMMM Do, YYYY');
+ break;
+ }
+ self.displayedTimeChoice( from + ' to ' + moment().format('MMMM
Do, YYYY'));
+
self.queryString =
self.convertToQuery(self.queryRequest);
self.config.showSlice = self.showSlice();
self.config.queryString = self.queryString;
--
To view, visit https://gerrit.wikimedia.org/r/195996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0bbb34c0101647d5e17317453db763e94e93db8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
