+
+
+
+
+
+
-
+
+ Configurations
+
+
+
+
+ {{pd.product_name}}
+
+
+ Sales Products required
+
+
+
diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts
index 4c01f8540..73cf8b722 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.ts
+++ b/ng6-seed/src/app/settings/users/register/register.component.ts
@@ -63,6 +63,7 @@ export class RegisterComponent implements OnInit {
entity_for_branch: any;
branchList: any;
enableBranch: boolean=false;
+ productsList: any = [];
constructor(
private router: Router, public fb: FormBuilder, public AWS: AwsService, private cd: ChangeDetectorRef
,private elementRef: ElementRef,public users:UserService,notifier:NotifierService) {
@@ -94,13 +95,16 @@ export class RegisterComponent implements OnInit {
pdteam:[null],
pdtype:[null],
fk_lender_branch_id:[null]
-
- });
+ });
this.userupdate();
-
+
}
-
+ addUserConfigControls() {
+ return this.fb.group({
+ salespd_products:['',Validators.compose([Validators.required])]
+ })
+ }
regdata() {
this.users.entityType().subscribe(res => {
this.types = res;
@@ -119,7 +123,14 @@ export class RegisterComponent implements OnInit {
// this.checktype(this.types[0]);
// }
// });
- this.callrole(1,this.types[0],'');
+ this.users.entitiesDetails().subscribe(res=>{
+ this.entitiesDetails = res;
+ if(this.entitiesDetails.dataStatus == true){
+ this.entitiesDetails = this.entitiesDetails.records;
+ this.callrole(this.types[0].entity_type_id,this.types[0],'');
+ }
+ })
+
}
});
this.users.City().subscribe(res => {
@@ -148,15 +159,6 @@ export class RegisterComponent implements OnInit {
this.pdType = this.pdType.records.filter(pdty=>pdty.isactive ==1);
}
});
-
-
-
- this.users.entitiesDetails().subscribe(res=>{
- this.entitiesDetails = res;
- if(this.entitiesDetails.dataStatus == true){
- this.entitiesDetails = this.entitiesDetails.records;
- }
- })
this.users.getLenderDetails().subscribe(res=>{
this.entity_for_branch=res
if(this.entity_for_branch.dataStatus == true){
@@ -280,6 +282,7 @@ console.log("cog",userData,this.usersData)
this.getBranch(flag);
}
getBranch(flag?){
+ this.checkUserConfigAvail()
if(this.regForm.value.role != null && (this.regForm.value.role.role_name == "Branch Credit" || this.regForm.value.role.role_name == "Branch Sales") && this.regForm.value.lenVenName != null){
console.log(this.regForm.value.role,this.entity_for_branch,this.regForm.value.lenVenName);
if(this.entity_for_branch.length > 0){
@@ -316,6 +319,27 @@ getBranch(flag?){
this.City = this.Cities.filter(city=>city.fk_state_id == e.value.state_id);
+ }
+ checkUserConfigAvail() {
+ console.log(this.types[0].entity_type_id,this.regForm.value.lenVenName)
+ if(this.types[0].entity_type_id == '2' && this.regForm.value.lenVenName.short_name == 'MWISE') {
+ this.regForm.addControl('user_config',this.addUserConfigControls())
+ this.users.getEntityPreferences(this.regForm.value.lenVenName.entity_id).subscribe(res=>{
+ if(res['dataStatus']) {
+ this.productsList = res['records'].salespd_products
+ if (this.users.localUserId != '' && this.users.localUserId != null && this.users.localUserId !== undefined && this.users.localUserId.user_config) {
+ this.regForm.get('user_config')['controls']['salespd_products'].setValue(this.users.localUserId.user_config.salespd_products)
+ }
+ else {
+ this.regForm.get('user_config')['controls']['salespd_products'].setValue(this.productsList.map(item=>item.product_id))
+ }
+ }
+ })
+ console.log(this.regForm.value)
+ }
+ else {
+ this.regForm.removeControl('user_config')
+ }
}
userupdate() {
@@ -336,7 +360,9 @@ getBranch(flag?){
this.entitiesDetails = this.entitiesDetails.records.filter(ent=>ent.isactive ==1);
let entitiy = this.entitiesDetails.filter(ent=>this.usersData.fk_entity_id == ent.entity_id)[0];
this.regForm.controls['lenVenName'].setValue(entitiy);
+
this.callrole(2,this.types[0],this.usersData);
+ this.checkUserConfigAvail()
}
else{
this.callrole(2,this.types[0],this.usersData);
diff --git a/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.html b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.html
new file mode 100644
index 000000000..685595f60
--- /dev/null
+++ b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.html
@@ -0,0 +1,14 @@
+
{{data.title}}
+
+
+
+ {{data.message}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.scss b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.spec.ts b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.spec.ts
new file mode 100644
index 000000000..d643becb4
--- /dev/null
+++ b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DecisionDialogComponent } from './decision-dialog.component';
+
+describe('DecisionDialogComponent', () => {
+ let component: DecisionDialogComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DecisionDialogComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DecisionDialogComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.ts b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.ts
new file mode 100644
index 000000000..fd67e9022
--- /dev/null
+++ b/ng6-seed/src/app/shared/decision-dialog/decision-dialog.component.ts
@@ -0,0 +1,20 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+
+@Component({
+ selector: 'app-decision-dialog',
+ templateUrl: './decision-dialog.component.html',
+ styleUrls: ['./decision-dialog.component.scss']
+})
+export class DecisionDialogComponent implements OnInit {
+
+ constructor(@Inject(MAT_DIALOG_DATA) public data:any, private dialogRef:MatDialogRef) { }
+
+ ngOnInit() {
+ console.log(this.data);
+ }
+ updateString(result) {
+ this.dialogRef.close(result)
+ }
+
+}
diff --git a/ng6-seed/src/app/shared/shared.module.ts b/ng6-seed/src/app/shared/shared.module.ts
index ef69fa903..4a9c8286e 100755
--- a/ng6-seed/src/app/shared/shared.module.ts
+++ b/ng6-seed/src/app/shared/shared.module.ts
@@ -8,10 +8,12 @@ import { RatingComponent} from './rating/rating.component';
import { NumbersOnlyDirective } from './numbers-only/numbers-only.directive';
import { ForMobileNumbersDirective } from './for-mobile-numbers/for-mobile-numbers.directive';
import { ProgressSpineerDialogComponent } from './progress-spineer-dialog/progress-spineer-dialog.component';
-import { MatProgressSpinnerModule } from '@angular/material';
+import { MatButtonModule, MatDialogModule, MatProgressSpinnerModule } from '@angular/material';
+import { DecisionDialogComponent } from './decision-dialog/decision-dialog.component';
+import { CommonModule } from '@angular/common';
@NgModule({
- entryComponents:[ProgressSpineerDialogComponent],
+ entryComponents:[ProgressSpineerDialogComponent,DecisionDialogComponent],
declarations: [
AccordionAnchorDirective,
AccordionLinkDirective,
@@ -20,9 +22,10 @@ import { MatProgressSpinnerModule } from '@angular/material';
RatingComponent,
NumbersOnlyDirective,
ForMobileNumbersDirective,
- ProgressSpineerDialogComponent
+ ProgressSpineerDialogComponent,
+ DecisionDialogComponent
],
- imports:[MatProgressSpinnerModule],
+ imports:[MatProgressSpinnerModule,MatDialogModule,CommonModule,MatButtonModule],
exports: [
AccordionAnchorDirective,
AccordionLinkDirective,
@@ -31,7 +34,10 @@ import { MatProgressSpinnerModule } from '@angular/material';
RatingComponent,
NumbersOnlyDirective,
ForMobileNumbersDirective,
- ProgressSpineerDialogComponent
+ ProgressSpineerDialogComponent,
+ DecisionDialogComponent,
+ CommonModule,
+ MatButtonModule
],
providers: [ MenuItems, HorizontalMenuItems ]
})