openstack/vitrage-dashboard
Code Issues Proposed changes

Merge "Enable changing 'Ended' date filter in Vitrage alarm history view"

Browse Source
This commit is contained in:
Zuul 2019-03-26 12:34:39 +00:00 committed by Gerrit Code Review
commit a093faa919
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
View File

@ -69,10 +69,14 @@
}; };
alarmList.getHistoryData = function (nextPrev) { alarmList.getHistoryData = function (nextPrev, updateDate) {
if (nextPrev === 'next' && !alarmList.nextEnabled) { if (nextPrev === 'next' && !alarmList.nextEnabled) {
return; return;
} }
if(updateDate=='update'){
alarmList.toDateTime = new Date();
alarmList.toDateTime.setMilliseconds(0);
}
var url = $location.absUrl(); var url = $location.absUrl();
var config = { var config = {

12
vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
View File

@ -7,18 +7,18 @@
<label class="btn btn-primary" <label class="btn btn-primary"
ng-model="alarmList.radioModel" ng-model="alarmList.radioModel"
uib-btn-radio="'activeAlarms'" uib-btn-radio="'activeAlarms'"
ng-click="alarmList.getHistoryData('')">Active ng-click="alarmList.getHistoryData('', '')">Active
Alarms</label> Alarms</label>
<label class="btn btn-primary" <label class="btn btn-primary"
ng-model="alarmList.radioModel" ng-model="alarmList.radioModel"
ng-click="alarmList.getHistoryData('')" ng-click="alarmList.getHistoryData('', 'update')"
uib-btn-radio="'historyAlarms'">Alarm History</label> uib-btn-radio="'historyAlarms'">Alarm History</label>
</div> </div>
<div ng-hide="alarmList.radioModel === 'historyAlarms'" class="themable-checkbox refreshBtn" > <div ng-hide="alarmList.radioModel === 'historyAlarms'" class="themable-checkbox refreshBtn" >
<input type="checkbox" ng-model="alarmList.checkboxAutoRefresh" id="themable-checkbox" ng-change="alarmList.autoRefreshChanged()"> <input type="checkbox" ng-model="alarmList.checkboxAutoRefresh" id="themable-checkbox" ng-change="alarmList.autoRefreshChanged()">
<label for="themable-checkbox" >Auto Refresh</label> <label for="themable-checkbox" >Auto Refresh</label>
</div> </div>
<div ng-show="alarmList.radioModel === 'historyAlarms'" style="display: inline;"> <div ng-show="alarmList.radioModel === 'historyAlarms'" style="display: inline;">
<label>Started</label> <label>Started</label>
@ -29,7 +29,7 @@
<input type="datetime-local" ng-model="alarmList.toDateTime"/> <input type="datetime-local" ng-model="alarmList.toDateTime"/>
<button class="btn btn-primary" <button class="btn btn-primary"
ng-click="alarmList.getHistoryData()"> ng-click="alarmList.getHistoryData('', '')">
Fetch Alarms Fetch Alarms
</button> </button>
</div> </div>