Awight has submitted this change and it was merged.
Change subject: Parameterize date-picker
......................................................................
Parameterize date-picker
Change-Id: I8d85ec7831711d7ed4e69248ceefd741644a9a58
---
M src/components/utils/date-pickers/date-pickers.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
3 files changed, 10 insertions(+), 12 deletions(-)
Approvals:
Awight: Verified; Looks good to me, approved
diff --git a/src/components/utils/date-pickers/date-pickers.js
b/src/components/utils/date-pickers/date-pickers.js
index b7dbe9b..5d5ea4c 100644
--- a/src/components/utils/date-pickers/date-pickers.js
+++ b/src/components/utils/date-pickers/date-pickers.js
@@ -24,7 +24,7 @@
self.chosenTimePeriodToTime = ko.observable('');
//TODO: handle resetting fields
- self.chosenTimePeriod = ko.computed( function (){
+ self.chosenTimePeriod = ko.pureComputed( function (){
var timePeriod;
if (self.dateBeginRange() && self.dateEndRange()){
@@ -39,6 +39,10 @@
});
+ self.chosenTimePeriod.subscribe( function(newVal){
+ params.selectedTimePeriod(newVal);
+ });
+
self.submitTimePeriod = function(){
console.log('the time period was submitted');
};
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 1528d1f..754da03 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -12,7 +12,7 @@
<div class="col-md-12 gauge">
<div class="row">
- <h3 class="text-center" data-bind="text:
chosenTimePeriod"></h3>
+ <h3 class="text-center" data-bind="text:
selectedTimePeriod"></h3>
</div>
<div class="row">
@@ -44,8 +44,7 @@
</div>
<!--Call Date Pickers Component to
handle date range-->
- <div data-bind="component:
'date-pickers'">></div>
-
+ <date-pickers
params="selectedTimePeriod: selectedTimePeriod"></date-pickers>
<div class="form-group
filterPickerForm">
<label>Filter By:</label>
@@ -64,9 +63,6 @@
</form>
</div>
<div class="modal-footer">
- <div class="alert alert-danger widget-alert
pull-left" data-bind="visible: hasMadeSelection">
- <p id="timePeriodSelections">You have
chosen: <span data-bind="text: chosenTimePeriod"></span></p>
- </div>
<button type="button" class="btn btn-default"
data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success"
data-dismiss="modal" data-bind="click: submitGaugeModifications">Submit</button>
</div>
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index f344ac6..797710e 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -9,9 +9,7 @@
var self = this;
self.title = 'Fraud Rejections';
- self.chosenTimePeriod = ko.observable('Last 15 Minutes');
-
-
+ self.selectedTimePeriod = ko.observable();
self.chosenFilters = ko.observableArray([]);
self.getFilters = ko.computed( function(){
@@ -45,7 +43,6 @@
self.filters = ko.observableArray(filters);
});
- self.getFilters();
//Gauge options
self.opts = {
@@ -114,7 +111,8 @@
self.submitGaugeModifications = function(){
//TODO: get all values from the form into the SQL query
//run that query and generate the new widget
- console.log('submit');
+
+ console.log('selected date: ', self.selectedTimePeriod());
};
}
--
To view, visit https://gerrit.wikimedia.org/r/154971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d85ec7831711d7ed4e69248ceefd741644a9a58
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
