diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index 6cd0f2298..fb3c7a3a5 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -24,10 +24,10 @@ import { CognitoService } from './cognito.service'; -const sineedge_poolData = { - UserPoolId: "ap-south-1_y7dt3iEaX", //ap-south-1_qQ85yQZJO UserName :SPARQ_SINEEDGE_DEV - ClientId: "291qt4smn5pql6o8cc2hi201lj" // ClientName: SINEEDGE_DEV_WEB -}; +// const sineedge_poolData = { +// UserPoolId: "ap-south-1_y7dt3iEaX", //ap-south-1_qQ85yQZJO UserName :SPARQ_SINEEDGE_DEV +// ClientId: "291qt4smn5pql6o8cc2hi201lj" // ClientName: SINEEDGE_DEV_WEB +// }; const sineedgedev_poolData = { UserPoolId: "ap-south-1_qQ85yQZJO", // UserName :SPARQ_SINEEDGE_DEV ClientId: "2o5c3cs9k3als16nqhp3irh8rs" // ClientName: SINEEDGE_DEV_WEB @@ -37,10 +37,10 @@ const lender_poolData = { ClientId: "6egsdssf0i7h2o9mscqgqbn788" // ClientName:LENDER_DEV_WEB }; const vendor_poolData = { - UserPoolId: "", + UserPoolId: "ap-south-1_K57yPaWxV", ClientId: "" } -const sineedgeUserPool = new CognitoUserPool(sineedge_poolData); +// const sineedgeUserPool = new CognitoUserPool(sineedge_poolData); const lenderUserPool = new CognitoUserPool(lender_poolData); const sineedgedevUserpool = new CognitoUserPool(sineedgedev_poolData); @@ -48,8 +48,8 @@ const sineedgedevUserpool = new CognitoUserPool(sineedgedev_poolData); * Identity PoolID */ const sineedgeIdentity = "ap-south-1:9a551eab-97cf-4991-b677-2f9bcd058961";//"ap-south-1:9a551eab-97cf-4991-b677-2f9bcd058961"; -const lenderIdentity = "ap-south-1:ca22dabc-db59-4af5-9bb8-265f7ec95907"; -const vendorIdenttiy = ""; +const lenderIdentity = "ap-south-1:ca22dabc-db59-4af5-9bb8-265f7ec95907"; +const vendorIdenttiy = "ap-south-1:5ad3ce43-4260-4273-87b2-e6a377b8e874"; // serviceProvider const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; //const apiurl = "http://localhost/sparqapi/api/"; @@ -355,6 +355,29 @@ export class AwsService { /* more items */ ] }; + }else if(userData.type.entity_type_id == 3){ + params = { + UserPoolId: vendor_poolData.UserPoolId /* required */, + Username: userData.email /* required */, + DesiredDeliveryMediums: [ + "EMAIL" + /* more items */ + ], + // ForceAliasCreation: true || false, + MessageAction: "SUPPRESS", + TemporaryPassword: "temp1234", + UserAttributes: [ + { + Name: "email" /* required */, + Value: userData.email + }, + { + Name: "phone_number" /* required */, + Value: "+91" + userData.phone + } + /* more items */ + ] + }; } console.log(params); return Observable.create(observe => { @@ -560,7 +583,7 @@ export class AwsService { )[0]; // (userGroup); if (userGroup == "ADMIN") { - if (userData.fk_entity_id == 1) { + if (userData.fk_entity_type_id == 1) { params = { UserPoolId: sineedgedev_poolData.UserPoolId /* required */, Username: userData.aws_name,//userData.email /* required */, @@ -579,7 +602,7 @@ export class AwsService { /* more items */ ] }; - } else if (userData.fk_entity_id == 2) { + } else if (userData.fk_entity_type_id == 2) { params = { UserPoolId: lender_poolData.UserPoolId /* required */, Username: userData.aws_name /* required */, diff --git a/ng6-seed/src/app/settings/service/user.service.ts b/ng6-seed/src/app/settings/service/user.service.ts index 0097bafe3..a3d4b5e40 100644 --- a/ng6-seed/src/app/settings/service/user.service.ts +++ b/ng6-seed/src/app/settings/service/user.service.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/internal/Observable'; import { AwsService } from '../../AwsService/aws.service'; import { environment } from 'environments/environment'; const apiurl = "http://ssa.sineedge.com/sparqapi/api/"; +// const apiurl = "http://localhost/sparqapi/api/"; const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); @Injectable({ @@ -85,7 +86,15 @@ export class UserService { return this.http.post(apiurl+'getListOfMaster',master_name); } + roles(){ + let master_name = {'master_name':'ROLES'}; + return this.http.post(apiurl+'getListOfMaster',master_name); + } + entitiesDetails(){ + let master_name = {'master_name':'ENTITY'}; + return this.http.post(apiurl+'getListOfMaster',master_name); + } /** * */ @@ -124,59 +133,53 @@ export class UserService { console.log(users); - let roles:any=[]; - for(var role of users.role){ + // let roles:any=[]; + // for(var role of users.role){ - roles.push({ "user_role": role.GroupName }); - } + + - let designation:any; - if(users.type.entity_type_id ==2){ - let lenderhie:any =[]; - lenderhie.push(users.lenderHierarchy); - formData.append('lender_hierarchy',JSON.stringify(lenderhie)); - designation = ''; + let enities:any; + if(users.type.entity_type_id ==2 || users.type.entity_type_id == 3){ + enities = users.lenVenName.entity_id; }else if(users.type.entity_type_id ==1){ - designation =users.designation.designation_id; + enities =null; } let pdtypeid:any; - let productid:any; let pdteam:any; - let cust:any; - if(users.product != null && users.customer != null && users.pdteam !=null && users.pdtype !=null){ + + if(users.pdteam !=null && users.pdtype !=null){ pdtypeid = users.pdtype.pd_type_id; - productid = users.product.product_id; + pdteam = users.pdteam.pdteam_id; - cust = users.customer.customer_segment_id; + + } + let userid:any; + if(users.userid != null){ + userid = users.userid } let pdofficer = { 'fk_pd_type_id':pdtypeid, - 'fk_product_id':productid, - 'fk_customer_segment':cust, 'fk_team_id':pdteam, - 'fk_user_id':users.userid + 'fk_user_id':userid }; let records:any = { - "userid":users.userid, + "userid":userid, "aws_name": aws_name, "first_name": users.firstName, "last_name": users.lastName, "mobile_no": users.phone, "email": users.email, - "alt_email":users.altemail, - "alt_mobile_no":users.altphone, - "addressline1":users.address1, - "addressline2":users.address2, - "addressline3":users.address3, "isactive":users.isactive, - "fk_entity_id":users.type.entity_type_id, - "fk_designation":designation, + + "fk_entity_type_id":users.type.entity_type_id, + "fk_entity_id":enities, "fk_city":users.city.city_id, "fk_state":users.state.state_id, - "pincode":users.pincode, + "profilepic":profilepic, "fk_createdby":createdby, "fk_updatedby":updateby, @@ -185,7 +188,7 @@ export class UserService { }; //console.log(roles); formData.append('records',JSON.stringify(records)); - formData.append('roles',JSON.stringify(roles)); + formData.append('roles',JSON.stringify(({ "user_role": users.role.role_id}))); formData.append('profilepic',users.userpic); formData.append('pdofficer',JSON.stringify(pdofficer)); diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 568fd7bc7..8eff3a4f4 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -11,11 +11,11 @@
- Personal

+ Personal
- + You must include a first name. Your first name must be at least 5 characters long. Your first name cannot exceed 10 characters. @@ -24,7 +24,7 @@ - + You must include a last name. + + + You must include phone number. + You must include a valid phone number. + +
- Contact Information

+ + +
- + -- {{s.name}} @@ -101,7 +106,7 @@ - + -- {{c.name}} @@ -113,7 +118,7 @@ Role Information

- -- @@ -125,13 +130,29 @@ - + + + -- + + {{ent.full_name}} + + + + + + -- + + {{ent.full_name}} + + + + - + - - {{role.GroupName}} + + {{role.role_name}}
@@ -139,33 +160,19 @@ Select User Role - - - -- - - {{d.name}} - - - - - - -- - - {{l.lender_hierarchy}} - - - +
-
- +
- + -- {{pd.team_name}} @@ -188,7 +195,7 @@ - + -- {{PDT.type_name}} @@ -199,10 +206,17 @@
UserProfile - - - {{img}} - + +
+
+ +
+ + {{img}} +
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 a2f1bf862..700b906df 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -9,7 +9,7 @@ import { FileUploader } from 'ng2-file-upload/ng2-file-upload'; import { MatOption } from '@angular/material'; import { UserService } from '../../service/user.service'; import { ifStmt } from '@angular/compiler/src/output/output_ast'; -const pdoff = "PDOFFICER"; +const pdoff = "PD Officer"; @Component({ selector: 'app-register', @@ -19,6 +19,10 @@ const pdoff = "PDOFFICER"; export class RegisterComponent implements OnInit { + Cities: any; + role: any; + imageaccess: boolean = false; + filename:any; roleload:boolean = false; pdTeam: any = []; customerSeg: any = []; @@ -48,6 +52,8 @@ export class RegisterComponent implements OnInit { @ViewChild('allSelected') private allSelected: MatOption; profileurl: any; profileaccess: boolean; + entitiesDetails:any; + entities:any; constructor( private router: Router, public fb: FormBuilder, public AWS: AwsService, private cd: ChangeDetectorRef ,private elementRef: ElementRef,public users:UserService) { } @@ -65,23 +71,14 @@ export class RegisterComponent implements OnInit { firstName: [null, Validators.compose([Validators.required, Validators.minLength(2)])], lastName: [null, Validators.compose([Validators.required])], phone: [null, Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(12)])], - altphone: [null, Validators.compose([Validators.minLength(10), Validators.maxLength(12)])], email: [null, Validators.compose([Validators.required, CustomValidators.email])], - altemail: [null, Validators.compose([CustomValidators.email])], role: [null, Validators.compose([Validators.required])], type: [null, Validators.compose([Validators.required])], - address1: [null, ''], - address2: [null, ''], - address3: [null, ''], state: [null, Validators.compose([Validators.required])], city: [null, Validators.compose([Validators.required])], - designation: [null, Validators.compose([Validators.required])], + lenVenName: [null, Validators.compose([Validators.required])], userpic: [null], isactive: [true], - pincode: [null], - lenderHierarchy:[null,Validators.compose([Validators.required])], - customer:[null,Validators.compose([Validators.required])], - product:[null,Validators.compose([Validators.required])], pdteam:[null,Validators.compose([Validators.required])], pdtype:[null,Validators.compose([Validators.required])], @@ -104,12 +101,23 @@ export class RegisterComponent implements OnInit { if (this.types.status == 200) { this.types = this.types.records; //console.log(this.types); + this.regForm.controls['type'].setValue(this.types[0]); + this.users.roles().subscribe(res=>{ + console.log(res); + this.roleload = false; + //console.log(roleload); + this.role = res; + if(this.role.dataStatus == true){ + this.role = this.role.records; + this.checktype(this.types[0]); + } + }); } }); this.users.City().subscribe(res => { - this.City = res; - if (this.City.status == 200) { - this.City = this.City.records.filter(City=>City.isactive ==1); + this.Cities = res; + if (this.Cities.status == 200) { + this.Cities = this.Cities.records.filter(City=>City.isactive ==1); } }); this.users.State().subscribe(res => { @@ -118,25 +126,7 @@ export class RegisterComponent implements OnInit { this.State = this.State.records.filter(state=>state.isactive ==1); } }); - this.users.designation().subscribe(res => { - this.designation = res; - if (this.designation.status == 200) { - this.designation = this.designation.records.filter(des=>des.isactive ==1); - } - }); - this.users.lenderHierarchy().subscribe(res=>{ - this.lenderHierarchy = res; - if(this.lenderHierarchy.status ==200){ - this.lenderHierarchy = this.lenderHierarchy.records.filter(len=>len.isactive ==1); - } - }); - this.users.products().subscribe(res=>{ - this.product = res; - if(this.product.status == 200){ - this.product = this.product.records.filter(product=>product.isactive ==1); - - } - }); + this.users.pdTeam().subscribe(res=>{ this.pdTeam = res; @@ -150,26 +140,37 @@ export class RegisterComponent implements OnInit { this.pdType = this.pdType.records.filter(pdty=>pdty.isactive ==1); } }); - this.users.customerSegment().subscribe(res=>{ - this.customerSeg = res; - if(this.customerSeg.status == 200){ - this.customerSeg = this.customerSeg.records.filter(cus=>cus.isactive ==1); - console.log(this.customerSeg); + + + + this.users.entitiesDetails().subscribe(res=>{ + this.entitiesDetails = res; + if(this.entitiesDetails.dataStatus == true){ + this.entitiesDetails = this.entitiesDetails.records; } - }); - //console.log(this.State+''+this.types+''+this.City+''+this.designation); + }) } + + onFileChange($event) { //console.log($event.target.files[0]); - + this.imageaccess = true; + var reader = new FileReader(); //if($event.target.files[0] < 0 ){ this.files = $event.target.files[0]; - // console.log(this.files); - // let file = ; - console.log($event.target.result); + console.log(this.files); + + reader.onload = ($event: ProgressEvent) => { + // console.log(($event.target).result); + this.filename = ($event.target).result; + } + + reader.readAsDataURL($event.target.files[0]); //} //console.log(this.files); } + + register(userData) { // console.log(userData); let data:any; @@ -192,7 +193,9 @@ this.loader = true; this.AWS.register(userData).subscribe(res => { if (res.User.UserStatus != '' && res.User.UserStatus !== undefined && res.User.UserStatus != null) { + if(userData.role == 'System Administrator'){ this.AWS.UserGroup(res,userData).subscribe(res=>{ + });} this.users.saveRecords(res, userData).subscribe(res => { data = res; if (data.status == 200) { @@ -204,7 +207,7 @@ this.loader = true; }); } }) - }) + //}) } }); } else { @@ -221,42 +224,42 @@ this.loader = true; } } - toggleAllSelection(e) { - - if(e.source.selected){ + toggleAllSelection(e,enitiyid) { + console.log(enitiyid); + // if(e.value){ - if(e.source.value.GroupName == pdoff){ - + // if(e.value.role_name == pdoff && enitiyid.entity_type_id == 1){ + // console.log(e.value); + // this.roleAccess = true; + // }else{ + // this.roleAccess = false; + // } + // } + if (this.usersData != '' && this.usersData !==undefined || e.value.role_name == pdoff && enitiyid.entity_type_id == 1) { + console.log(e); + if(e.role_name == pdoff && enitiyid.entity_type_id == 1 || e.value.role_name == pdoff && enitiyid.entity_type_id == 1){ + this.roleAccess = true; - } - }else{ - if(e.source.value.GroupName == pdoff){ + }else{ this.roleAccess = false; } - } - - if (this.usersData != '' && this.usersData !==undefined) { - let users: any; - console.log(this.usersData); - //for (let role of this.usersData[0]) { - //this.AWS.adminremoveGroup(roles,this.usersData); - if(e.source.selected){ - this.AWS.UserGroup(e.source.value,this.usersData); - - }else{ - this.AWS.adminremoveGroup(e.source.value,this.usersData); - console.log("else"); - } - //this.AWS.adminremoveGroup() - // } + + + }else{ + this.roleAccess = false; } } getcity(e){ - // console.log(e) - // this.City =[]= this.City.filter(city=>city.fk_state == e.state_id)[0]; + console.log(e); + console.log(this.Cities); + + + this.City = this.Cities.filter(city=>city.fk_state_id == e.value.state_id); + + } userupdate() { @@ -266,70 +269,73 @@ this.loader = true; this.users.entityType().subscribe(res => { this.types = res; if (this.types.status == 200) { - let type = this.types.records; - this.types= type.filter(type => type.entity_type_id == this.usersData.fk_entity_id); - this.checktype(this.types[0]); + let type = this.types.records.filter(type=>type.isactive ==1); + this.types= type.filter(type => type.entity_type_id == this.usersData.fk_entity_type_id); + this.regForm.controls['type'].setValue(this.types[0]); + + this.users.entitiesDetails().subscribe(res=>{ + this.entitiesDetails = res; + if(this.entitiesDetails.dataStatus == true){ + 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.users.roles().subscribe(res=>{ + + this.roleload = false; + //console.log(roleload); + this.role = res; + if(this.role.dataStatus == true){ + this.role = this.role.records; + this.checktype(this.types[0]); + + let role = this.role.filter(role=>role.role_type == this.usersData.fk_entity_type_id && role.role_id == this.usersData.user_role)[0]; + this.regForm.controls['role'].setValue(role); + console.log(role); + this.toggleAllSelection(role,this.types[0]); + // this.regForm.controls['role'].setValue(role); + + } + + }); + } + }) } }); - this.users.City().subscribe(res => { - this.City = res; - if (this.City.status == 200) { - this.City = this.City.records; - let citys = this.City.filter(city => city.city_id == this.usersData.fk_city)[0]; - this.regForm.controls['city'].setValue(citys); - // console.log(this.City); - } - }); + this.users.State().subscribe(res => { this.State = res; if (this.State.status == 200) { - this.State = this.State.records; + this.State = this.State.records.filter(ent=>ent.isactive ==1); let states = this.State.filter(state => state.state_id == this.usersData.fk_state)[0]; - // console.log(this.State); + console.log(states); this.regForm.controls['state'].setValue(states); + this.users.City().subscribe(res => { + this.Cities = res; + if (this.Cities.status == 200) { + //this.City = this.Cities.records; + this.Cities = this.Cities.records.filter(ent=>ent.isactive ==1); + let City = this.Cities.filter(city=>city.fk_state_id == states.state_id && city.city_id == this.usersData.fk_city)[0]; + let value = {'value':{'state_id':states.state_id}}; + this.getcity(value); + this.regForm.controls['city'].setValue(City); + // let citys = this.Cities.filter(city => city.city_id == this.usersData.fk_city)[0]; + // this.regForm.controls['city'].setValue(citys); + // console.log(this.City); + + } + }); } }); - this.users.designation().subscribe(res => { - this.designation = res; - if (this.designation.status == 200) { - this.designation = this.designation.records; - let des = this.designation.filter(des => des.designation_id == this.usersData.fk_designation)[0]; - this.regForm.controls['designation'].setValue(des); - } - }); - this.users.lenderHierarchy().subscribe(res=>{ - this.lenderHierarchy = res; - if(this.lenderHierarchy.status ==200){ - this.lenderHierarchy = this.lenderHierarchy.records; - let hie = this.lenderHierarchy.filter(hie => hie.lender_hierarchy_id == this.usersData.fk_hierarchy_id)[0]; - console.log(hie); - this.regForm.controls['lenderHierarchy'].setValue(hie); - - } - }) - - - this.users.products().subscribe(res=>{ - this.product = res; - if(this.product.status == 200){ - this.product = this.product.records; - //console.log(this.usersData.fk_product_id); - let pro = this.product.filter(pro=>pro.product_id == this.usersData.fk_product_id)[0]; - //console.log(pro); - this.regForm.controls['product'].setValue(pro); - - } - }); this.users.pdTeam().subscribe(res=>{ this.pdTeam = res; if(this.pdTeam.status == 200){ - this.pdTeam = this.pdTeam.records; + this.pdTeam = this.pdTeam.records.filter(ent=>ent.isactive ==1); let pdteam = this.pdTeam.filter(pd=>pd.pdteam_id == this.usersData.fk_team_id)[0]; this.regForm.controls['pdteam'].setValue(pdteam); } @@ -337,20 +343,12 @@ this.loader = true; this.users.pdType().subscribe(res=>{ this.pdType = res; if(this.pdType.status == 200){ - this.pdType = this.pdType.records; + this.pdType = this.pdType.records.filter(ent=>ent.isactive ==1); let pdtype = this.pdType.filter(pdt=>pdt.pd_type_id == this.usersData.fk_pd_type_id)[0]; this.regForm.controls['pdtype'].setValue(pdtype); } }); - this.users.customerSegment().subscribe(res=>{ - this.customerSeg = res; - if(this.customerSeg.status == 200){ - this.customerSeg = this.customerSeg.records; - let cust = this.customerSeg.filter(cus=>cus.customer_segment_id == this.usersData.fk_customer_segment)[0]; - this.regForm.controls['customer'].setValue(cust); - } - }); let users= { 'userid':this.usersData.userid, 'entityid':this.usersData.fk_entity_id, @@ -372,12 +370,8 @@ this.loader = true; this.regForm.controls['firstName'].setValue(this.usersData.user_first_name); this.regForm.controls['lastName'].setValue(this.usersData.user_last_name); this.regForm.controls['phone'].setValue(this.usersData.mobile_no); - this.regForm.controls['altphone'].setValue(this.usersData.alt_mobile_no); + this.regForm.controls['email'].setValue(this.usersData.email); - this.regForm.controls['altemail'].setValue(this.usersData.alt_email); - this.regForm.controls['address1'].setValue(this.usersData.addressline1); - this.regForm.controls['address2'].setValue(this.usersData.addressline2); - this.regForm.controls['address3'].setValue(this.usersData.addressline3); if (this.usersData.isactive == 1) { this.regForm.controls['isactive'].setValue(true); } else { @@ -385,31 +379,29 @@ this.loader = true; } // this.regForm.controls['userpic'].setValue(this.usersData.profilepic); - this.regForm.controls['pincode'].setValue(this.usersData.pincode); + this.img = this.usersData.profilepic; } } + + checktype(e){ - //console.log(e); - - let userRole:any = []; + console.log(e); + this.roleAccess= false; + let userRole:any; if(e !== undefined){ - this.roleload = true; + //console.log(roleload); - this.AWS.adminlistgroup(e.entity_type_id).subscribe(res=>{ - this.roleload = false; - //console.log(roleload); - this.roles = res; - if(this.usersData !==undefined){ - for (let role of this.usersData[0]) { - //console.log(role); - userRole.push(this.roles.filter(roles => roles.GroupName == role.user_role)[0]); - //console.log(userRole); - this.regForm.controls['role'].setValue(userRole); - } + + this.roles = this.role.filter(role=>role.role_type == e.entity_type_id); + console.log(this.roles); + // let role = this.roles.filter(role=>role.role_id == this.usersData.user_role_id); + // console.log(role); + // this.regForm.controls['role'].setValue(role); } + - }) + switch (e.entity_type_id) { case "1": this.typeValue =1; @@ -417,16 +409,18 @@ this.loader = true; break; case "2": this.typeValue =2; + this.entities = this.entitiesDetails.filter(entity=>entity.fk_entity_type_id == e.entity_type_id); break; case "3": this.typeValue =3; + this.entities = this.entitiesDetails.filter(entity=>entity.fk_entity_type_id == e.entity_type_id); break; default : this.typeValue = -1; break; } - } + }