diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html
index 1905c1fb626..303f42a3297 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html
@@ -53,11 +53,11 @@
No action is running
{{action.finished ? action.successful ? "Successful" : "Faild" : "-"}} |
-
+
|
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js
index 37ddc49de68..497bb2a1864 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js
@@ -42,6 +42,7 @@ angular.module('zeppelinWebApp')
$filter('date')(data.createTime,'yyyy-MM-dd HH:mm:ss');
data.finishTime = data.finished ? data.finishTime === 0 ? "-" :
$filter('date')(data.finishTime,'yyyy-MM-dd HH:mm:ss') : '-';
+ data.progress = Math.round(data.progress * 100);
data.progressColor = data.finished ? data.successful ? 'success' : 'danger' : 'warning';
});
$scope.totalPage = Math.ceil($scope.totalNumber / $scope.pageNumber);
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html
index bbb76372828..179c1b11a82 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html
@@ -53,11 +53,11 @@ No action is running
{{action.finished ? action.runTime + "ms" : "-"}} |
-
+
|
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js
index 820ae463d36..892b5490aac 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js
@@ -42,6 +42,7 @@ angular.module('zeppelinWebApp')
$filter('date')(data.createTime,'yyyy-MM-dd HH:mm:ss');
data.finishTime = data.finished ? data.finishTime === 0 ? "-" :
$filter('date')(data.finishTime,'yyyy-MM-dd HH:mm:ss') : '-';
+ data.progress = Math.round(data.progress * 100);
data.progressColor = data.finished ? data.successful ? 'success' : 'danger' : 'warning';
});
$scope.totalPage = Math.ceil($scope.totalNumber / $scope.pageNumber);
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html
index ccb27f8195d..b04b6ef9294 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html
@@ -53,11 +53,11 @@ No action is running
{{action.finished ? action.runTime + "ms" : "-"}} |
-
+
|
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js
index 4c3dea003a8..e6b5354ca98 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js
@@ -42,6 +42,7 @@ function MoverActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route) {
$filter('date')(data.createTime,'yyyy-MM-dd HH:mm:ss');
data.finishTime = data.finished ? data.finishTime === 0 ? "-" :
$filter('date')(data.finishTime,'yyyy-MM-dd HH:mm:ss') : '-';
+ data.progress = Math.round(data.progress * 100);
data.progressColor = data.finished ? data.successful ? 'success' : 'danger' : 'warning';
});
$scope.totalPage = Math.ceil($scope.totalNumber / $scope.pageNumber);
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js
index af50d608613..0c62c766393 100644
--- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js
+++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js
@@ -41,7 +41,7 @@ angular.module('zeppelinWebApp')
cols: [
$stb.indicator().key('state').canSort('state.condition+"_"+submitTime').styleClass('td-no-padding').done(),
$stb.text('ID').key('id').canSort().sortDefaultDescent().done(),
- $stb.text('Name').key(['ruleName']).canSort().done(),
+ $stb.text('Rule Text').key(['ruleText']).styleClass('col-md-1 hidden-sm hidden-xs').done(),
$stb.datetime('Submission Time').key('submitTime').canSort().done(),
$stb.datetime('Last Check Time').key('lastCheckTime').canSort().done(),
$stb.text('Checked Number').key('numChecked').canSort().styleClass('hidden-sm hidden-xs').done(),
@@ -60,14 +60,9 @@ angular.module('zeppelinWebApp')
// name: {href: pageUrl, text: rule.appName},
state: {tooltip: rule.state, condition: rule.isRunning ? 'good' : '', shape: 'stripe'},
//user: rule.user,
- ruleName: {
- value: rule.ruleName,
- title: "ID:" + rule.id + " Name:" + rule.ruleName
- + " Submission Time:" + new Date(rule.submitTime).toUTCString()
- + " Last Check Time:" + new Date(rule.lastCheckTime).toUTCString()
- + " Checked Number:" + rule.numChecked
- + " Cmdlets Generated:" + rule.numCmdsGen
- + " Status:" + rule.state
+ ruleText: {
+ value: rule.ruleText.length > 70 ? rule.ruleText.substring(0, 70) + ' ...' : rule.ruleText,
+ title: rule.ruleText
},
submitTime: rule.submitTime,
lastCheckTime: rule.lastCheckTime === 0 ? '-' : rule.lastCheckTime,
@@ -89,8 +84,10 @@ angular.module('zeppelinWebApp')
click: function () {
if(!rule.isRunning) {
rule.start();
+ rule.isRunning = true;
}else{
rule.terminate();
+ rule.isRunning = false;
}
}
},