diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/run/run-report-form-fields/run-report-form-fields.component.html')
-rw-r--r-- | ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/run/run-report-form-fields/run-report-form-fields.component.html | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/run/run-report-form-fields/run-report-form-fields.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/run/run-report-form-fields/run-report-form-fields.component.html index aea6c768..ea413efc 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/run/run-report-form-fields/run-report-form-fields.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/run/run-report-form-fields/run-report-form-fields.component.html @@ -46,7 +46,7 @@ </div> <div *ngIf="item.validationType == 'DATE'" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> - <mat-form-field><input [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" + <mat-form-field><input [ngModel]="formFieldListValueMap.get(item.fieldId)" [min]="formFieldListValueMap.get(item.fieldId+'_minDate')" [max]="formFieldListValueMap.get(item.fieldId+'_maxDate')" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" [matDatepicker]="picker" class="defaultFontSize" matInput> <mat-datepicker-toggle [for]="picker" matSuffix></mat-datepicker-toggle> @@ -324,10 +324,39 @@ <div *ngIf="navigateToRun"> <!-- <app-run-dashboard-report [reportId]="reportId" [reportMode]="reportMode" [queryString]="getQueryString()" [DashboardReportObj]="DashboardReportObj"></app-run-dashboard-report> --> + <div *ngIf="reportType !== 'Cross-Tab'"> + <div *ngIf="reportHeader !== ''"> + <div [innerHtml]="reportHeader" style="width: 60%; padding-left: 20%;"> + </div> + <br/> + <br/> + </div> <app-run-report [DashboardReportObj]="DashboardReportObj" [TriggerFFArr]="triggerFormFieldArr" - [hitCnt]="hitCnt" - [queryString]="getQueryString()" - [reportId]="reportId" [reportMode]="reportMode" [runAgain]="runReportAgain" [groupSelectValue]="groupSelectValue" [chartType]="chartType" [isGoBack]="downloadPrevReport" ></app-run-report> + [chartType]="chartType" + [groupSelectValue]="groupSelectValue" + [hitCnt]="hitCnt" [isGoBack]="downloadPrevReport" [queryString]="getQueryString()" + [reportId]="reportId" [reportMode]="reportMode" [reportType]="reportType" + [runAgain]="runReportAgain"></app-run-report> + <div [innerHtml]="reportFooter" style="width: 60%; padding-left: 20%;"></div> + + </div> + <div *ngIf="reportType === 'Cross-Tab'"> + <div *ngIf="reportHeader !== ''"> + <div [innerHtml]="reportHeader" style="width: 60%; padding-left: 20%;"> + </div> + <br/> + <br/> + </div> + <app-run-cross-tab-report [groupSelectValue]="groupSelectValue" [hitCnt]="hitCnt" + [parentId]="reportId" + [queryString]="queryString" + [reportId]="reportId" + [reportMode]="reportMode" + [reportType]="reportType" + [isGoBack]="downloadPrevReport"></app-run-cross-tab-report> + <div [innerHtml]="reportFooter" style="width: 60%; padding-left: 20%;"> + </div> + </div> </div> <div *ngIf="error == true"> |