Skip to content
This repository was archived by the owner on Nov 17, 2017. It is now read-only.

Commit 5210a0b

Browse files
ethanhannethanhann
committed
Update to use eeh-inengine-api beta7
1 parent 3f95d19 commit 5210a0b

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎app/health-status/health-status.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@
1414
scope.servers = [
1515
{
1616
name: 'Mail Server',
17-
isAvailable: healthStatus.IsMailServerAvailable
17+
isAvailable: healthStatus.isMailServerAvailable
1818
},
1919
{
2020
name: 'Message Queue Server',
21-
isAvailable: healthStatus.IsMessageQueueServerAvailable
21+
isAvailable: healthStatus.isMessageQueueServerAvailable
2222
},
2323
{
2424
name: 'Elasticsearch Server',
25-
isAvailable: healthStatus.IsElasticsearchServerAvailable
25+
isAvailable: healthStatus.isElasticsearchServerAvailable
2626
}
2727
];
28-
2928
});
3029
}
3130
}

‎app/home/home.html

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ <h3>Connection Status</h3>
55
<div class="col-md-4">
66
<h2>Job Types</h2>
77
<ul class="list-group">
8-
<li class="list-group-item" ng-repeat="jobType in jobTypes" title="{{ jobType.FullName }}">
9-
{{ jobType.Name }}
8+
<li class="list-group-item" ng-repeat="jobType in jobTypes" title="{{ jobType.fullName }}">
9+
{{ jobType.name }}
1010
</li>
1111
</ul>
1212
</div>
1313
<div class="col-md-4">
1414
<h2>Cron Triggers</h2>
1515
<div class="panel panel-default" ng-repeat="trigger in cronTriggers">
1616
<div class="panel-heading">
17-
<span class="label" ng-class="{'label-success': trigger.StateId == 0, 'label-info': trigger.StateId == 1}">{{ trigger.StateDescription }}</span>
18-
{{ trigger.CronExpressionDescription }}
17+
<span class="label" ng-class="{'label-success': trigger.stateId == 0, 'label-info': trigger.stateId == 1}">{{ trigger.stateDescription }}</span>
18+
{{ trigger.cronExpressionDescription }}
1919
<button type="button" class="close pull-right" data-dismiss="alert" ng-click="deleteCronTrigger(trigger)">×</button>
2020
</div>
2121
<div class="panel-body">
2222
<strong>Id</strong>
23-
<div>{{ trigger.Id }}</div>
23+
<div>{{ trigger.id }}</div>
2424
<strong>Job Type</strong>
25-
<div>{{ trigger.JobType }}</div>
25+
<div>{{ trigger.jobType }}</div>
2626
<strong>Cron Expression</strong>
27-
<div>{{ trigger.CronExpressionString }}</div>
27+
<div>{{ trigger.cronExpressionString }}</div>
2828
<strong>Time Zone</strong>
29-
<div>{{ trigger.TimeZoneInfo.DisplayName }}</div>
29+
<div>{{ trigger.timeZoneId }}</div>
3030
<hr>
3131
<button type="button" class="btn btn-default" ng-click="pauseCronTrigger(trigger)">
32-
<span ng-if="trigger.StateId == 0">Pause</span>
33-
<span ng-if="trigger.StateId == 1">Resume</span>
32+
<span ng-if="trigger.stateId == 0">Pause</span>
33+
<span ng-if="trigger.stateId == 1">Resume</span>
3434
</button>
3535
</div>
3636
</div>
@@ -40,25 +40,25 @@ <h2>Cron Triggers</h2>
4040
<h2>Simple Triggers</h2>
4141
<div class="panel panel-default" ng-repeat="trigger in simpleTriggers">
4242
<div class="panel-heading">
43-
<span class="label" ng-class="{'label-success': trigger.StateId == 0, 'label-info': trigger.StateId == 1}">{{ trigger.StateDescription }}</span>
44-
{{ trigger.StartTimeUtc | amDateFormat:'dddd, MMMM Do YYYY, h:mm:ss a' }}
43+
<span class="label" ng-class="{'label-success': trigger.stateId == 0, 'label-info': trigger.stateId == 1}">{{ trigger.stateDescription }}</span>
44+
{{ trigger.startTimeUtc | amDateFormat:'dddd, MMMM Do YYYY, h:mm:ss a' }}
4545
<button type="button" class="close pull-right" data-dismiss="alert" ng-click="deleteSimpleTrigger(trigger)">×</button>
4646
</div>
4747
<div class="panel-body">
4848
<strong>Id</strong>
49-
<div>{{ trigger.Id }}</div>
49+
<div>{{ trigger.id }}</div>
5050
<strong>Job Type</strong>
51-
<div>{{ trigger.JobType }}</div>
51+
<div>{{ trigger.jobType }}</div>
5252
<strong>Start Time UTC</strong>
53-
<div>{{ trigger.StartTimeUtc }}</div>
53+
<div>{{ trigger.startTimeUtc }}</div>
5454
<strong>Interval</strong>
55-
<div>{{ trigger.RepeatInterval }}</div>
55+
<div>{{ trigger.repeatInterval }}</div>
5656
<strong>Repetitions</strong>
57-
<div>{{ trigger.RepeatCount }}</div>
57+
<div>{{ trigger.repeatCount }}</div>
5858
<hr>
5959
<button type="button" class="btn btn-default" ng-click="pauseSimpleTrigger(trigger)">
60-
<span ng-if="trigger.StateId == 0">Pause</span>
61-
<span ng-if="trigger.StateId == 1">Resume</span>
60+
<span ng-if="trigger.stateId == 0">Pause</span>
61+
<span ng-if="trigger.stateId == 1">Resume</span>
6262
</button>
6363
</div>
6464
</div>

