From 17a78672a1ae6b745a17ec209aaf744cd7ff734c Mon Sep 17 00:00:00 2001 From: venbaSriram Date: Mon, 24 Sep 2018 13:09:51 +0530 Subject: [PATCH] usermangementdatatable --- ng6-seed/package-lock.json | 13 ++-- .../users/user-list/user-list.component.html | 69 ++++++++++++++++++- .../users/user-list/user-list.component.scss | 21 ++++++ .../users/user-list/user-list.component.ts | 37 ++++++++-- .../src/app/settings/users/users.module.ts | 9 ++- 5 files changed, 136 insertions(+), 13 deletions(-) diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 9fb3c3ac5..224bd3223 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4268,7 +4268,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4683,7 +4684,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4739,6 +4741,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4782,12 +4785,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, 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 96700e40d..81c10b973 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 @@ -1,4 +1,4 @@ -
+ + + +
+ +
+
+
+ +
+ +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + Full Name + {{us.user_first_name}} {{us.user_last_name}} + + + + Email Id + {{us.email}} + + + Mobile No + {{us.mobile_no}} + + + + Is Active + + done + close + + + + + Actions + + edit + delete_forever + + + + + + + + + + + +
+
diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.scss b/ng6-seed/src/app/settings/users/user-list/user-list.component.scss index 5f4a8eb3b..034c06190 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.scss +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.scss @@ -22,4 +22,25 @@ table { .deactive:hover{ color: green; font-size: 25px; +} + +.example-container { + display: flex; + flex-direction: column; + min-width: 300px; +} + +.example-header { + min-height: 64px; + padding: 8px 24px 0; +} + +.mat-form-field { + font-size: 14px; + width: 100%; +} + +.mat-table { + overflow: auto; + max-height: 500px; } \ No newline at end of file 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 128688644..1de040ae0 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 @@ -1,31 +1,50 @@ import { Component, OnInit, ViewChild, } from '@angular/core'; import { Router, RouterOutlet } from '@angular/router'; import { AwsService } from '../../../AwsService/aws.service'; -import { MatPaginator, MatTableDataSource } from '@angular/material'; +import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material'; import { UserService } from '../../service/user.service'; +import { DataSource } from '@angular/cdk/table'; + @Component({ selector: 'app-user-list', templateUrl: './user-list.component.html', styleUrls: ['./user-list.component.scss'] }) export class UserListComponent implements OnInit { - displayedColumns: string[] = ['position', 'name', 'weight', 'symbol']; + public dataLength: number; + public dataSource = new MatTableDataSource(); + displayedColumns = ['SerialNo','FullName','Email','Mobile','Actions', 'IsActive']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; userdata: any = []; loader: boolean = false; - @ViewChild(MatPaginator) paginator: MatPaginator; + - constructor(public aws: AwsService, public route: Router,public users:UserService) { } + constructor(public aws: AwsService, public route: Router,public users:UserService) { + + this.getusers(); + } ngOnInit() { - this.getusers(); + delete this.aws.localUserId; } + ngAfterViewInit() { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + applyFilter(filterValue: string) { + filterValue = filterValue.trim(); // Remove whitespace + filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches + this.dataSource.filter = filterValue; + } getusers() { this.loader = true; let data:any; @@ -35,6 +54,9 @@ export class UserListComponent implements OnInit { data = res; if (data.status == 200) { this.userdata = data.records; + console.log(data.records.length); + this.dataLength = data.records.length; + this.dataSource.data = this.userdata; } }) } @@ -94,4 +116,9 @@ export class UserListComponent implements OnInit { add(){ this.route.navigate(['setting/users/register']); } + // deleteuser(user){ + // this.aws.deleteAws(user).subscribe(res=>{ + // this.getusers(); + // }); + // } } diff --git a/ng6-seed/src/app/settings/users/users.module.ts b/ng6-seed/src/app/settings/users/users.module.ts index e0fdcd190..57437c1ea 100644 --- a/ng6-seed/src/app/settings/users/users.module.ts +++ b/ng6-seed/src/app/settings/users/users.module.ts @@ -7,7 +7,9 @@ import { MatRadioModule, MatButtonModule,MatTableModule,MatPaginatorModule, MatProgressBarModule,MatDialogModule, MatSortModule, - MatToolbarModule,MatSelectModule } from '@angular/material'; + MatToolbarModule,MatSelectModule, + MatListModule, MatMenuModule, +} from '@angular/material'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -16,6 +18,8 @@ import { RouterModule } from '@angular/router'; import { UserRoutes} from './users.routing'; import { RegisterComponent } from './register/register.component'; import { UserListComponent} from './user-list/user-list.component'; + +import { NewPasswordDialog, ForgotPass } from '../../session/login/login.component'; // import { HttpClientModule } from '@angular/common/http'; @NgModule({ imports: [ @@ -27,12 +31,13 @@ import { UserListComponent} from './user-list/user-list.component'; MatRadioModule, MatButtonModule,MatTableModule,MatPaginatorModule, MatProgressBarModule,MatDialogModule, MatSortModule, - MatToolbarModule,MatSelectModule, + MatToolbarModule,MatSelectModule,MatListModule, MatMenuModule, MatSlideToggleModule, FormsModule, ReactiveFormsModule, // HttpClientModule, ], declarations: [UserListComponent, RegisterComponent], + }) export class UsersModule { }