You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/11/07 01:05:25 UTC
ambari git commit: AMBARI-13766. Inappropriate scaling in query
history "filter by duration" (Pallav Kulshreshtha via srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 4fe63f735 -> 7536e0ecf
AMBARI-13766. Inappropriate scaling in query history "filter by duration" (Pallav Kulshreshtha via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7536e0ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7536e0ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7536e0ec
Branch: refs/heads/branch-2.1
Commit: 7536e0ecfaccff6dd43f3935c6ca7565922ef086
Parents: 4fe63f7
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Nov 6 16:05:01 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Nov 6 16:05:01 2015 -0800
----------------------------------------------------------------------
.../app/components/number-range-widget.js | 7 ++++++
.../components/number-range-widget.hbs | 4 ++--
.../ui/hive-web/app/utils/functions.js | 24 ++++++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7536e0ec/contrib/views/hive/src/main/resources/ui/hive-web/app/components/number-range-widget.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/number-range-widget.js b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/number-range-widget.js
index 80489dc..7c5f69c 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/number-range-widget.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/number-range-widget.js
@@ -17,6 +17,7 @@
*/
import Ember from 'ember';
+import utils from 'hive/utils/functions';
export default Ember.Component.extend({
didInsertElement: function () {
@@ -26,6 +27,9 @@ export default Ember.Component.extend({
if (!numberRange.get('from') && !numberRange.get('to')) {
numberRange.set('from', numberRange.get('min'));
numberRange.set('to', numberRange.get('max'));
+ numberRange.set('fromDuration',utils.secondsToHHMMSS(numberRange.get('min')));
+ numberRange.set('toDuration',utils.secondsToHHMMSS(numberRange.get('max')));
+
}
this.$('.slider').slider({
@@ -38,6 +42,9 @@ export default Ember.Component.extend({
slide: function (event, ui) {
numberRange.set('from', ui.values[0]);
numberRange.set('to', ui.values[1]);
+ numberRange.set('fromDuration', utils.secondsToHHMMSS(ui.values[0]));
+ numberRange.set('toDuration', utils.secondsToHHMMSS(ui.values[1]));
+
},
change: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/7536e0ec/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/number-range-widget.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/number-range-widget.hbs b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/number-range-widget.hbs
index 279ec07..da99e9c 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/number-range-widget.hbs
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/number-range-widget.hbs
@@ -18,6 +18,6 @@
<div class="slider"></div>
<div class="slider-labels">
- <span class="pull-left">{{numberRange.from}}</span>
- <span class="pull-right">{{numberRange.to}}{{numberRange.units}}</span>
+ <span class="pull-left">{{numberRange.fromDuration}}</span>
+ <span class="pull-right">{{numberRange.toDuration}}</span>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/7536e0ec/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/functions.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/functions.js b/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/functions.js
index 73dbc8c..91e1a1c 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/functions.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/functions.js
@@ -78,6 +78,30 @@ export default Ember.Object.create({
}
}
return array;
+ },
+
+ /**
+ * Convert number of seconds into time object HH MM SS
+ *
+ * @param integer secs Number of seconds to convert
+ * @return object
+ */
+ secondsToHHMMSS: function (secs)
+ {
+ var hours = Math.floor(secs / (60 * 60));
+
+ var divisor_for_minutes = secs % (60 * 60);
+ var minutes = Math.floor(divisor_for_minutes / 60);
+
+ var divisor_for_seconds = divisor_for_minutes % 60;
+ var seconds = Math.ceil(divisor_for_seconds);
+
+ var obj = {
+ "h": hours,
+ "m": minutes,
+ "s": seconds
+ };
+ return ((obj.h > 0) ? obj.h + ' hr ' : '') + ((obj.m > 0) ? obj.m + ' min ' : '') + ((obj.s >= 0) ? obj.m + ' sec ' : '');
}
});