Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-01-26 21:23:03 +05:30
commit 8c6ef3b154
13 changed files with 106 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
View File

@ -1,5 +1,5 @@
<mat-card-content>
<!-- <mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel-header>
<mat-panel-title class="text-xs-left">
<h6 class="mt-0">
@ -51,7 +51,7 @@
<input matInput type="text" formControlName="pd_applicant_id" placeholder="Applicant Id">
</mat-form-field>
<br/>
<button type="button" mat-raised-button mat-icon-button (click)="searchItem()" matTooltip="Add More Additional Requirements"
<button type="button" mat-raised-button mat-icon-button (click)="searchItem()" matTooltip="Search"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
<mat-icon>search</mat-icon>
</button>
@ -59,7 +59,7 @@
</mat-list>
</mat-expansion-panel>
<br/> -->
<br/>
<mat-table [dataSource]="dataSourceTab1" matSort *ngIf="PdListData.length > 0">
<ng-container matColumnDef="PDType">

17
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
View File

@ -15,12 +15,12 @@ import { NotifierService } from 'angular-notifier';
export class AllPdComponent implements OnInit, OnChanges {
xpandStatus: boolean = false;
PRODUCTS: any;
ENTITY: any;
CITY: any;
PRODUCTS:any[]=[];
ENTITY: any[]=[]
CITY: any[]=[]
tempStore = new MatTableDataSource();
PDType: any;
pdStatus: any;
PDType: any[]=[]
pdStatus: any[]=[]
searchForm:FormGroup;
pipe = new DatePipe('en-US');
public notifier : NotifierService;
@ -61,6 +61,7 @@ export class AllPdComponent implements OnInit, OnChanges {
pd_name:[null],
pd_applicant_id:[null],
});
this.getcommonDropDown();
}
ngOnInit() {
@ -119,7 +120,7 @@ export class AllPdComponent implements OnInit, OnChanges {
* sriram
*/
getcommonDropDown()
getcommonDropDown(): void
{
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
{
@ -137,11 +138,11 @@ export class AllPdComponent implements OnInit, OnChanges {
}
});
this._pd.getAllMasterDatas('CITY').subscribe(res=>
this._pd.getListOfCities().subscribe(res=>
{
if(res.dataStatus==true)
{
this.CITY = res.records.filter(city=>city.isactive==1);
this.CITY = res.records;
}
});
this._pd.getAllMasterDatas('ENTITY').subscribe(res=>

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
View File

@ -1,6 +1,6 @@
<mat-card-content>
<!-- <mat-expansion-panel>
<mat-expansion-panel>
<mat-expansion-panel-header>
<mat-panel-title class="text-xs-left">
<h6 class="mt-0"><mat-icon>filter_list</mat-icon> Filter</h6>
@ -52,14 +52,14 @@
</mat-form-field>
<br/>
<button type="button" mat-raised-button mat-icon-button (click)="searchItem()"
matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
matTooltip="Search" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
<mat-icon>search</mat-icon>
</button>
</div>
</mat-list>
</mat-expansion-panel>
<br/> -->
<br/>
<mat-table [dataSource]="dataSourceTab4" matSort *ngIf="completedPdListData.length > 0" >

24
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
View File

@ -14,11 +14,11 @@ import { DatePipe } from '@angular/common';
export class CompletedPdComponent implements OnInit, OnChanges {
xpandStatus: boolean = false;
PRODUCTS: any;
CITY: any;
ENTITY: any;
PDType: any;
pdStatus: any;
PRODUCTS: any[]=[];
CITY: any[]=[];
ENTITY: any[]=[];
PDType: any[]=[];
pdStatus: any[]=[];
recordStatus: boolean;
errorMessage:any[]=[];
tabStatus:string="COMPLETED";
@ -61,6 +61,7 @@ export class CompletedPdComponent implements OnInit, OnChanges {
pd_name:[null],
pd_applicant_id:[null],
});
this.getcommonDropDown();
}
ngOnInit() {
@ -119,7 +120,7 @@ export class CompletedPdComponent implements OnInit, OnChanges {
* sriram
*/
getcommonDropDown()
getcommonDropDown(): void
{
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
{
@ -138,11 +139,18 @@ export class CompletedPdComponent implements OnInit, OnChanges {
}
});
this._pd.getAllMasterDatas('CITY').subscribe(res=>
// this._pd.getAllMasterDatas('CITY').subscribe(res=>
// {
// if(res.dataStatus==true)
// {
// this.CITY = res.records.filter(city=>city.isactive==1);
// }
// });
this._pd.getListOfCities().subscribe(res=>
{
if(res.dataStatus==true)
{
this.CITY = res.records.filter(city=>city.isactive==1);
this.CITY = res.records;
}
});
this._pd.getAllMasterDatas('ENTITY').subscribe(res=>

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
View File

@ -1,5 +1,5 @@
<mat-card-content>
<!-- <mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel-header >
<mat-panel-title class="text-xs-left">
<h6 class="mt-0"><mat-icon>filter_list</mat-icon> Filter</h6>
@ -51,14 +51,14 @@
</mat-form-field>
<br/>
<button type="button" mat-raised-button mat-icon-button (click)="searchItem()"
matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
matTooltip="Search" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
<mat-icon>search</mat-icon>
</button>
</div>
</mat-list>
</mat-expansion-panel>
<br/> -->
<br/>
<mat-table [dataSource]="dataSourceTab2" matSort *ngIf="progressPdListData.length > 0" >
<ng-container matColumnDef="PDType">
<mat-cell fxFlex="15" class="cell" style="text-align: center" *matCellDef="let details;">

24
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
View File

@ -12,11 +12,11 @@ import { DatePipe } from '@angular/common';
})
export class InprogressPdComponent implements OnInit, OnChanges {
xpandStatus: boolean = false;
PRODUCTS: any;
ENTITY: any;
CITY: any;
PDType: any;
pdStatus: any;
PRODUCTS: any[]=[];
ENTITY: any[]=[];
CITY: any[]=[];
PDType: any[]=[];
pdStatus: any[]=[];
recordStatus: boolean;
errorMessage:any[]=[];
tabStatus:string="INPROGRESS";
@ -55,6 +55,7 @@ export class InprogressPdComponent implements OnInit, OnChanges {
pd_name:[null],
pd_applicant_id:[null],
});
this.getcommonDropDown();
}
ngOnInit() {
@ -112,7 +113,7 @@ export class InprogressPdComponent implements OnInit, OnChanges {
* sriram
*/
getcommonDropDown()
getcommonDropDown() : void
{
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
{
@ -131,11 +132,18 @@ export class InprogressPdComponent implements OnInit, OnChanges {
}
});
this._pd.getAllMasterDatas('CITY').subscribe(res=>
// this._pd.getAllMasterDatas('CITY').subscribe(res=>
// {
// if(res.dataStatus==true)
// {
// this.CITY = res.records.filter(city=>city.isactive==1);
// }
// });
this._pd.getListOfCities().subscribe(res=>
{
if(res.dataStatus==true)
{
this.CITY = res.records.filter(city=>city.isactive==1);
this.CITY = res.records;
}
});
this._pd.getAllMasterDatas('ENTITY').subscribe(res=>

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
View File

@ -1,5 +1,5 @@
<mat-card-content>
<!-- <mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel-header>
<mat-panel-title class="text-xs-left">
<h6 class="mt-0"><mat-icon>filter_list</mat-icon> Filter</h6>
@ -51,14 +51,14 @@
</mat-form-field>
<br/>
<button type="button" mat-raised-button mat-icon-button (click)="searchItem()"
matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
matTooltip="Search" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
<mat-icon>search</mat-icon>
</button>
</div>
</mat-list>
</mat-expansion-panel>
<br/> -->
<br/>
<mat-table [dataSource]="dataSourceTab5" matSort *ngIf="qcCompletedPdListData.length > 0" >
<ng-container matColumnDef="PDType">
<mat-cell fxFlex="15" class="cell" style="text-align: center" *matCellDef="let details;">

27
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
View File

@ -14,11 +14,11 @@ import { DatePipe } from '@angular/common';
export class QcCompletedPdComponent implements OnInit, OnChanges {
xpandStatus: boolean = false;
PRODUCTS: any;
ENTITY: any;
CITY: any;
PDType: any;
pdStatus: any;
PRODUCTS: any[] = [];
ENTITY: any[] = [];
CITY: any[] = [];
PDType: any[] = [];
pdStatus: any[] = [];
recordStatus: boolean;
errorMessage: any[] = [];
tabStatus: string = "QC_COMPLETED";
@ -59,6 +59,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
pd_name: [null],
pd_applicant_id: [null],
});
this.getcommonDropDown();
}
ngOnInit() {
@ -115,7 +116,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
* sriram
*/
getcommonDropDown() {
getcommonDropDown():void {
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res => {
if (res.dataStatus == true) {
this.pdStatus = res.records.filter(status => status.isactive == 1 && status.pd_status_name == this.tabStatus);
@ -128,11 +129,19 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this.PDType = res.records.filter(type => type.isactive == 1);
}
});
this._pd.getAllMasterDatas('CITY').subscribe(res => {
if (res.dataStatus == true) {
this.CITY = res.records.filter(city => city.isactive == 1);
// this._pd.getAllMasterDatas('CITY').subscribe(res => {
// if (res.dataStatus == true) {
// this.CITY = res.records.filter(city => city.isactive == 1);
// }
// });
this._pd.getListOfCities().subscribe(res=>
{
if(res.dataStatus==true)
{
this.CITY = res.records;
}
});
this._pd.getAllMasterDatas('ENTITY').subscribe(res => {
if (res.dataStatus == true) {
this.ENTITY = res.records.filter(ent => ent.isactive == 1);

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts
View File

@ -66,12 +66,11 @@ export class SchedulePdComponent implements OnInit, OnDestroy {
ngOnInit() {
this.validateTime = setInterval(() => {
let currentTime:any = new Date();
currentTime = currentTime.getFullYear()+'-'+currentTime.getMonth()+'-'+currentTime.getDay()+currentTime.getHours()+'-'+currentTime.getMinutes();
currentTime = currentTime.getFullYear()+'-'+currentTime.getMonth()+'-'+currentTime.getDay()+'-'+currentTime.getHours()+'-'+currentTime.getMinutes();
let existTime:any = this.selectedMoment.getFullYear()+'-'+this.selectedMoment.getMonth()+'-'+this.selectedMoment.getDay() +'-'+this.selectedMoment.getHours()+'-'+this.selectedMoment.getMinutes();
if(existTime < currentTime) {
this.selectedMoment = new Date();
this.min = new Date();
}
},1000);
}

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
View File

@ -1,5 +1,5 @@
<mat-card-content>
<!-- <mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel [(expanded)]="xpandStatus">
<mat-expansion-panel-header>
<mat-panel-title class="text-xs-left">
<h6 class="mt-0"><mat-icon>filter_list</mat-icon> Filter</h6>
@ -51,14 +51,14 @@
</mat-form-field>
<br/>
<button type="button" mat-raised-button mat-icon-button (click)="searchItem()"
matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
matTooltip="Search" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button">
<mat-icon>search</mat-icon>
</button>
</div>
</mat-list>
</mat-expansion-panel>
<br/> -->
<br/>
<mat-table [dataSource]="dataSourceTab3" matSort *ngIf="scheduledPdListData.length > 0" >
<ng-container matColumnDef="PDType">
<mat-cell fxFlex="15" class="cell" style="text-align: center" *matCellDef="let details;">

25
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
View File

@ -12,11 +12,11 @@ import { DatePipe } from '@angular/common';
})
export class ScheduledPdComponent implements OnInit, OnChanges {
xpandStatus: boolean = false;
PRODUCTS: any;
ENTITY: any;
CITY: any;
PDType: any;
pdStatus: any;
PRODUCTS: any[]=[];
ENTITY: any[]=[];
CITY: any[]=[];
PDType: any[]=[];
pdStatus: any[]=[];
recordStatus: boolean;
errorMessage:any[]=[];
tabStatus:string="SCHEDULED";
@ -56,6 +56,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
pd_name:[null],
pd_applicant_id:[null],
});
this.getcommonDropDown();
}
ngOnInit() {
@ -112,7 +113,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
* sriram
*/
getcommonDropDown()
getcommonDropDown() : void
{
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
{
@ -130,13 +131,21 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.PDType = res.records.filter(type=>type.isactive==1);
}
});
this._pd.getAllMasterDatas('CITY').subscribe(res=>
// this._pd.getAllMasterDatas('CITY').subscribe(res=>
// {
// if(res.dataStatus==true)
// {
// this.CITY = res.records.filter(city=>city.isactive==1);
// }
// });
this._pd.getListOfCities().subscribe(res=>
{
if(res.dataStatus==true)
{
this.CITY = res.records.filter(city=>city.isactive==1);
this.CITY = res.records;
}
});
this._pd.getAllMasterDatas('ENTITY').subscribe(res=>
{
if(res.dataStatus==true)

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
View File

@ -112,9 +112,10 @@ export class StartPdComponent implements OnInit, OnDestroy {
let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1);
this.mainApplicantName = filterApplicantName[0].applicant_name;
this.currentPDStatus = data.records.pdmaster_details.pd_status=='INPROGRESS' ? true : data.records.pdmaster_details.pd_status=='SCHEDULED' ? true :data.records.pdmaster_details.pd_status=='ALLOCATED' ? true : false;
this.categoryFormButtons = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]);
this.categoryFormButtons = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]).filter(item=>item.isAnswerable===true);
// this.categoryFormButtons = this.categoryFormButtons.filter(item=>item.isAnswerable===true);
this.actualQuestions = this.categoryFormButtons.length;
let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered==true);
let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true);
this.answeredQuestions = getAnsweredFormsCount.length;
this.pdFullDetails = data.records

9
ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
View File

@ -550,4 +550,13 @@ export class PdTrigerService {
);
}
// get list of cities for p serach options
getListOfCities() {
return this._http.get<any>(this.apiUrl + 'getListOfCities')
.pipe(
catchError(this.handleError('role', []))
)
}
}