Separate elapsed and active silences

This commit is contained in:
Fabian Reinartz 2015-11-10 11:19:04 +01:00
parent 3cdc3c5359
commit 91db91ef4a
3 changed files with 24 additions and 2 deletions

View File

@ -68,6 +68,10 @@ header #logo {
opacity: 1.0; opacity: 1.0;
} }
.active-silences, .elapsed-silences {
margin-bottom: 12px;
}
.alert-item .overview { .alert-item .overview {
background: #f0f0f0; background: #f0f0f0;
padding: .8em; padding: .8em;

View File

@ -269,6 +269,15 @@ angular.module('am.controllers').controller('SilencesCtrl',
$scope.refresh(); $scope.refresh();
}); });
$scope.elapsed = function(elapsed) {
return function(sil) {
if (elapsed) {
return sil.endsAt <= new Date;
}
return sil.endsAt > new Date;
}
};
$scope.refresh(); $scope.refresh();
} }
); );

View File

@ -27,8 +27,17 @@
<div ng-hide="silences.length == 0" id="silences-list"> <div ng-hide="silences.length == 0" id="silences-list">
<div class="list-item group" ng-repeat="sil in silences | filter:query | orderBy:order:reverse"> <div class="active-silences">
<silence sil="sil"></silence> <h4 class="thin">Active</h4>
<div class="list-item group" ng-repeat="sil in silences | filter:query | filter:elapsed(false) | orderBy:order">
<silence sil="sil"></silence>
</div>
</div> </div>
<div class="elapsed-silences">
<h4 class="thin">Elapsed</h4>
<div class="list-item group" ng-repeat="sil in silences | filter:query | filter:elapsed(true) | orderBy:order">
<silence sil="sil"></silence>
</div>
</div>
</div> </div>