+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff
-
-
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/masters/masters.component.ts b/ng6-seed/src/app/settings/masters/masters.component.ts
index b5d384235..642bae1e0 100644
--- a/ng6-seed/src/app/settings/masters/masters.component.ts
+++ b/ng6-seed/src/app/settings/masters/masters.component.ts
@@ -17,6 +17,7 @@
name: string;
}
+
export interface Dbmaster{
master_id: number;
master_name: string;
@@ -40,9 +41,16 @@
styleUrls: ['./masters.component.scss']
})
export class MastersComponent implements OnInit {
+
private dbmasters: Dbmaster[];
+
+
+ //public dbmasters: Dbmaster = new Dbmaster();
+
+ //public arr: Array<{master_id: number, master_name: string}>;
+
/* Normal Search Code
- pickUpMasterData : string;
+ pickUpMasterData : string
constructor() {}
@@ -91,7 +99,7 @@ export class MastersComponent implements OnInit {
/** control for the MatSelect filter keyword */
public masterFilterCtrl: FormControl = new FormControl();
-
+
//masters: Master[];
constructor(private _MastersService: MastersService)
@@ -103,38 +111,41 @@ export class MastersComponent implements OnInit {
}
/** list of masters */
-
- private masters: Master[] = [
- {id: 'master-1',name: 'Industry Classfication'},
- {id: 'master-2',name: 'Branch'},
- {id: 'master-3',name: 'Title'},
- {id: 'master-4',name: 'City'},
- {id: 'master-5',name: 'States'},
- {id: 'master-6',name: 'Regions'},
- {id: 'master-7',name: 'Relation Ship'},
- {id: 'master-8',name: 'Product'},
- {id: 'master-9',name: 'Sub Product'},
- {id: 'master-10',name: 'Occupation of Non earning members'},
- {id: 'master-11',name: 'Type of activity'},
- {id: 'master-12',name: 'Unit of Measurement'},
- {id: 'master-13',name: 'Frequency'},
- {id: 'master-14',name: 'Comments on locality'},
- {id: 'master-15',name: 'Customer Behaviour'},
- {id: 'master-16',name: 'Customer Segment'},
- {id: 'master-17',name: 'Designation'},
- {id: 'master-18',name: 'Lender Hierarchy'},
- {id: 'master-19',name: 'Company Details'},
- {id: 'master-20',name: 'Question Category'},
- {id: 'master-21',name: 'PD Type'},
- {id: 'master-22',name: 'Approach to PD location'},
- {id: 'master-23',name: 'PD Allocation Type'},
- {id: 'master-24',name: 'PD Notification'},
- // {id: 'master-25',name: 'PD Office Lender'},
- // {id: 'master-25',name: 'PD Team'},
- ];
+
+ // private masters: Master[] = [
+ // {id: 'master-1',name: 'Industry Classfication'},
+ // {id: 'master-2',name: 'Branch'},
+ // {id: 'master-3',name: 'Title'},
+ // {id: 'master-4',name: 'City'},
+ // {id: 'master-5',name: 'States'},
+ // {id: 'master-6',name: 'Regions'},
+ // {id: 'master-7',name: 'Relation Ship'},
+ // {id: 'master-8',name: 'Product'},
+ // {id: 'master-9',name: 'Sub Product'},
+ // {id: 'master-10',name: 'Occupation of Non earning members'},
+ // {id: 'master-11',name: 'Type of activity'},
+ // {id: 'master-12',name: 'Unit of Measurement'},
+ // {id: 'master-13',name: 'Frequency'},
+ // {id: 'master-14',name: 'Comments on locality'},
+ // {id: 'master-15',name: 'Customer Behaviour'},
+ // {id: 'master-16',name: 'Customer Segment'},
+ // {id: 'master-17',name: 'Designation'},
+ // {id: 'master-18',name: 'Lender Hierarchy'},
+ // {id: 'master-19',name: 'Company Details'},
+ // {id: 'master-20',name: 'Question Category'},
+ // {id: 'master-21',name: 'PD Type'},
+ // {id: 'master-22',name: 'Approach to PD location'},
+ // {id: 'master-23',name: 'PD Allocation Type'},
+ // {id: 'master-24',name: 'PD Notification'},
+ // // {id: 'master-25',name: 'PD Office Lender'},
+ // // {id: 'master-25',name: 'PD Team'},
+ // ];
/** list of masters filtered by search keyword */
+
//public filteredMasters: ReplaySubjectNo records found
+
+
+
- + -
+
+
+
-
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 b5a3a6fed..1d9c308f8 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,88 +1,90 @@ - - -
-
+
- {{pdteamdetails.team_name | titlecase}} info
-
-
+{{pdteamdetails.team_name | titlecase}} info
+
{{pdteamdetails.short_name}}
@@ -49,5 +50,7 @@
\ No newline at end of file
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 5065050f5..c48574908 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.html
+++ b/ng6-seed/src/app/settings/users/register/register.component.html
@@ -1,79 +1,121 @@
-
-
- USER REGISTRATION
-
-
-
+
- +
@@ -49,5 +50,7 @@
{{pdTeamManageData}}
+
+
-
+
- User Profile
-
-
-
- -
- ![]()
-
-
- {{img}}
-
-
-
- Isactive
-
-
- 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 b5a3a6fed..1d9c308f8 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,88 +1,90 @@ - - -
-
-
-
-
-
+
+
+
+
\ 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 29f23fae9..5d9842295 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
@@ -5,7 +5,8 @@ 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';
-
+ /**sweet alert */
+import Swal from 'sweetalert2'
@Component({
selector: 'app-user-list',
@@ -146,5 +147,41 @@ export class UserListComponent implements OnInit {
this.getusers();
})
}
+ //Sweetalert2 for active and deactive
+active(){
+ Swal({
+ title: 'Are you sure?',
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#3085d6',
+ cancelButtonColor: '#d33',
+ confirmButtonText: 'Yes, activate it!'
+ }).then((result) => {
+ if (result.value) {
+ Swal(
+ 'Activated!',
+ 'success'
+ )
+ }
+ })
+}
+deactive()
+{
+ Swal({
+ title: 'Are you sure?',
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#3085d6',
+ cancelButtonColor: '#d33',
+ confirmButtonText: 'Yes, deactivate it!'
+ }).then((result) => {
+ if (result.value) {
+ Swal(
+ 'Deactivated!',
+ 'success'
+ )
+ }
+ })
+}
}
diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html
index ec6b2a986..de6c3b18d 100644
--- a/ng6-seed/src/index.html
+++ b/ng6-seed/src/index.html
@@ -124,6 +124,11 @@
.mat-cell{
font-size:1.2em !important;
}
+ .mat-header-cell{
+ font-size:1.2em !important;
+ font-weight:800 !important;
+ }
+
.swal2-header {
text-align:left !important;
}
Users
-
-
-
-
-
-
+
+
+
-
-
- Sl
- {{us.SerialNo}}
-
-
-
- Full Name
- {{us.user_first_name}} {{us.user_last_name}}
-
-
-
- Email Id
- {{us.email}}
-
-
- Mobile No
- {{us.mobile_no}}
-
-
- Roles
- {{us.role_name}}
-
-
- Entities
- {{us.entitytypename}}
-
-
- Is Active
-
-
-
-
-
-
-
-
-
-
-
- Actions
-
- edit
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+ Users
+
+
+
+
+ Sl
+ {{us.SerialNo}}
+
+
+
+ Name
+ {{us.user_first_name}} {{us.user_last_name}}
+
+
+
+ Email
+ {{us.email}}
+
+
+ Mobile
+ {{us.mobile_no}}
+
+
+ Role
+ {{us.role_name}}
+
+
+ Entity
+ {{us.entitytypename}}
+
+
+ Active
+
+
+
+
+
+
+
+
+
+
+
+ Action
+
+ edit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+