From 30073db984086df9041fc53f2cabb52917b519b4 Mon Sep 17 00:00:00 2001 From: venbaSriram Date: Fri, 12 Oct 2018 13:38:50 +0530 Subject: [PATCH] User Management Change and PD Team Management by Sriram --- ng6-seed/package-lock.json | 48 +++---- ng6-seed/package.json | 1 + ng6-seed/src/app/AwsService/aws.service.ts | 107 ++++++++++------ .../pd-team-list/pd-team-list.component.html | 3 + .../pd-team-list/pd-team-list.component.ts | 5 +- .../pd-team-manage.component.html | 54 ++++++++ .../pd-team-manage.component.scss | 24 ++++ .../pd-team-manage.component.spec.ts | 25 ++++ .../pd-team-manage.component.ts | 120 ++++++++++++++++++ .../app/settings/pd-team/pd-team.module.ts | 9 +- .../app/settings/pd-team/pd-team.routing.ts | 4 + .../service/masters/pd-team.service.ts | 26 ++++ .../src/app/settings/service/user.service.ts | 6 +- .../users/register/register.component.html | 14 +- .../users/register/register.component.ts | 8 +- .../users/user-list/user-list.component.html | 28 +++- .../users/user-list/user-list.component.ts | 2 +- 17 files changed, 391 insertions(+), 93 deletions(-) create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.spec.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 31f7995ee..7119b427d 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4273,8 +4273,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4295,14 +4294,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4317,20 +4314,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4447,8 +4441,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4460,7 +4453,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4475,7 +4467,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4483,14 +4474,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4509,7 +4498,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4590,8 +4578,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4603,7 +4590,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4689,8 +4675,7 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -4726,7 +4711,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4746,7 +4730,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4790,14 +4773,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -9991,6 +9972,11 @@ "has-flag": "^3.0.0" } }, + "sweetalert2": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-7.28.4.tgz", + "integrity": "sha512-HEAfIAPactjB8CvgsJClxT+6wv2OGh/KkgvgJ8xR28uAXtx9BUQAlws1mruaS7Jzn8gIt6esx4BEZLaZSGvBZw==" + }, "symbol-observable": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", @@ -11377,4 +11363,4 @@ "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==" } } -} \ No newline at end of file +} diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 299250298..77f4ff8ef 100644 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -60,6 +60,7 @@ "screenfull": "^3.2.2", "simple-line-icons": "^2.4.1", "sortablejs": "^1.6.0", + "sweetalert2": "^7.28.4", "tether": "^1.4.0", "zone.js": "^0.8.26" }, diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index 221bb775c..36ddffe86 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -223,12 +223,12 @@ export class AwsService { let params: any; if (userGroup == 'ADMIN') { console.log(userdata); - if (userdata.fk_entity_id == 1) { + if (userdata.fk_entity_type_id == 1) { params = { UserPoolId: sineedgedev_poolData.UserPoolId, /* required */ Username: awsName /* required */ }; - } else if (userdata.fk_entity_id == 2) { + } else if (userdata.fk_entity_type_id == 2) { params = { UserPoolId: lender_poolData.UserPoolId, /* required */ Username: awsName /* required */ @@ -253,7 +253,7 @@ export class AwsService { adminenableUser(userdata, awsName) { let session:any = this.shared.getAccessToken() || ""; // this.getconfig(); - + console.log(userdata); let config = ""; AWS.config.region = "ap-south-1"; AWS.config.credentials = new AWS.CognitoIdentityCredentials({ @@ -271,13 +271,13 @@ export class AwsService { //cognitosdata = 7; let params: any; if (userGroup == 'ADMIN') { - console.log(userdata); - if (userdata.fk_entity_id == 1) { + + if (userdata.fk_entity_type_id == 1) { params = { UserPoolId: sineedgedev_poolData.UserPoolId, /* required */ Username: awsName /* required */ }; - } else if (userdata.fk_entity_id == 2) { + } else if (userdata.fk_entity_type_id == 2) { params = { UserPoolId: lender_poolData.UserPoolId, /* required */ Username: awsName /* required */ @@ -308,7 +308,7 @@ export class AwsService { )[0]; // (userGroup); if (userGroup == "ADMIN") { - if (userData.type.entity_type_id == 1) { + if (userData.type.fk_entity_type_id == 1) { params = { UserPoolId: sineedgedev_poolData.UserPoolId /* required */, Username: userData.email /* required */, @@ -331,7 +331,7 @@ export class AwsService { /* more items */ ] }; - } else if (userData.type.entity_type_id == 2) { + } else if (userData.type.fk_entity_type_id == 2) { console.log(2); params = { UserPoolId: lender_poolData.UserPoolId /* required */, @@ -355,7 +355,7 @@ export class AwsService { /* more items */ ] }; - }else if(userData.type.entity_type_id == 3){ + }else if(userData.type.fk_entity_type_id == 3){ params = { UserPoolId: vendor_poolData.UserPoolId /* required */, Username: userData.email /* required */, @@ -409,7 +409,7 @@ export class AwsService { //console.log(cognitodata); - + console.log(userData); this.getconfig(); //let cognitodata = "539bfefa-ae42-4bee-bf79-4b15d1a2af7f"; @@ -418,13 +418,20 @@ export class AwsService { let params: any; - + if(userData.userid === undefined){ params = { GroupName: "ADMIN" /* required */, UserPoolId: sineedgedev_poolData.UserPoolId,//"ap-south-1_y7dt3iEaX" /* required */, Username: cognitodata.User.Username //'539bfefa-ae42-4bee-bf79-4b15d1a2af7f' /* required */ }; - + }else + { + params = { + GroupName: "ADMIN" /* required */, + UserPoolId: sineedgedev_poolData.UserPoolId,//"ap-south-1_y7dt3iEaX" /* required */, + Username: userData.aws_name //'539bfefa-ae42-4bee-bf79-4b15d1a2af7f' /* required */ + }; + } //(params); return Observable.create(observe=>{ @@ -466,7 +473,7 @@ export class AwsService { //cognitosdata = 7; let params:any; if (userGroup == 'ADMIN') { - if(user.type.entity_type_id ==1){ + if(user.type.fk_entity_type_id ==1){ params = { UserAttributes: [ /* required */ { @@ -484,7 +491,7 @@ export class AwsService { UserPoolId: sineedgedev_poolData.UserPoolId, /* required */ Username: user.email /* required */ }; - }else if(user.type.entity_type_id ==2){ + }else if(user.type.fk_entity_type_id ==2){ params = { UserAttributes: [ /* required */ { @@ -558,6 +565,24 @@ export class AwsService { UserPoolId: lender_poolData.UserPoolId /* required */, Username: userData.aws_name /* required */, + UserAttributes: [ + { + Name: "email" /* required */, + Value: changeusers.email + }, + { + Name: "phone_number" /* required */, + Value: "+91" + changeusers.phone + } + /* more items */ + ] + }; + }else if(userData.fk_entity_type_id == 3) + { + params = { + UserPoolId: vendor_poolData.UserPoolId /* required */, + Username: userData.aws_name /* required */, + UserAttributes: [ { Name: "email" /* required */, @@ -581,34 +606,34 @@ export class AwsService { }) } } -adminremoveGroup(roles,users){ - console.log(roles); - console.log(users); - if(users !==undefined){ +// adminremoveGroup(roles,users){ +// console.log(roles); +// console.log(users); +// if(users !==undefined){ - let session:any = this.shared.getAccessToken() ||""; - this.getconfig(); - let params:any; - if(users.fk_entity_id ==1){ - params = { - GroupName: roles.GroupName, /* required */ - UserPoolId: sineedgedev_poolData.UserPoolId, /* required */ - Username: users.aws_name//'2c64866e-e96f-453b-903f-2b6f831688af' /* required */ - }; -}else if(users.fk_entity_id ==2){ - params = { - GroupName: roles.GroupName, /* required */ - UserPoolId: lender_poolData.UserPoolId, /* required */ - Username: users.aws_name//'2c64866e-e96f-453b-903f-2b6f831688af' /* required */ - }; -} - let cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider(); - cognitoidentityserviceprovider.adminRemoveUserFromGroup(params, function(err, data) { - if (err) console.log(err, err.stack); // an error occurred - else console.log(data); // successful response - }); -} -} +// let session:any = this.shared.getAccessToken() ||""; +// this.getconfig(); +// let params:any; +// if(users.fk_entity_type_id ==1){ +// params = { +// GroupName: roles.GroupName, /* required */ +// UserPoolId: sineedgedev_poolData.UserPoolId, /* required */ +// Username: users.aws_name//'2c64866e-e96f-453b-903f-2b6f831688af' /* required */ +// }; +// }else if(users.fk_entity_id ==2){ +// params = { +// GroupName: roles.GroupName, /* required */ +// UserPoolId: lender_poolData.UserPoolId, /* required */ +// Username: users.aws_name//'2c64866e-e96f-453b-903f-2b6f831688af' /* required */ +// }; +// } +// let cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider(); +// cognitoidentityserviceprovider.adminRemoveUserFromGroup(params, function(err, data) { +// if (err) console.log(err, err.stack); // an error occurred +// else console.log(data); // successful response +// }); +// } +// } adminresetpassword(awsuser){ this.getconfig(); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html index 848631ed1..e7598cf3c 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html @@ -18,6 +18,9 @@ +
+ +
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts index 390529b82..b9455fbaa 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts @@ -69,7 +69,10 @@ export class PdTeamListComponent implements OnInit { }); } - +/**To Manage Team */ +managepdteam(){ + this.router.navigate(['/setting/pdteam/pdteammanage']); +} changeListView(){ this.getPdTeam(); this.listView = true; diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html new file mode 100644 index 000000000..d30fab3a0 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html @@ -0,0 +1,54 @@ + + +
+
Manage PD Team
+ +
+
+
+ + +
+
+
+ +
+
+ + + + + {{pdteamdetails.team_name | titlecase}} info + +
+ {{pdteamdetails.short_name}} + +
+ + + + + +
+ {{ users.user_full_name |titlecase}} + +
+ + + + + + +
+ + +
+
+ +
+
+
+
+ {{pdTeamManageData}} +
+ diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss new file mode 100644 index 000000000..38135d397 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss @@ -0,0 +1,24 @@ + + .tooltip { + position: relative; + display: inline-block; + border-bottom: 1px dotted black; + } + + .tooltip .tooltiptext { + visibility: hidden; + width: 120px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + + /* Position the tooltip */ + position: absolute; + z-index: 1; + } + + .tooltip:hover .tooltiptext { + visibility: visible; + } diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.spec.ts b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.spec.ts new file mode 100644 index 000000000..e80ff730f --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PdTeamManageComponent } from './pd-team-manage.component'; + +describe('PdTeamManageComponent', () => { + let component: PdTeamManageComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PdTeamManageComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PdTeamManageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts new file mode 100644 index 000000000..1f8368b2a --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts @@ -0,0 +1,120 @@ +import { Output, EventEmitter,Component, OnInit,ViewEncapsulation, Directive, ViewChild } from '@angular/core'; +import { PdTeamService } from '../../service/masters/pd-team.service'; +import { DragulaService } from 'ng2-dragula'; + +/**sweet alert */ +import Swal from 'sweetalert2' +@Component({ + selector: 'app-pd-team-manage', + templateUrl: './pd-team-manage.component.html', + styleUrls: ['./pd-team-manage.component.scss'] +}) + +export class PdTeamManageComponent implements OnInit { + saveData: any; + viewpage:boolean = false; + pdTeamManageData:any; + pdTeamColor:any =[]; + pdTeamNewList:any = []; + transferData: any; + btnsave:boolean = true; + teamDetails:any = []; + loader:boolean = false; + mapDetails:any =[]; + @ViewChild('bag1') bag1: any; + constructor( public pdteammanage:PdTeamService,private dragulaService:DragulaService) { + this.getPDTeamManageDetails(); + this.getpdteamchange(); + + } + + ngOnInit() { + + } + + getPDTeamManageDetails() + { + this.loader = true; + this.pdteammanage.getPdTeam().subscribe(res=>{ + this.pdTeamManageData = res; + if(this.pdTeamManageData.dataStatus == true) + { + this.loader = false; + this.btnsave = true; + this.viewpage = true; + this.pdTeamManageData = this.pdTeamManageData.records; + + console.log(this.pdTeamManageData); + + }else + { + this.viewpage = false; + this.pdTeamManageData = "No Records Found"; + } + }) + } + + getpdteamchange(){ + let that = this; + + //console.log(this.bag1); + that.dragulaService.dropModel.subscribe((args: any) => { + + let [bagName, el, target, source] = args; + //console.log(el); + console.log(this.bag1.nativeElement); + console.log(this.bag1.nativeElement === target); + if(this.bag1.nativeElement){ // needed since dropModel triggers for all bags, not only on the dropped bag + console.log(this.bag1.nativeElement); + + let transferData:any = { + userid: el.dataset.id, + oldTeamName: source.dataset.id, + newTeamName: target.dataset.id, + oldIndex: el.dataset.index + } + console.log(el); + for(let i = 0; i < that.pdTeamManageData.length; i++){ + let users = that.pdTeamManageData[i].USERPROFILE; + for(let us of users){ + if(us.userid == transferData.userid){ + transferData.newIndex = i; + //console.log(transferData); + this.pdTeamNewList.push(transferData); + //console.log(that.transferData); + console.log(this.pdTeamNewList); + this.btnsave = false; + break; + } + } + } + + } + }); + + } + getnewTeamDetails(){ + if(this.pdTeamNewList.length ==0) + { + + }else{ + + + this.pdteammanage.savePdTeamManage(this.pdTeamNewList).subscribe(res=> + { + this.saveData = res; + if(this.saveData.dataStatus == true) + { + this.getPDTeamManageDetails(); + } + }) + } + } + cityinfo(id) { + Swal("
CITY:
"+this.pdTeamManageData[id].CITYMAP+'
'+"PRODUCTS: "+this.pdTeamManageData[id].PRODUCTS+"
"+"CS: "+this.pdTeamManageData[id].CUSTOMERSEGMENT+"..
"); + + + + +} +} diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.module.ts b/ng6-seed/src/app/settings/pd-team/pd-team.module.ts index cc7958bc3..dac9173f9 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team.module.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team.module.ts @@ -3,6 +3,9 @@ import { RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; import { FlexLayoutModule } from '@angular/flex-layout'; +import { PdTeamManageComponent } from './pd-team-manage/pd-team-manage.component'; +import {MatListModule} from '@angular/material/list'; + import { MatCardModule, MatIconModule, @@ -30,6 +33,7 @@ import { PdTeamRoutes } from './pd-team.routing'; /** Service */ import { PdTeamService } from '../service/masters/pd-team.service'; +import { DragulaModule } from 'ng2-dragula'; /** * Custom angular notifier options @@ -97,13 +101,14 @@ const customNotifierOptions: NotifierOptions = { NgxDatatableModule, MatSortModule, MatSlideToggleModule, - MatTooltipModule, + MatTooltipModule,MatListModule,DragulaModule, NotifierModule.withConfig(customNotifierOptions), ], declarations: [ PdTeamListComponent, PdTeamAddComponent, - PdTeamEditComponent], + PdTeamEditComponent, + PdTeamManageComponent], providers: [PdTeamService] diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts b/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts index e792e720a..6c6fa741b 100755 --- a/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts @@ -2,6 +2,7 @@ import { Routes } from '@angular/router'; import { PdTeamAddComponent } from '../pd-team/pd-team-add/pd-team-add.component'; import { PdTeamEditComponent } from '../pd-team/pd-team-edit/pd-team-edit.component'; import { PdTeamListComponent } from '../pd-team/pd-team-list/pd-team-list.component'; +import { PdTeamManageComponent } from './pd-team-manage/pd-team-manage.component'; export const PdTeamRoutes: Routes = [{ @@ -16,6 +17,9 @@ export const PdTeamRoutes: Routes = [{ },{ path:'editpdteam', component:PdTeamEditComponent + },{ + path:'pdteammanage', + component:PdTeamManageComponent }] }]; diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts index 1b339e139..dda5a7c98 100644 --- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts +++ b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts @@ -215,5 +215,31 @@ return this._http.post(this.apiUrl+"savePDTeam", ArrayData) // catchError(this.handleError('role', [])) // ) // } +/** + * PD Team Manage + * sriram + */ +getPdTeam() +{ + return this._http.get(this.apiUrl+'getPdManage').pipe(catchError(this.handleError('role',[]))); +} +/** +* Save pd Team Manage +* sriram +*/ + +savePdTeamManage(teamDetails:any) +{ +let records = {records:{teamDetails,fk_updatedby:this._aws.getlocale(),updatedon :currentdate}}; + + + +// console.log(records); +return this._http.post(this.apiUrl+'savePdTeamManage',records); +} + +/** +* End of the function +*/ } \ No newline at end of file diff --git a/ng6-seed/src/app/settings/service/user.service.ts b/ng6-seed/src/app/settings/service/user.service.ts index a3d4b5e40..47019ca84 100644 --- a/ng6-seed/src/app/settings/service/user.service.ts +++ b/ng6-seed/src/app/settings/service/user.service.ts @@ -150,8 +150,8 @@ export class UserService { let pdtypeid:any; let pdteam:any; - if(users.pdteam !=null && users.pdtype !=null){ - pdtypeid = users.pdtype.pd_type_id; + if(users.pdteam !=null){ + pdteam = users.pdteam.pdteam_id; @@ -161,7 +161,7 @@ export class UserService { userid = users.userid } let pdofficer = { - 'fk_pd_type_id':pdtypeid, + 'fk_team_id':pdteam, 'fk_user_id':userid 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 8eff3a4f4..23cc8171b 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -194,7 +194,7 @@ - +
UserProfile @@ -226,16 +226,16 @@
- + - - - + + +
- +
\ No newline at end of file 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 17e26be41..790abd315 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -10,7 +10,7 @@ import { MatOption } from '@angular/material'; import { UserService } from '../../service/user.service'; import { ifStmt } from '@angular/compiler/src/output/output_ast'; const pdoff = "PD Officer"; - +const pdexu = "PD Executive"; @Component({ selector: 'app-register', templateUrl: './register.component.html', @@ -232,9 +232,9 @@ this.loader = true; // 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){ + if (this.usersData != '' && this.usersData !==undefined || e.value.role_name == pdoff && enitiyid.entity_type_id == 1 || e.value.role_name == pdexu && enitiyid.entity_type_id == 1) { + + if(e.role_name == pdoff && enitiyid.entity_type_id == 1 ||e.role_name == pdexu && enitiyid.entity_type_id == 1 || e.value.role_name == pdoff && enitiyid.entity_type_id == 1 || e.value.role_name == pdexu && enitiyid.entity_type_id == 1){ this.roleAccess = true; }else{ diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.html b/ng6-seed/src/app/settings/users/user-list/user-list.component.html index cc5a4df7a..21a3e9a9d 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.html +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.html @@ -36,12 +36,34 @@ Mobile No {{us.mobile_no}} - + + Roles + {{us.role_name}} + + + ENTITIES + {{us.entitytypename}} + Is Active - done - close + + + + + + diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts index 6e6e4be5d..c9fafe84b 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts @@ -13,7 +13,7 @@ import { CognitoService } from '../../../AwsService/cognito.service'; export class UserListComponent implements OnInit { public dataLength: number; public dataSource = new MatTableDataSource(); - displayedColumns = ['SerialNo','FullName','Email','Mobile','Actions', 'IsActive']; + displayedColumns = ['SerialNo','FullName','Email','Mobile','Roles','Entity','Actions', 'IsActive']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort;