Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2017-07-26 22:38:10 +0000
committerMegumi Telles2017-08-03 17:15:26 +0000
commitd44f86d7e37b231b4f57db20d253ec92e89052e0 (patch)
tree0c8cba31867b53097fa1dc71dea3767dc3f6ef7c /plugins/org.eclipse.osee.web.ui
parentce2f4ca4ccfb7f2cef71fda9436984043e87139a (diff)
downloadorg.eclipse.osee-d44f86d7e37b231b4f57db20d253ec92e89052e0.tar.gz
org.eclipse.osee-d44f86d7e37b231b4f57db20d253ec92e89052e0.tar.xz
org.eclipse.osee-d44f86d7e37b231b4f57db20d253ec92e89052e0.zip
feature: Add support for dispo and CI integration
Diffstat (limited to 'plugins/org.eclipse.osee.web.ui')
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/adminController.js89
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js4
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/views/admin.html43
3 files changed, 134 insertions, 2 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 ddbda580a9..375fad1ea3 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
@@ -331,7 +331,28 @@ app.controller('adminController', [
$scope.isRunningOperation = false;
$scope.getSetImportDetails(destinationSet);
});
- }
+ };
+
+
+ $scope.configureCiSet = function setCiSet(inputs) {
+ var localSet = $scope.getSetById(inputs.ciDispositionSet);
+ localSet.ciSet = inputs.ciSet;
+ Set.update({
+ programId: $scope.programSelection,
+ setId: inputs.ciDispositionSet,
+ }, localSet);
+ };
+
+
+ $scope.massSendDispoItemStatus = function massSendDispoItemStatus (set) {
+ var newSet = $scope.getSetById(set.ciDispositionSet);
+ newSet.operation = "MassSendDispoItemStatus";
+ Set.update({
+ programId: $scope.programSelection,
+ setId: set.ciDispositionSet
+ }, newSet);
+ };
+
// -------------------- Summary Grids ----------------------\\
var filterBarPlugin = {
@@ -653,7 +674,73 @@ app.controller('adminController', [
$modalInstance.dismiss('cancel');
};
};
+
+ // Configure/Set CI Set
+ $scope.openConfigureCiSetModal = function() {
+ var modalInstance = $modal.open({
+ templateUrl: 'configureCiSet.html',
+ controller: ConfigureCiSetCtrl,
+ size: 'sm',
+ windowClass: 'ConfigureCiSetModal',
+ resolve: {
+ sets: function() {
+ return $scope.sets;
+ }
+ }
+ });
+ modalInstance.result.then(function(inputs) {
+ $scope.configureCiSet(inputs);
+ });
+ }
+
+ var ConfigureCiSetCtrl = function($scope, $modalInstance, sets) {
+ $scope.ciSet = "";
+ $scope.ciDispositionSet = "";
+ $scope.setsLocal = angular.copy(sets);
+ $scope.ok = function() {
+ var inputs = {};
+ inputs.ciSet = this.ciSet
+ inputs.ciDispositionSet = this.dispositionSet;
+ $modalInstance.close(inputs);
+ };
+ $scope.cancel = function() {
+ $modalInstance.dismiss('cancel');
+ };
+ }
+
+ // Mass Send Disposition Item Status
+ $scope.openMassSendDispoItemStatusModal = function() {
+ var modalInstance = $modal.open({
+ templateUrl: 'massSendDispoItemStatus.html',
+ controller: MassSendDispoItemStatusCtrl,
+ size: 'sm',
+ windowClass: 'MassSendDispoItemStatusModal',
+ resolve: {
+ sets: function() {
+ return $scope.sets;
+ }
+ }
+ });
+
+ modalInstance.result.then(function(inputs) {
+ $scope.massSendDispoItemStatus(inputs);
+ });
+ }
+
+ var MassSendDispoItemStatusCtrl = function($scope, $modalInstance, sets) {
+ $scope.ciDispositionSet = "";
+ $scope.setsLocal = angular.copy(sets);
+ $scope.ok = function() {
+ var inputs = {};
+ inputs.ciDispositionSet = this.dispositionSet;
+ $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 e740f046f2..5dd107798c 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
@@ -277,4 +277,6 @@ app.provider('Annotation', function() {
return Annotation;
}
];
-}); \ No newline at end of file
+});
+
+
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 6368890266..0d10da4dde 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
@@ -50,6 +50,8 @@
<div class="btn-group btn-group-md" role="group"">
<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>
</div>
</div>
</div>
@@ -199,6 +201,47 @@
</div>
</script>
+
+ <script type="text/ng-template" id="configureCiSet.html">
+ <div class="modal-header">
+ <h3 class="modal-title">Add CI Set</h3>
+ </div>
+ <div class="modal-body" overflow: auto;">
+ <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 class="form-group">
+ CI Set:
+ <input class="form-control" ng-model="ciSet"></input>
+ </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>
+
+ <script type="text/ng-template" id="massSendDispoItemStatus.html">
+ <div class="modal-header">
+ <h3 class="modal-title">Mass Send Disposition Items Status</h3>
+ </div>
+ <div class="modal-body" overflow: auto;">
+ <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