shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

[system_tracking] Display message when dates for retrieved data change

Browse Source
This commit is contained in:
Joe Fiorini 2015-06-22 11:03:12 -04:00
parent 336a8f23bd
commit 2955cfbfe8
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/system-tracking/date-picker/date-picker.directive.js
View File

@ -14,7 +14,8 @@ export default
scope: {
date: '=',
minDate: '=',
autoUpdate: '=?'
autoUpdate: '=?',
inputClass: '&'
},
templateUrl: '/static/js/system-tracking/date-picker/date-picker.partial.html',
link: function(scope, element, attrs) {

3
awx/ui/static/js/system-tracking/date-picker/date-picker.partial.html
View File

@ -4,6 +4,7 @@
class="DatePicker-input"
type="text"
readonly
ng-model="dateValue">
ng-model="dateValue"
ng-class="inputClass()">
<p class="error" ng-if="error">{{error}}</p>
</div>

10
awx/ui/static/js/system-tracking/system-tracking.controller.js
View File

@ -72,6 +72,8 @@ function controller($rootScope,
$scope.leftDataNoScans = false;
$scope.rightDataNoScans = false;
$scope.leftDateWarning = false;
$scope.rightDateWarning = false;
waitIndicator('start');
@ -97,6 +99,10 @@ function controller($rootScope,
$scope.leftScanDate = $scope.leftDate;
} else {
$scope.leftScanDate = moment(responses[0].timestamp);
if (!$scope.leftScanDate.isSame($scope.leftDate, 'd')) {
$scope.leftDateWarning = true;
}
}
if (_.isEmpty(data[1])) {
@ -104,6 +110,10 @@ function controller($rootScope,
$scope.rightScanDate = $scope.rightDate;
} else {
$scope.rightScanDate = moment(responses[1].timestamp);
if (!$scope.rightScanDate.isSame($scope.rightDate, 'd')) {
$scope.rightDateWarning = true;
}
}
return data;

21
awx/ui/static/js/system-tracking/system-tracking.partial.html
View File

@ -21,11 +21,28 @@
<div class="FactModulePickers">
<div class="FactModulePickers-dateContainer FactModulePickers-dateContainer--left">
<span class="FactModulePickers-label">{{ factModulePickersLabelLeft }}</span>
<date-picker date="leftDate"></date-picker>
<date-picker
date="leftDate"
input-class='{ "u-input-info-alert": leftDateWarning }'>
</date-picker>
<span
class="FactModulePickers-warning"
ng-class='{ "u-hiddenVisually": !leftDateWarning, "u-info-alert": leftDateWarning }'>
There were no fact scans on this date, using a prior scan instead.
</span>
</div>
<div class="FactModulePickers-dateContainer FactModulePickers-dateContainer--right" ng-show="compareMode == 'single-host'">
<span class="FactModulePickers-label">{{ factModulePickersLabelRight }}</span>
<date-picker date="rightDate" min-date="leftDate"></date-picker>
<date-picker
date="rightDate"
min-date="leftDate"
input-class='{ "u-input-info-alert": rightDateWarning }'>
</date-picker>
<span
class="FactModulePickers-warning"
ng-class='{ "u-hiddenVisually": !rightDateWarning, "u-info-alert": rightDateWarning }'>
There were no fact scans on this date, using a prior scan instead.
</span>
</div>
</div>