diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 30b3524cf..e3df6f50e 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -23,7 +23,7 @@ "@angular/forms": "^6.0.0-rc.5", "@angular/http": "^6.0.0-rc.5", "@angular/material": "^6.0.0-rc.5", - "@angular/material-moment-adapter": "^7.1.1", + "@angular/material-moment-adapter": "^6.0.0-rc.5", "@angular/platform-browser": "^6.0.0-rc.5", "@angular/platform-browser-dynamic": "^6.0.0-rc.5", "@angular/router": "^6.0.0-rc.5", diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 66a483b14..c7df44004 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 797aaf8e5..956eff2f8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -48,7 +48,7 @@ export class AllPdComponent implements OnInit, OnChanges { pageEvent: PageEvent; constructor(private _pd: PdTrigerService,private _fb:FormBuilder) { - + this.searchForm = this._fb.group( { pd_type:[null], @@ -66,7 +66,7 @@ export class AllPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + //this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab1.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 636d06a12..e78ff84b5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -1,6 +1,6 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index cdb1fc207..7c2f35772 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -66,7 +66,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + // this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab4.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index c5ee76270..11b419a2d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index fd001d504..7ddb7474a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -60,7 +60,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + // this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab2.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 869792c14..6b7d3eec3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index b2de54cbf..6794173ad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -64,7 +64,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus = false; // this.loadPDDetails(); - this.getcommonDropDown(); + // this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab5.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 776b9a9c0..ea306cf58 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index 299a747e5..ddcdbe726 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -61,7 +61,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + //this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab3.paginator = this.paginator;