summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields')
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component.css3
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.css30
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.html113
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.spec.ts5
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts194
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.service.ts4
6 files changed, 304 insertions, 45 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component.css b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component.css
index 578b33e8..13a78c5c 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component.css
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component.css
@@ -1,7 +1,6 @@
.dialog {
z-index: 1000;
- display: flex;
- position: relative;
+ position: fixed;
right: 0;
left: 0;
top: 20px;
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.css b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.css
index 96d0a71f..0654d2a8 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.css
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.css
@@ -115,13 +115,6 @@ hr{
padding-bottom: 5px;
}
-.list::-webkit-scrollbar {
- -webkit-appearance: scrollbarthumb-vertical;
- width: 5px;
- background: transparent;
-}
-
-
label {
float: left;
width: 24em;
@@ -6284,7 +6277,30 @@ td{
margin-left: 10%;
}
+.add-reOrder-button
+{
+ font-size: 17px;
+ margin-left: 80%;
+}
+
.center{
margin: auto;
width: 50%;
}
+
+.showbuttons{
+ width: auto; margin-left: 70%;
+}
+
+:host ::ng-deep .mat-form-field-underline {
+ display: none;
+}
+
+:host ::ng-deep .mat-form-field-infix {
+ padding: 0;
+ border-top: 0;
+}
+
+.verify-button{
+ font-size: 17px;
+} \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.html
index 63062109..d35430db 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.html
@@ -38,7 +38,8 @@
<label class="defaultLabelFontSize">Field Name:</label><label><input [(ngModel)]="fieldName"
- class="defaultFontSize" id="fieldName"
+ class="defaultFontSize"
+ id="fieldName"
type="text"
value="{{fieldName}}"/></label>
@@ -75,7 +76,8 @@
<div>
<label class="defaultLabelFontSize">Is used in Group By Clause?:</label>
<label class="defaultLabelFontSize" class="checkbox" for="groupFormField">
- <input [(ngModel)]="groupFormField" class="ng-valid ng-dirty ng-valid-parse ng-touched" id="groupFormField"
+ <input [(ngModel)]="groupFormField" class="ng-valid ng-dirty ng-valid-parse ng-touched"
+ id="groupFormField"
type="checkbox" value="{{groupFormField}}"><i class="skin"></i><span></span>
</label>
</div>
@@ -85,7 +87,8 @@
<div>
<label class="defaultLabelFontSize">SQL as Default Value:</label>
<label class="defaultLabelFontSize" class="checkbox" for="isDefaultSql">
- <input [(ngModel)]="isDefaultSql" class="ng-valid ng-dirty ng-valid-parse ng-touched" id="isDefaultSql"
+ <input [(ngModel)]="isDefaultSql" class="ng-valid ng-dirty ng-valid-parse ng-touched"
+ id="isDefaultSql"
type="checkbox" value="{{isDefaultSql}}"><i class="skin"></i><span></span>
</label>
</div>
@@ -98,7 +101,7 @@
<textarea [(ngModel)]="fieldDefaultSQL" class="defaultFontSize" id="fieldDefaultSQL"
type="textarea" value="{{fieldDefaultSQL}}"></textarea>
<div class="center">
- <button (click)="verify('Default')" class="btn btn-alt btn-small" style="font-size: 17px;">
+ <button (click)="verify('Default')" class="btn btn-alt btn-small verify-button">
Verify
</button>
</div>
@@ -136,6 +139,73 @@
</div>
<br/>
<br/>
+ <div *ngIf='showDateRange || this.validationType === "DATE"'>
+ <div>
+ <label class="defaultLabelFontSize">SQL as Default Range Value:</label>
+ <label class="defaultLabelFontSize" class="checkbox" for="isDefaultSqlRange">
+ <input [(ngModel)]="isDefaultSqlRange" class="ng-valid ng-dirty ng-valid-parse ng-touched"
+ id="isDefaultSqlRange"
+ type="checkbox" value="{{isDefaultSqlRange}}"><i class="skin"></i><span></span>
+ </label>
+ </div>
+
+
+ <div *ngIf="!isDefaultSqlRange" class="field-group">
+ <label class="defaultLabelFontSize">rangeStartDate:</label>
+
+ <mat-form-field style="float: left;"><input [(ngModel)]="rangeStartDate"
+ [matDatepicker]="picker"
+ class="defaultFontSize" matInput>
+ <mat-datepicker-toggle [for]="picker" matSuffix></mat-datepicker-toggle>
+ <mat-datepicker #picker></mat-datepicker>
+ </mat-form-field>
+
+
+ </div>
+ <br />
+ <br />
+
+ <div *ngIf="!isDefaultSqlRange" class="field-group">
+ <label class="defaultLabelFontSize">rangeEndDate:</label>
+
+ <mat-form-field style="float: left;"><input [(ngModel)]="rangeEndDate" [matDatepicker]="picker"
+ class="defaultFontSize" matInput>
+ <mat-datepicker-toggle [for]="picker" matSuffix></mat-datepicker-toggle>
+ <mat-datepicker #picker></mat-datepicker>
+ </mat-form-field>
+ </div>
+ <br />
+ <br />
+
+
+
+
+ <div class="field-group" *ngIf="isDefaultSqlRange">
+ <label>RangeStartDate Sql:</label>
+ <textarea [(ngModel)]="rangeStartDateSQL" class="defaultFontSize" id="rangeStartDateSQL" type="textarea"
+ value="{{rangeStartDateSQL}}"></textarea>
+ <div class="center">
+ <button (click)="verify('startDateRange')" class="btn btn-alt btn-small verify-button">Verify
+ </button>
+ </div>
+ </div>
+ <br/>
+ <br/>
+
+
+ <div class="field-group" *ngIf="isDefaultSqlRange">
+ <label>RangeEndDate Sql:</label>
+ <textarea [(ngModel)]="rangeEndDateSQL" class="defaultFontSize" id="rangeEndDateSQL" type="textarea"
+ value="{{rangeEndDateSQL}}"></textarea>
+ <div class="center">
+ <button (click)="verify('endDateRange')" class="btn btn-alt btn-small verify-button">Verify
+ </button>
+ </div>
+ </div>
+ <br/>
+ <br/>
+ </div>
+
<div class="field-group">
<label>SQL Generating Custom List of Values:</label>
<textarea [(ngModel)]="fieldSQL" class="defaultFontSize" id="fieldSQL" type="textarea"
@@ -150,7 +220,8 @@
<br/>
<div>
<label class="defaultLabelFontSize">Provide Predefined List of Values: Do not use Predefined list -
- Generate list from database:</label><label><input [(ngModel)]="predefinedValue" class="defaultFontSize"
+ Generate list from database:</label><label><input [(ngModel)]="predefinedValue"
+ class="defaultFontSize"
id="predefinedValue" type="text"
value="{{predefinedValue}}"/></label>
<button (click)="addToList(predefinedValue)" class="btn btn-alt btn-small" style="font-size: 17px;">
@@ -173,7 +244,7 @@
</div>
</div>
- <div class="card-footer" style="width: 1000px; height: 65px; padding-left: 770px;">
+ <div class="card-footer" style="width: 1000px; padding-left: 770px;">
<button (click)="save();" *ngIf="!showConfirmButton" class="btn btn-alt btn-small" style="font-size: 17px;">
Save
</button>&nbsp;
@@ -246,6 +317,7 @@
</table>
</div>
<br/>
+ <br/>
<h4>Form Field List</h4>
<div *ngIf="!showSpinner">
@@ -254,6 +326,7 @@
<th class="defaultFontSize">Order Number</th>
<th class="defaultFontSize">Field Name</th>
<th class="defaultFontSize">Edit</th>
+ <th class="defaultFontSize">Order</th>
<th class="defaultFontSize">Delete</th>
<tr *ngFor="let item of formFieldsListObj; let i = index;">
@@ -269,19 +342,35 @@
</mat-icon>
</td>
<td>
+ <mat-icon (click)="moveUpward(i)" *ngIf="!isFirst(i)" aria-hidden="false" aria-label="expand_less">
+ expand_less
+ </mat-icon>
+ <mat-icon (click)="moveDownward(i)" *ngIf="!isLast(i)" aria-hidden="false" aria-label="expand_more">
+ expand_more
+ </mat-icon>
+ </td>
+ <td>
<mat-icon (click)="delete(item.id)" aria-hidden="false" aria-label="delete">delete</mat-icon>
</td>
</tr>
</table>
<br/>
+ <table class="showbuttons">
+ <tr>
+ <td>
+ <button (click)="add(); setDisplayMode('Add');" class="btn btn-alt btn-small add-reOrder-button">
+ Add
+ </button>
+ </td>
+ <td>
+ <button (click)="reOrder()" *ngIf="showReOrderButton"
+ class="btn btn-alt btn-small add-reOrder-button">ReOrder
+ </button>
+ </td>
+ </tr>
+ </table>
- <div class="field-group">
- <button (click)="add(); setDisplayMode('Add');" class="btn btn-alt btn-small"
- style="font-size: 17px; margin-left: 80%;">Add
- </button>
- </div>
<br/>
- <hr/>
</div>
</div>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.spec.ts
index 69c0aeba..8a1a5713 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.spec.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.spec.ts
@@ -4,7 +4,7 @@ import { FormFieldsComponent } from './form-fields.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { MatDialogModule, MatSnackBarModule } from '@angular/material';
+import { MatDatepickerModule, MatDialogModule, MatSnackBarModule } from '@angular/material';
import { CommonModule } from '@angular/common';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormFieldsService } from './form-fields.service';
@@ -26,7 +26,8 @@ describe('FormFieldsComponent', () => {
HttpClientTestingModule,
MatDialogModule,
MatSnackBarModule,
- BrowserAnimationsModule
+ BrowserAnimationsModule,
+ MatDatepickerModule
]
})
.compileComponents();
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts
index e8a60849..8d2ce96c 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, Input, Inject} from '@angular/core';
+import {Component, OnInit, Input, Inject, ChangeDetectorRef} from '@angular/core';
import {FormFieldsService} from './form-fields.service';
import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
import {Observable} from 'rxjs';
@@ -52,12 +52,21 @@ export class FormFieldsComponent implements OnInit {
queryObj: {};
validateResponseString: string;
showVerifySpinner: boolean;
- Groups: {}[] = [];
+ Groups: any;
isDefaultSql: boolean;
showConfirmButton: boolean;
-
-
- constructor(private _formFieldsService: FormFieldsService, public dialog: MatDialog, private _snackBar: MatSnackBar) {
+ showReOrderButton: boolean;
+ orderSeqArray: any;
+ showDateRange: any;
+ rangeStartDate :any;
+ rangeEndDate :any;
+ rangeStartDateSQL :any;
+ rangeEndDateSQL:any;
+ isDefaultSqlRange:boolean;
+ isFFDate: boolean;
+
+
+ constructor(private _formFieldsService: FormFieldsService, public dialog: MatDialog, private _snackBar: MatSnackBar,private changeDetectorRefs: ChangeDetectorRef) {
this.formFieldsListObj = [];
this.postMoveUpwrdObj = {};
this.postDownwardObj = {};
@@ -72,19 +81,49 @@ export class FormFieldsComponent implements OnInit {
this.showVerifySpinner = false;
this.Groups = [];
this.isDefaultSql = false;
+ this.showReOrderButton = false;
+ this.orderSeqArray = [];
+ this.showDateRange = false;
+ this.isDefaultSqlRange = false;
+ this.rangeStartDate ='';
+ this.rangeEndDate='';
+ this.rangeStartDateSQL ='';
+ this.rangeEndDateSQL='';
+ this.isFFDate = false;
}
ngOnInit() {
this._formFieldsService.getListOfFormFields()
.subscribe((responseFormFields) => {
for (let m = 0; m < responseFormFields.length; m++) {
- responseFormFields[m]['orderSeq'] = m + 1;
this.formFieldsListObj.push(responseFormFields[m]);
}
+ this.formFieldsListObj = this.formFieldsListObj.sort(function (a, b) {
+ if ((a['orderSeq']) === (b['orderSeq'])) {
+ return a;
+ } else {
+ return (a['orderSeq']) - (b['orderSeq']);
+ }
+ });
+ for (let ff = 0; ff < this.formFieldsListObj.length; ff++) {
+ let val = this.formFieldsListObj[ff]['orderSeq'];
+ this.orderSeqArray.push(val);
+ }
+ if (this.orderSeqArray.includes(null) || this.orderSeqArray.length !== new Set(this.orderSeqArray).size) {
+ this.reOrder();
+ }
this._formFieldsService.getFormFieldGroupsData(this.reportId1)
.subscribe((responseGroupsData) => {
this.Groups = JSON.parse(responseGroupsData['formFieldGroupsJSON']);
+ this.Groups = this.Groups.sort(function (a, b) {
+ if ((a['orderSeq']) === (b['orderSeq'])) {
+ return a;
+ } else {
+ return (a['orderSeq']) - (b['orderSeq']);
+ }
+ });
+
});
});
}
@@ -124,11 +163,6 @@ export class FormFieldsComponent implements OnInit {
this.postMoveUpwrdObj['orderSeq'] = this.orderSeqOfUp;
this.postDownwardObj['orderSeq'] = this.orderSeqOfDown;
- console.log(this.postDownwardObj);
- console.log(this.postMoveUpwrdObj);
- this.postMoveUpwrdObj['lastUpdatedFieldId'] = this.postDownwardObj['fieldId'];
- this.postDownwardObj['lastUpdatedFieldId'] = this.postMoveUpwrdObj['fieldId'];
-
this._formFieldsService.postFormFieldData(this.postDownwardObj, this.reportId1)
.subscribe((responsePostn) => {
if (responsePostn['message']) {
@@ -148,6 +182,7 @@ export class FormFieldsComponent implements OnInit {
}
}
this.showSpinner = false;
+ this.updateGroupOnOrderChange();
});
}
});
@@ -156,10 +191,23 @@ export class FormFieldsComponent implements OnInit {
});
});
+ }
-
+ updateGroupOnOrderChange() {
+ let formfieldsMap: Map<string, string> = new Map();
+ for (let i = 0; i < this.formFieldsListObj.length; i++) {
+ formfieldsMap.set(this.formFieldsListObj[i]['id'], this.formFieldsListObj[i]['orderSeq']);
+ }
+ for (let k = 0; k < this.Groups.length; k++) {
+ let element = this.Groups[k];
+ for (let l = 0; l < element['formFieldList'].length; l++) {
+ element['formFieldList'][l]['orderSeq'] = formfieldsMap.get(element['formFieldList'][l]['id']);
+ }
+ }
+ this.saveFormFieldGroups();
}
+
moveDownward(n: number) {
this.showSpinner = true;
@@ -176,13 +224,6 @@ export class FormFieldsComponent implements OnInit {
this.postMoveUpwrdObj['orderSeq'] = this.orderSeqOfUp;
this.postDownwardObj['orderSeq'] = this.orderSeqOfDown;
-
- console.log(this.postDownwardObj);
- console.log(this.postMoveUpwrdObj);
-
- this.postMoveUpwrdObj['lastUpdatedFieldId'] = this.postDownwardObj['fieldId'];
- this.postDownwardObj['lastUpdatedFieldId'] = this.postMoveUpwrdObj['fieldId'];
-
this._formFieldsService.postFormFieldData(this.postDownwardObj, this.reportId1)
.subscribe((responsePostn) => {
if (responsePostn['message']) {
@@ -194,7 +235,6 @@ export class FormFieldsComponent implements OnInit {
this._formFieldsService.getListOfFormFields()
.subscribe((finalListResponse) => {
for (let k = 0; k < finalListResponse.length; k++) {
- // this.formFieldsListObj.push(finalListResponse[k]);
for (let m = 0; m < finalListResponse.length; m++) {
if (finalListResponse[m]['orderSeq'] == k + 1) {
this.formFieldsListObj.push(finalListResponse[m]);
@@ -202,6 +242,7 @@ export class FormFieldsComponent implements OnInit {
}
}
this.showSpinner = false;
+ this.updateGroupOnOrderChange();
});
}
});
@@ -230,11 +271,54 @@ export class FormFieldsComponent implements OnInit {
this.openEditDialog(group);
}
+
+ setDate($event : any){
+ const mnth = ('0' + ($event.getMonth() + 1)).slice(-2);
+ const day = ('0' + $event.getDate()).slice(-2);
+ let temp = [mnth, day, $event.getFullYear()].join('/');
+ temp = temp+' '+ '00:00:00';
+
+ return temp;
+
+ }
edit(id: string) {
this._formFieldsService.getFormFieldData(id)
.subscribe((responseFormFieldData) => {
- this.validationType = responseFormFieldData['validationType'];
+ this.validationType = responseFormFieldData["validationType"];
+ this.showDateRange = false;
+ if(this.validationType ==='DATE'){
+ this.showDateRange = true;
+ if (responseFormFieldData['rangeStartDate'] != null) {
+ if (responseFormFieldData['rangeStartDate'] != '')
+ this.rangeStartDate = new Date(responseFormFieldData['rangeStartDate']); else {
+ this.rangeStartDate = '';
+ }
+ } else {
+ this.rangeStartDate = '';
+ }
+ if (responseFormFieldData['rangeEndDate'] != null) {
+ if (responseFormFieldData['rangeEndDate'] != '')
+ this.rangeEndDate = new Date(responseFormFieldData['rangeEndDate']);
+ else {
+ this.rangeEndDate = '';
+ }
+ } else {
+ this.rangeEndDate = '';
+ }
+ this.rangeStartDateSQL = responseFormFieldData['rangeStartDateSQL'];
+ this.rangeEndDateSQL = responseFormFieldData['rangeEndDateSQL'];
+ if ((this.rangeStartDate == '' && this.rangeEndDate == '')) {
+ this.isDefaultSqlRange = true;
+ } else {
+
+ this.isDefaultSqlRange = false;
+ }
+
+ if ((this.rangeStartDate == '' && this.rangeEndDate == '' && this.rangeEndDateSQL == '' && this.rangeStartDateSQL == '')) {
+ this.isDefaultSqlRange = false;
+ }
+ }
if (responseFormFieldData['visible'] === true) {
this.visible = 'YES';
} else {
@@ -298,9 +382,15 @@ export class FormFieldsComponent implements OnInit {
this.isDefaultSql = false;
this.predefinedValueList = [];
this.defaultValue = '';
-
+ this.orderSeq = null;
this.showDialog = true;
this.closable = true;
+ this.isDefaultSqlRange = false;
+ this.rangeStartDate ='';
+ this.rangeEndDate='';
+ this.rangeStartDateSQL ='';
+ this.rangeEndDateSQL='';
+ this.showDateRange='';
this.mode = 'Add';
@@ -340,7 +430,30 @@ export class FormFieldsComponent implements OnInit {
this.showSpinner = true;
this.showDialog = false;
this.finalPOSTObj['validationType'] = this.validationType;
+ if (this.validationType === 'DATE') {
+ if (this.rangeStartDate != null && this.rangeStartDate != '') {
+ this.finalPOSTObj['rangeStartDate'] = this.setDate(this.rangeStartDate);
+ } else {
+ this.finalPOSTObj['rangeStartDate'] = '';
+ }
+ if (this.rangeEndDate != null && this.rangeEndDate != '') {
+ this.finalPOSTObj['rangeEndDate'] = this.setDate(this.rangeEndDate);
+ } else {
+ this.finalPOSTObj['rangeEndDate'] = '';
+ }
+ this.finalPOSTObj['rangeStartDateSQL'] = this.rangeStartDateSQL;
+ this.finalPOSTObj['rangeEndDateSQL'] = this.rangeEndDateSQL;
+ }
+
+ if (this.isDefaultSqlRange) {
+ this.finalPOSTObj['rangeStartDate'] = '';
+ this.finalPOSTObj['rangeEndDate'] = '';
+ }
+ if (!this.isDefaultSqlRange) {
+ this.finalPOSTObj['rangeStartDateSQL'] = '';
+ this.finalPOSTObj['rangeEndDateSQL'] = '';
+ }
if (this.visible == 'YES') {
this.finalPOSTObj['visible'] = true;
} else {
@@ -363,6 +476,8 @@ export class FormFieldsComponent implements OnInit {
this.finalPOSTObj['defaultValue'] = this.defaultValue;
+ this.finalPOSTObj['defaultValue'] = this.defaultValue;
+
if (this.fieldDefaultSQL != '' && this.fieldDefaultSQL != null) {
this.finalPOSTObj['defaultValue'] = '';
}
@@ -443,6 +558,24 @@ export class FormFieldsComponent implements OnInit {
this.validateResponseString = responseDefaultSQL['data']['elements'];
this.showVerifySpinner = false;
});
+ } else if (SQLType == 'startDateRange' || SQLType =='endDateRange'){
+
+ if(SQLType == 'startDateRange'){
+ this.queryObj = {
+ query: this.rangeStartDateSQL
+ };
+ }
+ if(SQLType == 'endDateRange'){
+ this.queryObj = {
+ query: this.rangeEndDateSQL
+ };
+ }
+ this._formFieldsService.verifySQL(this.queryObj)
+ .subscribe((responseDefaultSQL) => {
+ this.validateResponseString = responseDefaultSQL['data']['elements'];
+ this.showVerifySpinner = false;
+ });
+
} else {
this.queryObj = {
query: this.fieldSQL
@@ -527,6 +660,23 @@ export class FormFieldsComponent implements OnInit {
});
}
+ reOrder() {
+ this._formFieldsService.reOrderFFValues()
+ .subscribe((response) => {
+ console.log(response);
+ this.formFieldsListObj = [];
+ for (let k = 0; k < response.length; k++) {
+ for (let m = 0; m < response.length; m++) {
+ if (response[m]['orderSeq'] == k + 1) {
+ this.formFieldsListObj.push(response[m]);
+ }
+ }
+ }
+ this.showSpinner = false;
+ this.showReOrderButton = false;
+ this.updateGroupOnOrderChange();
+ });
+ }
openEditDialog(groupInfo: any) {
const multiSelectArray = [];
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.service.ts
index f636a001..a7c6501d 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.service.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.service.ts
@@ -49,4 +49,8 @@ export class FormFieldsService {
{
return this._http.post(environment.baseUrl + "report/wizard/save_formfield_groups_data", formFieldGroupObj, { headers: new HttpHeaders({'Content-Type': 'application/json'})});
}
+ reOrderFFValues() : Observable<any>
+ {
+ return this._http.post(environment.baseUrl + "report/wizard/reorder", { headers: new HttpHeaders({'Content-Type': 'application/json'})});
+ }
}