Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2015-05-13 21:53:24 -0400
committerjmisinco2015-05-13 21:53:24 -0400
commit3d1f1172c93767066cbbd2f989ea6bb04bcf389c (patch)
tree1f35d6cc5a035927e19c3709f44f7b47a1627595 /plugins/org.eclipse.osee.web.ui
parentf13648f0e1b3f248de09cedb02817393feba3975 (diff)
downloadorg.eclipse.osee-3d1f1172c93767066cbbd2f989ea6bb04bcf389c.tar.gz
org.eclipse.osee-3d1f1172c93767066cbbd2f989ea6bb04bcf389c.tar.xz
org.eclipse.osee-3d1f1172c93767066cbbd2f989ea6bb04bcf389c.zip
refinement: Include File and Method numbers in Coverage Imports
Diffstat (limited to 'plugins/org.eclipse.osee.web.ui')
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/coverage/ui/index.html1
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/ColumnFactory.js424
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/dispoApp.js19
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js245
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html4
5 files changed, 480 insertions, 213 deletions
diff --git a/plugins/org.eclipse.osee.web.ui/src/coverage/ui/index.html b/plugins/org.eclipse.osee.web.ui/src/coverage/ui/index.html
index e6a8532919..65c73d7af4 100644
--- a/plugins/org.eclipse.osee.web.ui/src/coverage/ui/index.html
+++ b/plugins/org.eclipse.osee.web.ui/src/coverage/ui/index.html
@@ -30,6 +30,7 @@
<script src="/libs/js/support/linkRewrite.js"></script>
<script src="/dispo/js/resizer.js"></script>
<script src="/dispo/js/dispoApp.js"></script>
+ <script src="/dispo/js/ColumnFactory.js"></script>
<script src="/dispo/js/userController.js"></script>
<script src="/dispo/js/adminController.js"></script>
<script src="/dispo/js/mainController.js"></script>
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/js/ColumnFactory.js b/plugins/org.eclipse.osee.web.ui/src/dispo/js/ColumnFactory.js
new file mode 100644
index 0000000000..01379b9d1b
--- /dev/null
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/js/ColumnFactory.js
@@ -0,0 +1,424 @@
+app.factory('ColumnFactory', function() {
+ var ColumnFactory = {};
+
+ ColumnFactory.getColumns = function(dispoType, width) {
+ var toReturn;
+ if(window.width < 1000) {
+ if(dispoType = '') {
+ toReturn = smallColumnsTestScript;
+ } else {
+ toReturn = smallColumnsCoverage
+ }
+ } else {
+ if(dispoType = '') {
+ toReturn = wideColumnsTestScript;
+ } else {
+ toReturn = wideColumnsCoverage
+ }
+ }
+
+ return toReturn;
+ }
+
+ var origCellTmpl = '<div ng-dblclick="getItemDetails(row.entity, row)">{{row.entity.name}}</div>';
+ var editCellTmpl = '<input ng-model="row.getProperty(col.field)" ng-model-onblur ng-change="editItem(row.entity);" value="row.getProperty(col.field);></input>';
+ var cellEditNotes = '<input class="cellInput" ng-model="COL_FIELD" ng-disabled="checkEditable(row.entity);" ng-model-onblur ng-change="editNotes(row.entity)"/>'
+ var chkBoxTemplate = '<input type="checkbox" class="form-control" ng-model="COL_FIELD" ng-change="editNeedsRerun(row.entity)"></input>';
+ var assigneeCellTmpl = '<div ng-dblclick="stealItem(row.entity)">{{row.entity.assignee}}</div>';
+ var dateCellTmpl = '<div>getReadableDate({{row.getProperty(col.field)}})</div>';
+
+ var checkboxSorting = function checkboxSorting(itemA, itemB) {
+ if(itemA == itemB) {
+ return 0;
+ } else if (itemA) {
+ return -1;
+ } else if (itemB) {
+ return 1;
+ }
+ };
+
+ var dateSorting = function (itemA, itemB) {
+ var DateA = new Date(itemA);
+ var DateB = new Date(itemB);
+
+ if (DateA < DateB) {
+ return -1;
+ } else if (DateB < DateA) {
+ return 1;
+ } else {
+ return 0;
+ }
+ };
+
+ var smallColumnsTestScript = [{
+ field: 'name',
+ displayName: 'Name',
+ cellTemplate: origCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'status',
+ displayName: 'Status',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'totalPoints',
+ displayName: 'Total',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'failureCount',
+ displayName: 'Failure Count',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'discrepanciesAsRanges',
+ displayName: 'Failed Points',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'assignee',
+ displayName: 'Assignee',
+ enableCellEdit: false,
+ cellTemplate: assigneeCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'itemNotes',
+ displayName: 'Script Notes',
+ cellTemplate: cellEditNotes,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'needsRerun',
+ displayName: 'Rerun?',
+ enableCellEdit: false,
+ cellTemplate: chkBoxTemplate,
+ sortFn: checkboxSorting
+ },{
+ field: 'lastUpdated',
+ displayName: 'Last Ran',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ }, {
+ field: 'category',
+ displayName: 'Category',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'machine',
+ displayName: 'Station',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'elapsedTime',
+ displayName: 'Elapsed Time',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'creationDate',
+ displayName: 'Creation Date',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ },{
+ field: 'aborted',
+ displayName: 'Aborted',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'version',
+ displayName: 'Version',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }];
+
+ var wideColumnsTestScript = [{
+ field: 'name',
+ displayName: 'Name',
+ width: 350,
+ cellTemplate: origCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'status',
+ displayName: 'Status',
+ width: 100,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'totalPoints',
+ displayName: 'Total',
+ width: 100,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'failureCount',
+ displayName: 'Failure Count',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'discrepanciesAsRanges',
+ displayName: 'Failed Points',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'assignee',
+ displayName: 'Assignee',
+ enableCellEdit: false,
+ cellTemplate: assigneeCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'itemNotes',
+ displayName: 'Script Notes',
+ cellTemplate: cellEditNotes,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'needsRerun',
+ displayName: 'Rerun?',
+ enableCellEdit: false,
+ cellTemplate: chkBoxTemplate,
+ sortFn: checkboxSorting,
+ width: 70
+ },{
+ field: 'lastUpdated',
+ displayName: 'Last Ran',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ }, {
+ field: 'category',
+ displayName: 'Category',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'machine',
+ displayName: 'Station',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'elapsedTime',
+ displayName: 'Elapsed Time',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'creationDate',
+ displayName: 'Creation Date',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ },{
+ field: 'aborted',
+ displayName: 'Aborted',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'version',
+ displayName: 'Version',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }];
+
+ var smallColumnsCoverage = [{
+ field: 'name',
+ displayName: 'Name',
+ cellTemplate: origCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'status',
+ displayName: 'Status',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'totalPoints',
+ displayName: 'Total',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'failureCount',
+ displayName: 'Failure Count',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'discrepanciesAsRanges',
+ displayName: 'Failed Points',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'assignee',
+ displayName: 'Assignee',
+ enableCellEdit: false,
+ cellTemplate: assigneeCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'itemNotes',
+ displayName: 'Script Notes',
+ cellTemplate: cellEditNotes,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'needsRerun',
+ displayName: 'Rerun?',
+ enableCellEdit: false,
+ cellTemplate: chkBoxTemplate,
+ sortFn: checkboxSorting
+ },{
+ field: 'lastUpdated',
+ displayName: 'Last Ran',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ }, {
+ field: 'category',
+ displayName: 'Category',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'machine',
+ displayName: 'Station',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'elapsedTime',
+ displayName: 'Elapsed Time',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'creationDate',
+ displayName: 'Creation Date',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ },{
+ field: 'aborted',
+ displayName: 'Aborted',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'version',
+ displayName: 'Version',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'fileNumber',
+ displayName: 'File Number',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'methodNumber',
+ displayName: 'Method Number',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }];
+
+ var wideColumnsCoverage = [{
+ field: 'name',
+ displayName: 'Name',
+ width: 350,
+ cellTemplate: origCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'status',
+ displayName: 'Status',
+ width: 100,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'totalPoints',
+ displayName: 'Total',
+ width: 100,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'failureCount',
+ displayName: 'Failure Count',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'discrepanciesAsRanges',
+ displayName: 'Failed Points',
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'assignee',
+ displayName: 'Assignee',
+ enableCellEdit: false,
+ cellTemplate: assigneeCellTmpl,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'itemNotes',
+ displayName: 'Script Notes',
+ cellTemplate: cellEditNotes,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'needsRerun',
+ displayName: 'Rerun?',
+ enableCellEdit: false,
+ cellTemplate: chkBoxTemplate,
+ sortFn: checkboxSorting,
+ width: 70
+ },{
+ field: 'lastUpdated',
+ displayName: 'Last Ran',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ }, {
+ field: 'category',
+ displayName: 'Category',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'machine',
+ displayName: 'Station',
+ enableCellEdit: true,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }, {
+ field: 'elapsedTime',
+ displayName: 'Elapsed Time',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'creationDate',
+ displayName: 'Creation Date',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
+ sortFn: dateSorting
+ },{
+ field: 'aborted',
+ displayName: 'Aborted',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'version',
+ displayName: 'Version',
+ enableCellEdit: false,
+ visible: false,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'fileNumber',
+ displayName: 'File Number',
+ enableCellEdit: false,
+ visible: false,
+ width: 75,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ },{
+ field: 'methodNumber',
+ displayName: 'Method Number',
+ enableCellEdit: false,
+ visible: false,
+ width: 75,
+ headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
+ }];
+
+ return ColumnFactory;
+}) \ 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 ed2faf9527..c8a4b9cf9e 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
@@ -106,6 +106,25 @@ app.provider('Set', function() {
];
});
+app.provider('Config', function() {
+ this.$get = ['$resource',
+ function($resource) {
+ var Config = $resource('/dispo/program/:programId/config', {}, {
+ });
+ return Config;
+ }
+ ];
+});
+
+app.provider('SourceFile', function() {
+ this.$get = ['$resource',
+ function($resource) {
+ var SourceFile = $resource('/dispo/program/:programId/set/:setId/file/:fileName', {}, {});
+ return SourceFile;
+ }
+ ];
+});
+
app.provider('Item', function() {
this.$get = [
'$resource',
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js b/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js
index 6d6f68b7d3..038ad48057 100644
--- a/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js
@@ -8,8 +8,9 @@ app.controller('userController', [
'Item',
'Annotation',
'SetSearch',
-
- function($scope, $modal, $rootScope, $cookieStore, Program, Set, Item, Annotation, SetSearch) {
+ 'SourceFile',
+ 'ColumnFactory',
+ function($scope, $modal, $rootScope, $cookieStore, Program, Set, Item, Annotation, SetSearch, SourceFile, ColumnFactory) {
$scope.unselectingItem = false;
$scope.editItems = false;
$scope.selectedItems = [];
@@ -103,6 +104,9 @@ app.controller('userController', [
itemId: item.guid
}, function(data) {
$scope.annotations = data;
+ if($rootScope.type == 'codeCoverage') {
+ $scope.annotations.sort(function(a, b){return a.locationRefs-b.locationRefs});
+ }
var blankAnnotation = new Annotation();
$scope.annotations.push(blankAnnotation);
@@ -131,6 +135,24 @@ app.controller('userController', [
$scope.lastFocused = element;
}
+ $scope.getSourceFlie = function () {
+ if($rootScope.type == 'codeCoverage') {
+ var requst = [];
+ requst.push(
+ "/dispo/",
+ "program/",
+ $scope.programSelection,
+ "/set/",
+ $scope.setSelection,
+ "/file/",
+ $scope.selectedItem.name
+ );
+ var url = requst.join("");
+
+ window.open(url);
+ }
+ }
+
$scope.toggleEditItems = function toggleEditItems() {
var size = $scope.selectedItems.length;
$scope.gridOptions.selectAll(false);
@@ -159,219 +181,11 @@ app.controller('userController', [
}
});
- var dateSorting = function (itemA, itemB) {
- var DateA = new Date(itemA);
- var DateB = new Date(itemB);
-
- if (DateA < DateB) {
- return -1;
- } else if (DateB < DateA) {
- return 1;
- } else {
- return 0;
- }
- };
-
- var checkboxSorting = function checkboxSorting(itemA, itemB) {
- if(itemA == itemB) {
- return 0;
- } else if (itemA) {
- return -1;
- } else if (itemB) {
- return 1;
- }
- };
-
$scope.checkEditable = function checkEditable(item) {
return item.assignee != $rootScope.cachedName;
}
- var origCellTmpl = '<div ng-dblclick="getItemDetails(row.entity, row)">{{row.entity.name}}</div>';
- var editCellTmpl = '<input ng-model="row.getProperty(col.field)" ng-model-onblur ng-change="editItem(row.entity);" value="row.getProperty(col.field);></input>';
- var cellEditNotes = '<input class="cellInput" ng-model="COL_FIELD" ng-disabled="checkEditable(row.entity);" ng-model-onblur ng-change="editNotes(row.entity)"/>'
- var chkBoxTemplate = '<input type="checkbox" class="form-control" ng-model="COL_FIELD" ng-change="editNeedsRerun(row.entity)"></input>';
- var assigneeCellTmpl = '<div ng-dblclick="stealItem(row.entity)">{{row.entity.assignee}}</div>';
- var dateCellTmpl = '<div>getReadableDate({{row.getProperty(col.field)}})</div>';
-
-
- $scope.smallColumns = [{
- field: 'name',
- displayName: 'Name',
- cellTemplate: origCellTmpl,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'status',
- displayName: 'Status',
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'totalPoints',
- displayName: 'Total',
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'failureCount',
- displayName: 'Failure Count',
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'discrepanciesAsRanges',
- displayName: 'Failed Points',
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'assignee',
- displayName: 'Assignee',
- enableCellEdit: false,
- cellTemplate: assigneeCellTmpl,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'itemNotes',
- displayName: 'Script Notes',
- cellTemplate: cellEditNotes,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- },{
- field: 'needsRerun',
- displayName: 'Rerun?',
- enableCellEdit: false,
- cellTemplate: chkBoxTemplate,
- sortFn: checkboxSorting
- },{
- field: 'lastUpdated',
- displayName: 'Last Ran',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
- sortFn: dateSorting
- }, {
- field: 'category',
- displayName: 'Category',
- enableCellEdit: true,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'machine',
- displayName: 'Station',
- enableCellEdit: true,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'elapsedTime',
- displayName: 'Elapsed Time',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- },{
- field: 'creationDate',
- displayName: 'Creation Date',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
- sortFn: dateSorting
- },{
- field: 'aborted',
- displayName: 'Aborted',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'version',
- displayName: 'Version',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }];
-
- $scope.wideColumns = [{
- field: 'name',
- displayName: 'Name',
- width: 350,
- cellTemplate: origCellTmpl,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'status',
- displayName: 'Status',
- width: 100,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'totalPoints',
- displayName: 'Total',
- width: 100,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'failureCount',
- displayName: 'Failure Count',
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'discrepanciesAsRanges',
- displayName: 'Failed Points',
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'assignee',
- displayName: 'Assignee',
- enableCellEdit: false,
- cellTemplate: assigneeCellTmpl,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'itemNotes',
- displayName: 'Script Notes',
- cellTemplate: cellEditNotes,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- },{
- field: 'needsRerun',
- displayName: 'Rerun?',
- enableCellEdit: false,
- cellTemplate: chkBoxTemplate,
- sortFn: checkboxSorting,
- width: 70
- },{
- field: 'lastUpdated',
- displayName: 'Last Ran',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
- sortFn: dateSorting
- }, {
- field: 'category',
- displayName: 'Category',
- enableCellEdit: true,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'machine',
- displayName: 'Station',
- enableCellEdit: true,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'elapsedTime',
- displayName: 'Elapsed Time',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- },{
- field: 'creationDate',
- displayName: 'Creation Date',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html',
- sortFn: dateSorting
- },{
- field: 'aborted',
- displayName: 'Aborted',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }, {
- field: 'version',
- displayName: 'Version',
- enableCellEdit: false,
- visible: false,
- headerCellTemplate: '/dispo/views/nameFilterTmpl.html'
- }];
-
- if(window.innerWidth < 1000) {
- $scope.columns = $scope.smallColumns;
- } else {
- $scope.columns = $scope.wideColumns;
- }
-
+ $scope.columns = ColumnFactory.getColumns($scope.type, window.innerWidth);
var filterBarPlugin = {
init: function(scope, grid) {
@@ -605,6 +419,11 @@ app.controller('userController', [
}, function(data) {
alert("Could not make change, please try refreshing");
});
+
+ if($rootScope.type == 'codeCoverage') {
+ $scope.annotations.sort(function(a, b){return a.locationRefs-b.locationRefs});
+ }
+
}
}
@@ -629,6 +448,10 @@ app.controller('userController', [
var blankAnnotation = new Annotation();
$scope.annotations.push(blankAnnotation);
+
+ if($rootScope.type == 'codeCoverage') {
+ $scope.annotations.sort(function(a, b){return a.locationRefs-b.locationRefs});
+ }
}, function(data) {
alert("Could not make change, please try refreshing");
});
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html b/plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html
index 42becb6a9d..6491fcb53f 100644
--- a/plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html
@@ -37,12 +37,12 @@
</div>
</div>
<div id="bottom-content">
- <div id="itemSelectedBar">
+ <div ng-dblclick="getSourceFlie()" id="itemSelectedBar">
Item: {{ selectedItem.name || "Select an Item"}} Failures: {{ selectedItem.discrepanciesAsRanges || "N/A"}}
</div>
<div id="annotationsGrid">
<table class="table subTable">
- <th>{{ annotationHeaders.locationRefs }}</th>
+ <th ng-click="sort()">{{ annotationHeaders.locationRefs }}</th>
<th>{{ annotationHeaders.resolutionType }}</th>
<th>{{ annotationHeaders.resolution }}</th>
<th>Developer Notes</th>

Back to the top