diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html index 797adf724..3cf45f01d 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html @@ -1,14 +1,4 @@ - - -
diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts index 1c5c0a727..0207a9a5f 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts @@ -79,7 +79,8 @@ export class PdNotificationListComponent implements OnInit { //To get data for listing getPdNotification() { - this._MastersService.getAllPDNotification().subscribe( + //this._MastersService.getAllPDNotification().subscribe( + this._MastersService.getAllMasterData('PDNOTIFICATION').subscribe( data => { // console.log(data); // console.log(data.status); diff --git a/ng6-seed/src/app/settings/service/masters/masters.service.ts b/ng6-seed/src/app/settings/service/masters/masters.service.ts index 67a22174f..7c2946799 100644 --- a/ng6-seed/src/app/settings/service/masters/masters.service.ts +++ b/ng6-seed/src/app/settings/service/masters/masters.service.ts @@ -29,6 +29,7 @@ export class MastersService { // private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; +private apiUrll = 'http://localhost/sparqapi/api/'; private apiUrl = environment.apiEndpoint; @@ -260,18 +261,18 @@ editPDAllocationType(Records: any,MasterName:string): Observable { } - getAllPDNotification(): Observable { + // getAllPDNotification(): Observable { - return this._http.get(this.apiUrl+'getPDNotificationsList') - .pipe( - catchError(this.handleError('role', [])) - ) - // return this._http.get(this.apiUrl+'getListOfCompany') - // .pipe( - // catchError(this.handleError('role', [])) - // ) + // return this._http.get(this.apiUrl+'getPDNotificationsList') + // .pipe( + // catchError(this.handleError('role', [])) + // ) + // // return this._http.get(this.apiUrl+'getListOfCompany') + // // .pipe( + // // catchError(this.handleError('role', [])) + // // ) - } + // } /** @@ -302,7 +303,7 @@ editPDAllocationType(Records: any,MasterName:string): Observable { item.fk_updatedby = this._aws.getlocale();//to get user id for who is update the record item.updatedon = currentdate;//to get Current date and Time for when the Record is updated - delete item.pd_status_name; // to delete the pd_status_name + //delete item.pd_status_name; // to delete the pd_status_name delete item.serialno; });