Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2017-05-22 20:24:55 +0000
committerAngel Avila2017-05-22 23:59:54 +0000
commitb26873c97dc0644686fd816f3086da0372651067 (patch)
tree676ba1eb3d291018cc8816d04880ba3d4734fe6a /plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html
parente55a5d5467cb281c4c902cd5470a89c2c8b1aa9e (diff)
downloadorg.eclipse.osee-b26873c97dc0644686fd816f3086da0372651067.tar.gz
org.eclipse.osee-b26873c97dc0644686fd816f3086da0372651067.tar.xz
org.eclipse.osee-b26873c97dc0644686fd816f3086da0372651067.zip
refactor[ats_ATS334473]: Upgrade Dispo and Coverage to Ui-Grid
Diffstat (limited to 'plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html')
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/views/user.html113
1 files changed, 57 insertions, 56 deletions
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 1ac525daa52..ec674d24135 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
@@ -6,7 +6,7 @@
</head>
<body>
<div class="container-fluid" id="content">
- <div class="row">
+ <div class="row">
<div id="refresh" class="col-md-1">
<button ng-show="items.length>0" class="btn btn-primary active" ng-click="updateSet()">Refresh</button>
</div>
@@ -14,73 +14,43 @@
ATS Version:
<select class="form-control" ng-show="programs" ng-model="programSelection" ng-disabled="isSearchView" ng-change="updateProgram()" ng-options="obj.value as obj.text for obj in programs"></select>
</div>
- <div class="col-md-2">
+ <div ng-show="programSelection" class="col-md-2">
Set:
- <select ng-show="programSelection != null" class="form-control" ng-show="sets" ng-disabled="isSearchView" ng-model="setSelection" ng-change="updateSet()" ng-options="obj.guid as obj.name for obj in sets">
+ <select class="form-control" ng-show="sets" ng-disabled="isSearchView" ng-model="setSelection" ng-change="updateSet()" ng-options="obj.guid as obj.name for obj in sets">
</select>
</div>
<div id="multItemEditDiv" class="col-md-5">
<div ng-show="items.length>0" class="btn-group">
<button class="btn btn-primary active" ng-click="toggleEditItems()">Edit Multiple Items</button>
- <button type="button" class="btn btn-default" ng-show="editItems" ng-disabled="selectedItems.length == 0" ng-click="showAssigneeModal()">Assignee</button>
- <button type="button" class="btn btn-default" ng-show="editItems" ng-disabled="selectedItems.length == 0" ng-click="showCategoryModal()">Category</button>
- <button type="button" class="btn btn-default" ng-show="editItems" ng-disabled="selectedItems.length == 0" ng-click="showNeedsRerunModal()">Needs Rerun</button>
+ <button type="button" class="btn btn-default" ng-show="isMultiEditView" ng-disabled="selectedItems.length == 0" ng-click="showAssigneeModal()">Assignee</button>
+ <button type="button" class="btn btn-default" ng-show="isMultiEditView" ng-disabled="selectedItems.length == 0" ng-click="showCategoryModal()">Category</button>
+ <button type="button" class="btn btn-default" ng-show="isMultiEditView" ng-disabled="selectedItems.length == 0" ng-click="showNeedsRerunModal()">Needs Rerun</button>
+ <button type="button" class="btn btn-default" ng-show="isMultiEditView" ng-disabled="selectedItems.length == 0" ng-click="showItemNotesModal()">Item Notes</button>
</div>
</div>
<div id="search" class="col-md-1 col-md-offset-1">
<button class="btn btn-primary active" ng-show="items.length>0 && !isSearchView" ng-click="showAdvSearchModal()">Adv Search</button>
<button class="btn btn-primary active" ng-show="items.length>0 && isSearchView" ng-click="showAdvSearchModal()">Searching: {{ searchValue }}</button>
</div>
- </div>
- <div id="top-content" class="row">
- <div style='height: 500px;' id="itemsGrid" class="gridStyle" ng-grid="gridOptions"></div>
- </div>
</div>
- <div id="bottom-content">
- <div ng-dblclick="getSourceFlie()" id="itemSelectedBar">
- <h4 id="itemSelectedText">Item: {{ selectedItem.name || "Select an Item"}} :: </h4><h6 ng-show="selectedItem" id="itemSelectedFailureText"> Failures: {{ selectedItem.discrepanciesAsRanges || "N/A"}}</h6>
- </div>
- <div id="annotationsGrid">
- <table class="table subTable">
- <th width="50px" ng-show="type == 'codeCoverage'">Method</th>
- <th ng-click="sort()">{{ annotationHeaders.locationRefs }}</th>
- <th>{{ annotationHeaders.resolutionType }}</th>
- <th>{{ annotationHeaders.resolution }}</th>
- <th>Developer Notes</th>
- <th ng-show="type != 'codeCoverage'">Customer Notes</th>
- <th ng-show="type == 'codeCoverage'">Text</th>
- <th width="50px;">Delete</th>
- <tr ng-repeat="annotation in annotations">
- <td ng-show="type == 'codeCoverage'">
- <textarea ng-class="{annotationInput: true, invalid: getInvalidLocRefs(annotation), details: annotation.showDeets}" ng-disabled="true" ng-model="selectedItem.methodNumber" type=text></textarea>
- </td>
- <td>
- <textarea ng-class="{annotationInput: true, invalid: getInvalidLocRefs(annotation), details: annotation.showDeets}" ng-disabled="isDefaultResolution(annotation);" ng-model="annotation.locationRefs" type=text ng-model-onblur ng-change="editAnnotation(annotation); saveLastFocused(this);" ng-dblclick="toggleDetails(annotation)"></textarea>
- </td>
- <td>
- <select ng-class="{annotationInput: true, details: annotation.showDeets}" focus-me="annotation.guid !=null" ng-options="obj.value as obj.text for obj in getResolutionTypes();" options-disabled="option.isDefault for option in getResolutionTypes();" ng-disabled="annotation.guid == null || isDefaultResolution(annotation);" ng-model="annotation.resolutionType" ng-change="editAnnotation(annotation)" ng-dblclick="toggleDetails(annotation)"></select>
- </td>
- <td>
- <textarea ng-class="{annotationInput: true, invalid: getInvalidRes(annotation), details: annotation.showDeets}" ng-disabled="annotation.guid == null || isDefaultResolution(annotation);" ng-model="annotation.resolution" type=text ng-model-onblur ng-change="editAnnotation(annotation)" ng-dblclick="toggleDetails(annotation)"></textarea>
- </td>
- <td>
- <textarea ng-class="{annotationInput: true, details: annotation.showDeets}" ng-disabled="annotation.guid == null" ng-model="annotation.developerNotes" type=text ng-model-onblur ng-change="editAnnotation(annotation)" ng-dblclick="toggleDetails(annotation)"></textarea>
- </td>
- <td ng-show="type != 'codeCoverage'">
- <textarea ng-class="{annotationInput: true, details: annotation.showDeets}" ng-disabled="annotation.guid == null || type == 'codeCoverage'" ng-model="annotation.customerNotes" type=text ng-model-onblur ng-change="editAnnotation(annotation)" ng-dblclick="toggleDetails(annotation)"></textarea>
- </td>
- <td ng-show="type == 'codeCoverage'">
- <textarea ng-class="{annotationInput: true, details: annotation.showDeets}" ng-disabled="true" type=text ng-dblclick="getText(annotation)">{{ getText(annotation) }}</textarea>
- </td>
- <td>
- <button ng-class="{annotationDelete: true, details: annotation.showDeets}" ng-disabled="annotation.guid == null || isDefaultResolution(annotation);" ng-click="deleteAnnotation(annotation)">X</button>
- </td>
- </tr>
- </table>
- </div>
- </div>
- </div>
- <div id="content-resizer" resizer="horizontal" resizer-height="6" resizer-top="#top-content" resizer-bottom="#bottom-content">
+ <div id="gridsDiv" ng-show="items.length > 0" class="row">
+ <div id="itemsGridDiv" class="split content">
+ <div id="itemsGrid" class="grid" ui-grid="gridOptions" ui-grid-exporter ui-grid-resize-columns ui-grid-selection ui-grid-edit ui-grid-auto-resize ui-grid-grouping></div>
+ </div>
+ <div id="subGridDiv" class="split content">
+ <div id="itemSelectedBar">
+ <div id="itemSelectedLeftDiv">
+ <h4 id="itemSelectedText">Item: {{ selectedItem.name || "Select an Item"}} :: </h4>
+ <h5 ng-show="selectedItem" id="itemSelectedFailureText"> Failures: {{ selectedItem.discrepanciesAsRanges || "N/A"}}</h5>
+ </div>
+ <div id="itemSelectedRightDiv">
+ <button ng-show="isCoverage && selectedItem" type="button" class="btn btn-primary" id="openSourceFileButton" ng-click="getSourceFile()">Open File</button>
+ <button ng-show="!isCoverage && selectedItem && selectedItem.failureCount > 1 " type="button" class="btn btn-primary" id="openSourceFileButton" ng-click="showAllFailuresModal()">Show All Failures</button>
+ </div>
+ </div>
+ <div ng-show="annotations.length > 0" id="subGrid" class="subgrid grid" ui-grid="subGridOptions" ui-grid-edit ui-grid-nav ui-grid-resize-columns ui-grid-auto-resize ui-grid-tree-view></div>
+ </div>
+ </div>
</div>
<!-- definitions for modal forms -->
<script type="text/ng-template" id="assigneeModal.html">
@@ -157,7 +127,38 @@
<button class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div>
</script>
-
+ <script type="text/ng-template" id="itemNotesModal.html">
+ <div class="modal-header">
+ <h3 class="modal-title">Edit Item Notes</h3>
+ </div>
+ <div class="modal-body" style="height: 300px; overflow: auto;">
+ <div class="form-group">
+ <label for="setItemNotes">Script Notes</label>
+ <input ng-model="itemNotes" class="form-control" name="setItemNotes" placeholder="Enter Item Notes" required>
+ </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="showAllFailuresModal.html">
+ <div class="modal-header">
+ <h3 class="modal-title">{{ item.name }}</h3>
+ </div>
+ <div class="modal-body" style="height: 300px; overflow: auto;">
+ <textarea ng-model="item.discrepanciesAsRanges" readonly class="form-control" id="showAllTextArea">
+ </textarea>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-primary" ng-click="close()">Close</button>
+ </div>
+ </script>
+
<script type="text/ng-template" id="loadingModal.html">
<div id="loadingModal" class="alert alert-info">
Loading...

Back to the top