diff options
| author |   RAMALINGAM, SUNDAR (sr7234) <sr7234@us.att.com> | 2018-07-25 16:13:16 -0400 |
|---|---|---|
| committer | RAMALINGAM, SUNDAR (sr7234) <sr7234@us.att.com> | 2018-07-25 16:13:56 -0400 |
| commit | 40a17c1d7e5f0edca350a49210e16223a875d290 (patch) | |
| tree | ad3a6b61fe17444dde4bf88f4dfd1cba2636f065 /ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports | |
| parent | 39191aaa6cf9f9d164c995e580c7df418b59b5c9 (diff) | |
Reporting Enhancements
Issue-ID: PORTAL-314
Remote DB logic is added to enhance RAPTOR to pull content from different DB as well as Different DB TYPE
Change-Id: I5cb343cd9daa912d78e7a8e409d28c8845d9afb4
Signed-off-by: RAMALINGAM, SUNDAR (sr7234) <sr7234@us.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports')
2 files changed, 11 insertions, 8 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html index 7b2c23e1..ba609151 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html @@ -112,7 +112,7 @@ body { <div ng-if="showGrid"> <div id="grid1" ui-grid="gridOptions" ui-grid-pagination ui-grid-pinning ui-grid-resize-columns class="grid" - style="height: {{gridHeight"> + style="height: {{gridHeight}}"> <div class="no-rows" ng-show="!gridOptions.data.length"> <div class="msg"> <span>{{reportData.message}}</span> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html index a9baadf8..64d31d97 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html @@ -24,20 +24,23 @@ <div class="form-row" > <label for="textinputID-2a">Report Description</label> <div class="field-group"> - <textarea b2b-reset b2b-reset-textarea ng-model="definitionData.reportDescr" ng-disabled="disabled" ng-trim="false" placeholder="{{placeholderText}}" rows="{{textAreaRows}}" maxlength="{{textAreaMaxlength}}" class="span12" id="textareaID1Tooltip1" ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea> + <textarea b2b-reset b2b-reset-textarea ng-model="definitionData.reportDescr" ng-disabled="false" ng-trim="false" placeholder="{{placeholderText}}" rows="{{textAreaRows}}" maxlength="{{textAreaMaxlength}}" class="span12" id="textareaID1Tooltip1" ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea> </div> </div> <div class="form-row" > <label for="textinputID-2a">Report Type</label> <div class="field-group"> - <input id="reportType" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.reportType" ng-disabled="true"> + <input id="reportType" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.reportType" ng-disabled="false"> </div> </div> <div class="form-row" > - <label for="textinputID-2a">Data Source</label> - <div class="field-group"> - <input id="dataSrc" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.dbInfo" ng-disabled="true"> - </div> + <label for="selectInputID-2a">Data Source</label> + <select id="dataSrc" name="dataSrc" b2b-dropdown placeholder-text="Select DBSource" ng-model="definitionData.dbSrc"> + <option b2b-dropdown-list option-repeat="d in definitionData.dbSrcOptions" value="{{d.id}}">{{d.name}}</option> + </select> +<!-- <div class="field-group"> --> +<!-- <input id="dataSrc" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.dbInfo" ng-disabled="true"> --> +<!-- </div> --> </div> <div class="form-row" > <label for="textinputID-2a">Form Help Text</label> @@ -210,4 +213,4 @@ <!-- <button class="btn btn-alt btn-small" type="button" ng-click="next()" ng-show="$scope.isEdit" >Next</button> --> </div> -</div>
\ No newline at end of file +</div> |