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 06dab71..f1c2a95 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 @@ -74,7 +74,7 @@

Showing data for last {{common}}. To see older records, please use advanced filter


-
+
@@ -166,7 +166,7 @@ {{details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}
-
+
- @@ -196,9 +196,10 @@
+ - - + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index b8e8a30..8b72962 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -508,7 +508,7 @@ else { /** To update pd officer*/ selfAllocation(city_id) { const dialogRef1 = this.dialog.open(PdAllocationComponent, { - data: { pd_id:this.viewID, pd_status: this.pdStatusCheck.ALLOCATED,random_string:this.pdMasterData[0].random_string,dialogType:'actionOnly',city_id:city_id }, + data: { pd_id:this.viewID, pd_status: this.pdStatusCheck.ALLOCATED,random_string:this.pdMasterData[0].random_string,dialogType:'actionOnly',city_id:city_id, lender_role_id:this.LenderRoleID }, disableClose: true, minWidth: '30%', }) diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 5b181a4..95784c2 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -885,8 +885,8 @@ loadTemplate(form_id) { return this._http.post(this.apiUrl+'updateTwlioVideoStatus',params) .pipe(catchError(this.handleError("updateTwlioVideoStatus",[]))) } - getCMUsers(city_id):Observable { - let param = new HttpParams().set('city_id',city_id) + getCMUsers(city_id,user_type):Observable { + let param = new HttpParams().set('city_id',city_id).set('usertype',user_type) return this._http.get(this.apiUrl+"getCMUsers",{params:param}) }