diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index b0f821d27..78ab38287 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4294,12 +4294,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4314,17 +4316,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4441,7 +4446,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4453,6 +4459,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4467,6 +4474,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4474,12 +4482,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4498,6 +4508,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4578,7 +4589,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4590,6 +4602,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4711,6 +4724,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index 3e25469c7..7d7cbe688 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -364,7 +364,7 @@ export class AwsService { err, data ) => { - if (err) { alert(err.stack); } + if (err) { alert(err.message); } // an error occurred @@ -420,7 +420,7 @@ export class AwsService { data ) { if (err) { - alert(err.stack); + alert(err.message); }//(err, err.stack); // an error occurred else {//(data); @@ -461,7 +461,7 @@ export class AwsService { data ) { if (err) { - alert(err.stack); + alert(err.message); }//(err, err.stack); // an error occurred else {//(data); diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index a04c747f6..0bd5cd050 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -50,8 +50,8 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { this.currentUser = res; if(this.currentUser.dataStatus == true){ this.currentUser = this.currentUser.records[0]; - this.fullName = this.currentUser.user_full_name; - console.log(this.currentUser); + this.fullName = this.currentUser.user_first_name +' '+this.currentUser.user_last_name; + //console.log(this.currentUser); if(this.currentUser.fk_entity_id == 1 ){ this.userDep = "SINEEGDE"; }else if(this.currentUser.fk_entity_id ==2){ 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 2ae94c7d5..712d939a9 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -33,7 +33,7 @@ - + Account Details

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 89f858604..522565dd9 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 @@ -4,7 +4,7 @@ import { AwsService } from '../../../AwsService/aws.service'; import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material'; import { UserService } from '../../service/user.service'; import { DataSource } from '@angular/cdk/table'; - +import { CognitoService } from '../../../AwsService/cognito.service'; @Component({ selector: 'app-user-list', templateUrl: './user-list.component.html', @@ -23,8 +23,20 @@ export class UserListComponent implements OnInit { - constructor(public aws: AwsService, public route: Router,public users:UserService) { + constructor(public aws: AwsService, public route: Router,public users:UserService,public shared:CognitoService) { + let session:any = this.shared.getAccessToken(); + //console.log(session.idToken.payload["cognito:groups"]); + let userGroup = session.idToken.payload["cognito:groups"].filter( + usergroup => usergroup == "ADMIN" + )[0]; + + if(userGroup == "ADMIN" ){ + }else{ + alert('Admin Only Access Page'); + this.route.navigate(['home']); + + } this.getusers(); } diff --git a/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html b/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html index 0d1c48bad..6b56b830c 100755 --- a/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html +++ b/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html @@ -22,11 +22,12 @@ -->
-
- user +
+ + user
-
-

{{userDetails.user_full_name}}

+
+ +
-

Tweets

-
+ +
+
@@ -53,12 +57,12 @@
  • -
    user +
    user
    {{userDetails.user_full_name}} - +
    {{userDetails.createdon | date:'dd MMM yyyy'}}

    {{userDetails.mobile_no}}

    {{userDetails.addressline1}} {{userDetails.addressline2}}
    @@ -66,11 +70,11 @@

    -
    +
    • -
  • +
diff --git a/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts b/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts index 4e68a0823..5f361917d 100755 --- a/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts +++ b/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts @@ -4,6 +4,7 @@ import { MatDialog, MatDialogRef, MatDialogConfig } from '@angular/material'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { CustomValidators } from 'ng2-validation'; import { UserService } from '../../service/user.service'; +import { Router} from '@angular/router'; @Component({ selector: 'ms-user-profile', templateUrl:'./user-profile-component.html', @@ -11,6 +12,7 @@ import { UserService } from '../../service/user.service'; encapsulation: ViewEncapsulation.None }) export class UserProfileComponent implements OnInit { + profileurl: any; config: MatDialogConfig = { disableClose: false, width: '', @@ -23,8 +25,9 @@ export class UserProfileComponent implements OnInit { } }; userDetails:any=[]; - constructor(public AWS:AwsService,public dialog: MatDialog,public users:UserService ) { + constructor(public AWS:AwsService,public dialog: MatDialog,public users:UserService,public router:Router ) { this.getuser(); + } ngOnInit() { @@ -38,6 +41,7 @@ export class UserProfileComponent implements OnInit { this.users.getroles().subscribe(res=>{ this.userDetails = res; this.userDetails = this.userDetails.records[0]; + this.getprofilepic(); }); } changePassword(){ @@ -52,10 +56,30 @@ export class UserProfileComponent implements OnInit { }) } } + //console.log(ChangePasswordDialog.prototype.pass); }); } + editprofile(){ + this.users.adminGetUsers(this.userDetails); + this.router.navigate(['setting/users/register']); + } + getprofilepic(){ + let users= { + 'userid':this.userDetails.userid, + 'entityid':this.userDetails.fk_entity_id, + 'profilepic':this.userDetails.profilepic + } + this.users.getprofilepic(users).subscribe(res=>{ + this.profileurl = res; + if(this.profileurl.dataStatus == true){ + + this.profileurl = this.profileurl.records; + + } + }) + } } @Component({