Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2017-11-08 14:54:39 +0000
committermegumi.telles2017-11-28 17:12:58 +0000
commitdf46aead154115407876927592697d9fc143e2c6 (patch)
treee71af70939cea697b95d6992574fb5f9d1e56c84 /plugins/org.eclipse.osee.web.ui
parent8e082af162e65f086b4b0cea25e7d62f922a7abe (diff)
downloadorg.eclipse.osee-df46aead154115407876927592697d9fc143e2c6.tar.gz
org.eclipse.osee-df46aead154115407876927592697d9fc143e2c6.tar.xz
org.eclipse.osee-df46aead154115407876927592697d9fc143e2c6.zip
feature[ats_TW3987]: Provide coverage rerun list
Diffstat (limited to 'plugins/org.eclipse.osee.web.ui')
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/adminController.js68
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js1
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/views/admin.html24
3 files changed, 88 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/js/adminController.js b/plugins/org.eclipse.osee.web.ui/src/dispo/js/adminController.js
index 375fad1ea3..226a337434 100644
--- a/plugins/org.eclipse.osee.web.ui/src/dispo/js/adminController.js
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/js/adminController.js
@@ -8,8 +8,9 @@ app.controller('adminController', [
'CopySet',
'CopySetCoverage',
'MultiItemEdit',
+ 'Config',
'uiGridConstants',
- function($scope, $rootScope, $modal, Program, Set, Report, CopySet, CopySetCoverage, MultiItemEdit, uiGridConstants) {
+ function($scope, $rootScope, $modal, Program, Set, Report, CopySet, CopySetCoverage, MultiItemEdit, Config, uiGridConstants) {
$scope.readOnly = true;
$scope.programSelection = null;
$scope.modalShown = false;
@@ -21,13 +22,14 @@ app.controller('adminController', [
$scope.selectedItems = [];
$scope.isRunningOperation = false;
$scope.cachedValue = "";
-
+ $scope.types = [];
+ $scope.isCoverage = $rootScope.type == 'codeCoverage';
$scope.programs = Program.query();
var isPrimary = function(importState) {
return row.entity.importState != "Warnings" && row.entity.importState != "Failed";
}
-
+
$scope.createNewProgram = function() {
if ($scope.newProgramName != "") {
var loadingModal = $scope.showLoadingModal();
@@ -218,6 +220,12 @@ app.controller('adminController', [
loadingModal.close();
alert(data.statusText);
});
+ Config.get({
+ programId: $scope.programSelection,
+ type: $rootScope.type
+ }, function(data) {
+ $scope.types = data.validResolutions;
+ });
};
$scope.editSet = function editSet(set) {
@@ -354,6 +362,21 @@ app.controller('adminController', [
};
+ $scope.rerunReportStatus = function rerunReportStatus (input) {
+ var newSet = $scope.getSetById(input.rerunDispositionSet);
+ var request = [];
+ request.push(
+ "/dispo/program/",
+ $scope.programSelection,
+ "/admin/rerun?primarySet=",
+ newSet.guid
+ );
+ var url = request.join("");
+ window.open(url);
+ };
+
+
+
// -------------------- Summary Grids ----------------------\\
var filterBarPlugin = {
init: function(scope, grid) {
@@ -742,5 +765,44 @@ app.controller('adminController', [
$modalInstance.dismiss('cancel');
};
}
+
+
+ // Report Reruns
+ $scope.openRerunReportStatusModal = function() {
+ var modalInstance = $modal.open({
+ templateUrl: 'rerunReportStatus.html',
+ controller: RerunReportStatusCtrl,
+ size: 'sm',
+ windowClass: 'rerunReportStatusModal',
+ resolve: {
+ sets: function() {
+ return $scope.sets;
+ },
+ types: function() {
+ return $scope.types;
+ }
+ }
+ });
+
+ modalInstance.result.then(function(inputs) {
+ $scope.rerunReportStatus(inputs);
+ });
+ }
+
+ var RerunReportStatusCtrl = function($scope, $modalInstance, sets, types) {
+ $scope.rerunDispositionSet = "";
+ $scope.setsLocal = angular.copy(sets);
+ $scope.typesLocal = angular.copy(types);
+ $scope.ok = function() {
+ var inputs = {};
+ inputs.rerunDispositionSet = this.dispositionSet;
+ inputs.rerunResolutionTypes = this.resolutionTypes;
+ $modalInstance.close(inputs);
+ };
+
+ $scope.cancel = function() {
+ $modalInstance.dismiss('cancel');
+ };
+ }
}
]); \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js b/plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js
index 5dd107798c..f689c66cf7 100644
--- a/plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js
@@ -279,4 +279,3 @@ app.provider('Annotation', function() {
];
});
-
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/views/admin.html b/plugins/org.eclipse.osee.web.ui/src/dispo/views/admin.html
index 0d10da4dde..8f3de586ca 100644
--- a/plugins/org.eclipse.osee.web.ui/src/dispo/views/admin.html
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/views/admin.html
@@ -51,7 +51,8 @@
<button ng-disabled="isRunningOperation" ng-click="openCopySetModal()" ng-show="sets.length > 0" class="btn btn-primary" id=generateReportBtn>Merge Annotations</button>
<button ng-disabled="isRunningOperation" ng-click="openMassAssignTeamModal()" ng-show="sets.length > 0" class="btn btn-primary" id=generateReportBtn>Mass Assign Team</button>
<button ng-disabled="isRunningOperation" ng-click="openConfigureCiSetModal()" ng-show="sets.length > 0" class="btn btn-primary" id=generateReportBtn>Configure CI Set</button>
- <button ng-disabled="isRunningOperation" ng-click="openMassSendDispoItemStatusModal()" ng-show="sets.length > 0" class="btn btn-primary" id=generateReportBtn>Mass Send Dispo Item Status</button>
+ <button ng-disabled="isRunningOperation" ng-click="openMassSendDispoItemStatusModal()" ng-show="!isCoverage && sets.length > 0" class="btn btn-primary" id=generateReportBtn>Mass Send Dispo Item Status</button>
+ <button ng-disabled="isRunningOperation" ng-click="openRerunReportStatusModal()" ng-show="isCoverage && sets.length > 0" class="btn btn-primary" id=generateReportBtn>Get Rerun Report</button>
</div>
</div>
</div>
@@ -242,6 +243,27 @@
</script>
+ <script type="text/ng-template" id="rerunReportStatus.html">
+ <div class="modal-header">
+ <h3 class="modal-title">Get Rerun Report</h3>
+ </div>
+ <div class="modal-body" overflow: auto;">
+ <div class="form-group">
+ Retrieves the rerun list from last known merge.
+ </div>
+ <div class="form-group">
+ Select Disposition Set
+ <select class="form-control" ng-model="dispositionSet" ng-options="obj.guid as obj.name for obj in setsLocal">
+ </select>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-primary" ng-click="ok()">OK</button>
+ <button class="btn btn-warning" ng-click="cancel()">Cancel</button>
+ </div>
+
+ </script>
+
</body>
</html>

Back to the top