@@ -278,4 +279,9 @@
Showing data for last {{common}}. To see older records, please use advanced filter
-
\ No newline at end of file
+
+
+
\ No newline at end of file
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 b1d69b5..6f2f425 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
@@ -176,7 +176,41 @@ console.log(this.displayedColumns)
// load inprogress pd list
public LenderRoleID : string = localStorage.getItem('LenderRoleID');
loadPDDetails() {
-
+ const role=localStorage.getItem('len_user_role_id');
+ alert(role);
+ if(role=='11')
+ {
+ alert('if');
+ this._pd.getSalesPd()
+ .subscribe(
+ data => {
+ this.loaderService.closeMatSpinnerDialog();
+ if (data.status == 200) {
+ this.PdListData = data.records;
+ console.log('pddataabi');
+ console.log(this.PdListData);
+ // this.PdListData =
;
+ if(this.startIndex && this.endIndex) {
+ this.pagedList.next(this.PdListData.slice(this.startIndex, this.endIndex));
+ }
+ else {
+ this.pagedList.next(this.PdListData.slice(0, 10));
+ }
+ this.length = this.PdListData.length;
+ this.PdListData.forEach(value=>{
+ let original=value.pd_sno
+ value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]}
+ })
+ // this.dataLengthTab1 = data.records.length;
+ // this.dataSourceTab1.data = this.PdListData;
+ this.recordStatus=false;
+ this.limitMsg = true
+ }
+
+ })
+ }
+ else
+ {
this.LenderRoleID = localStorage.getItem('LenderRoleID');
if(this.PdListData.length == 0) {
@@ -227,6 +261,7 @@ console.log(this.displayedColumns)
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!' + '-' + error.error_text + ' occur');
alert(error.html_format);
});
+ }
}
OnPageChange(event: PageEvent){
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
index 18f69ab..53b24ad 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
@@ -166,7 +166,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
index 98e53e2..f8ca364 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
@@ -100,7 +100,7 @@ export class PdAllocationComponent implements OnInit {
}
- }, error => this.errorMessage = error);
+ }, error => this.errorMessage = error);
}
getSmcVendorPdOfficerList1(){
@@ -148,6 +148,8 @@ export class PdAllocationComponent implements OnInit {
"pd_agency_id":allocateDetails.entity_id
}
}
+ console.log(this.updateData);
+ //return
this._pd.updatePdOfficer(this.updateData).subscribe(
result => {
if (result.status == 200) {
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
index 42b0880..0b18a36 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
+++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
@@ -77,10 +77,10 @@
matTooltip="View" matTooltipPosition="above">
visibility
-->
-
+ -->
diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
index a5f21af..a2cf625 100755
--- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
+++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
@@ -21,6 +21,9 @@ export interface Menu {
children?: ChildrenItems[];
}
+const roleh=localStorage.getItem('len_user_role_id');
+alert(roleh);
+alert('tension1');
const HORIZONTALMENUITEMS = [
// {
// state: 'home',
@@ -93,7 +96,11 @@ const salesmenu = [
// icon:'report',
// },
];
-
+// if(roleh=='12')
+// {
+// const index = salesmenu.findIndex(user1 => user1.name == 'Sales PD');
+// salesmenu.splice(index, 1);
+// }
@Injectable()
export class HorizontalMenuItems {
getAll(): Menu[] {
diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts
index f499551..88e7953 100755
--- a/ng6-seed/src/app/shared/menu-items/menu-items.ts
+++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts
@@ -30,6 +30,9 @@ export interface Menu {
children?: ChildrenItems[];
multichild?:Multichild[];
}
+const role=localStorage.getItem('len_user_role_id');
+alert(role);
+alert('tension');
const MENUITEMS : Menu[] = [
// {
@@ -175,7 +178,13 @@ const salesMenus: Menu[]= [
// icon:'report',
// }
];
-
+console.log(salesMenus);
+console.log('salesman');
+if(role=='12')
+{
+ const index = salesMenus.findIndex(user => user.name == 'Sales PD');
+ salesMenus.splice(index, 1);
+}
@Injectable()
export class MenuItems {
getAll(): Menu[] {
@@ -194,3 +203,4 @@ export class MenuItems {
MENUITEMS.push(menu);
}
}
+
diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json
index 9ffde02..7ccb734 100644
--- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json
+++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json
@@ -175,7 +175,6 @@
],
"is_repeatable":"1",
"group_title":"Remarks",
- "group_title_shown":"0",
"group_key":"pd_officer_recommendation_remarks"
} ] }
] },