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

master issues fixes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-05 23:00:43 +05:30
parent 1ded485ee0
commit 178d39a925
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts
View File

@ -155,9 +155,10 @@ removevalue(i:number) {
doSomething(){ doSomething(){
var check = 0 ; var check = 0 ;
// console.log(this._pdTeamForm.controls['fk_city_id'].value.city_id);
if((this._pdTeamForm.controls['fk_city_id'].value.city_id != null) // console.log(this._pdTeamForm.controls['fk_lender_id'].value.entity_id);
&&(this._pdTeamForm.controls['fk_lender_id'].value.entity_id) != null) if((this._pdTeamForm.controls['fk_city_id'].value.city_id != '')
&&(this._pdTeamForm.controls['fk_lender_id'].value.entity_id != ''))
{ {
this.tempArray.forEach(item => { this.tempArray.forEach(item => {
@ -170,13 +171,16 @@ if((this._pdTeamForm.controls['fk_city_id'].value.city_id != null)
}); });
if(this.AllPDTeamMapData !== undefined){ if(this.AllPDTeamMapData !== undefined){
this.AllPDTeamMapData.forEach(item => { 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) && 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)) (item.fk_lender_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id))
{ {
check++; check++;
alert('Already Exists on Other Team "'+item.team_name+'"'); alert('Already Exists on Other Team "'+item.team_name+'"');
} }
}
}); });
} }

15
ng6-seed/src/app/settings/service/masters/pd-team.service.ts
View File

@ -143,29 +143,28 @@ return this._http.post<any>(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<any> { getAllPdTeamMapListWithPK(Primarykey): Observable<any> {
var pk = { "primary_key":Primarykey } var pk = { "primary_key":Primarykey }
//var Primar = Primarykey //var Primar = Primarykey
//console.log('FromServiceArrayData',ArrayData); //console.log('FromServiceArrayData',ArrayData);
return this._http.post<any>('http://localhost/sparqapi/api/getListOfPDTeamMap',pk) return this._http.post<any>(this.apiUrl+'getListOfPDTeamMap',pk)
.pipe( .pipe(
catchError(this.handleError('role', [])) catchError(this.handleError('role', []))
) )
} }
/** Get All PD Team Child Data using API call With master Keyword */ /** Get All PD Team Child Data using API call */
getAllPdTeamMapList(): Observable<any> { getAllPdTeamMapList(): Observable<any> {
return this._http.post<any>('http://localhost/sparqapi/api/getListOfPDTeamMap','') return this._http.post<any>(this.apiUrl+'getListOfPDTeamMap','')
.pipe( .pipe(
catchError(this.handleError('role', [])) catchError(this.handleError('role', []))
) )
} }
/** /**
* TO get City Data For Listing Screen * TO get City Data For Listing Screen