diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts index ee0309bf6..26b0e8920 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts @@ -155,9 +155,10 @@ removevalue(i:number) { doSomething(){ var check = 0 ; - -if((this._pdTeamForm.controls['fk_city_id'].value.city_id != null) - &&(this._pdTeamForm.controls['fk_lender_id'].value.entity_id) != null) + // console.log(this._pdTeamForm.controls['fk_city_id'].value.city_id); + // console.log(this._pdTeamForm.controls['fk_lender_id'].value.entity_id); +if((this._pdTeamForm.controls['fk_city_id'].value.city_id != '') + &&(this._pdTeamForm.controls['fk_lender_id'].value.entity_id != '')) { this.tempArray.forEach(item => { @@ -170,13 +171,16 @@ if((this._pdTeamForm.controls['fk_city_id'].value.city_id != null) }); if(this.AllPDTeamMapData !== undefined){ + this.AllPDTeamMapData.forEach(item => { + if(item.fk_team_id != this._pdTeamForm.controls['pdteam_id'].value){ if((item.fk_city_id == this._pdTeamForm.controls['fk_city_id'].value.city_id) && (item.fk_lender_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id)) { check++; alert('Already Exists on Other Team "'+item.team_name+'"'); } + } }); } diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts index 8f4551892..3fdf1d120 100644 --- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts +++ b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts @@ -143,29 +143,28 @@ return this._http.post(this.apiUrl+"savePDTeam", ArrayData) } - /** Get All PD Team Child Data using API call With master Keyword */ + /** Get All PD Team Child Data using API call Based on Primary Key */ getAllPdTeamMapListWithPK(Primarykey): Observable { var pk = { "primary_key":Primarykey } //var Primar = Primarykey -//console.log('FromServiceArrayData',ArrayData); + //console.log('FromServiceArrayData',ArrayData); - return this._http.post('http://localhost/sparqapi/api/getListOfPDTeamMap',pk) + return this._http.post(this.apiUrl+'getListOfPDTeamMap',pk) .pipe( catchError(this.handleError('role', [])) ) } - /** Get All PD Team Child Data using API call With master Keyword */ - getAllPdTeamMapList(): Observable { + /** Get All PD Team Child Data using API call */ + getAllPdTeamMapList(): Observable { - return this._http.post('http://localhost/sparqapi/api/getListOfPDTeamMap','') - .pipe( + return this._http.post(this.apiUrl+'getListOfPDTeamMap','') + .pipe( catchError(this.handleError('role', [])) ) } - /** * TO get City Data For Listing Screen