‎app/home/home.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
function removeItemById(collection, id) {
1818
angular.forEach(collection, function(item, index) {
19-
if (item.Id == id){
19+
if (item.id === id){
2020
collection.splice(index, 1);
2121
}
2222
});
@@ -25,20 +25,20 @@
2525
$scope.deleteCronTrigger = function (trigger) {
2626
eehInEngineApi.deleteCronTrigger(trigger)
2727
.then(function (trigger) {
28-
removeItemById($scope.cronTriggers, trigger.Id);
28+
removeItemById($scope.cronTriggers, trigger.id);
2929
});
3030
};
3131

3232
$scope.deleteSimpleTrigger = function (trigger) {
3333
eehInEngineApi.deleteSimpleTrigger(trigger)
3434
.then(function (trigger) {
35-
removeItemById($scope.simpleTriggers, trigger.Id);
35+
removeItemById($scope.simpleTriggers, trigger.id);
3636
});
3737
};
3838

3939
function replaceItemById(collection, id, replacementItem) {
4040
angular.forEach(collection, function(item, index) {
41-
if (item.Id == id){
41+
if (item.id === id){
4242
collection[index] = replacementItem;
4343
}
4444
});
@@ -47,14 +47,15 @@
4747
$scope.pauseCronTrigger = function (trigger) {
4848
eehInEngineApi.pauseCronTrigger(trigger)
4949
.then(function (updatedTrigger) {
50-
replaceItemById($scope.cronTriggers, updatedTrigger.Id, updatedTrigger)
50+
console.log(updatedTrigger);
51+
replaceItemById($scope.cronTriggers, updatedTrigger.id, updatedTrigger)
5152
});
5253
};
5354

5455
$scope.pauseSimpleTrigger = function (trigger) {
5556
eehInEngineApi.pauseSimpleTrigger(trigger)
5657
.then(function (updatedTrigger) {
57-
replaceItemById($scope.simpleTriggers, updatedTrigger.Id, updatedTrigger)
58+
replaceItemById($scope.simpleTriggers, updatedTrigger.id, updatedTrigger)
5859
});
5960
};
6061
}

‎bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"angular": "~1.3.9",
1717
"angular-moment": "~0.9.0",
1818
"angular-resource": "~1.3.9",
19-
"bootswatch": "~3.3.1",
19+
"bootswatch": "~3.3.2",
2020
"eeh-navigation": "~3.0.0",
21-
"eeh-inengine-api": "~2.0.0-beta5",
21+
"eeh-inengine-api": "~2.0.0-beta7",
2222
"angular-ui-calendar": "~0.8.1",
2323
"later": "*"
2424
},

0 commit comments

Comments
 (0)