diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html index 12b19ce1f..b33b0042b 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html @@ -15,7 +15,7 @@
- + Sl @@ -53,12 +53,11 @@ -

No records found

+
- -

No records found

\ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts index aa4494611..ba05d7cde 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts @@ -12,8 +12,7 @@ import { map } from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { of as observableOf, merge } from 'rxjs'; -// import { Bra } from './../branch-list'; -// BranchListComponent + import { MastersService } from '../../../../service/masters/masters.service'; import { BranchDialogComponent } from '../branch-dialog/branch-dialog.component'; import { Branch,States,City } from '../../../model/branch'; @@ -45,7 +44,10 @@ export class BranchListComponent implements OnInit { data => { this.userData = data.records; // alert(this.userData); - this.dataLength = data.records.length; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} this.dataSource.data = this.userData; } ) diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html index 2fa6c31c2..3634a055c 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html @@ -2,7 +2,7 @@

City                                        

- --> +
City
+ --> +
+

City                                                 

+
+
+ +
-
-
+
{{ sd.name }} @@ -29,7 +37,7 @@
-
+
You must include a Name. diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html index 29e55065c..1d6d639c5 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html @@ -8,7 +8,7 @@
+
@@ -31,7 +31,7 @@
-
+
--> + +
+ + + +
- +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.scss b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.scss index 2724e14f3..4e7bb577b 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.scss @@ -54,7 +54,7 @@ .mat-table { overflow: auto; max-height: 500px; -}*/ +}* table { width: 100%; } @@ -66,4 +66,25 @@ .button{ padding-left: 6px; font-size: 20px; +}*/ + +.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/masters/component/city/city-list/city-list.component.ts b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts index 86ce0f917..42bfc149f 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts @@ -28,9 +28,15 @@ export class CityListComponent implements OnInit { //, createdon, fk_createdby, updatedon, fk_updatedby, isactive displayedColumns = ['city_id','name', 'fk_state_id','state_name' , 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } @@ -38,7 +44,7 @@ export class CityListComponent implements OnInit { // return this._MastersService.getAllCity(); // } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getCity(); diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html index 971efad8b..b6ac23634 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html @@ -2,7 +2,7 @@

CommentOnLocality                                        

-
--> +
Comment On Locality
+--> +
+

Comment On Locality                                                 

+
+
+ +
@@ -20,7 +29,7 @@
-
+
You must include a Rating. diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html index 013d6dd64..57e785702 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html @@ -6,7 +6,7 @@
-
+ - +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ + diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.scss b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.scss index 3b5b29164..3a04bafd8 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -89,5 +89,25 @@ th { text-align: left; + }*/ + .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; } diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts index 8125c217a..d55cb3c44 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts @@ -28,9 +28,15 @@ export class CommentsOnLocalityListComponent implements OnInit { displayedColumns = ['comments_on_locality_id','rating','isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); + //displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } @@ -38,7 +44,7 @@ export class CommentsOnLocalityListComponent implements OnInit { // return this._MastersService.getAllCommentsOnLocality(); // } - dataSource = new UserDataSource(this._MastersService); +// dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getCommentsOnLocality(); diff --git a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html index 0bec921c2..9acbcf32b 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html @@ -2,7 +2,7 @@

Company                                        

-
--> +
Company
+
--> +
+

Company                                                 

+
+
+
+
+ diff --git a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html index 7a49c820e..c0fd15667 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html @@ -6,15 +6,15 @@
-
+ + + -
+
+ + + +
+
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
\ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.scss b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.scss index 3b5b29164..3a04bafd8 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -89,5 +89,25 @@ th { text-align: left; + }*/ + .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; } diff --git a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts index 32d988545..a9adb57ee 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts @@ -29,8 +29,15 @@ export class CompanyListComponent implements OnInit { //displayedColumns = ['Company_id', 'fk_city_id', 'name', 'createdon', 'fk_createdby', 'updatedon', 'fk_updatedby', 'isactive','actions']; displayedColumns = ['company_id', 'name', 'addressline1', 'addressline2','addressline3', 'city', 'state','city_name', 'state_name', 'pincode', 'logo','action']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + constructor(private dialog: MatDialog, @@ -40,7 +47,7 @@ export class CompanyListComponent implements OnInit { // return this._MastersService.getAllCompany(); // } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getCompany(); diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html index f687d62b4..118352ce3 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html @@ -2,7 +2,7 @@

Customer Behaviour                                        

-
--> +
Customer Behaviour
+--> +
+

Customer Behaviour                                                 

+
+
+
+
+ diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html index 2b7b90e58..f023a0e38 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html @@ -6,7 +6,7 @@
-
+ +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.scss b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.scss index 3b5b29164..9a2415cd2 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -90,4 +90,24 @@ th { text-align: left; } +*/ +.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/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts index be8148726..1c0b79bec 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts @@ -28,9 +28,15 @@ export class CustomerBehaviourListComponent implements OnInit { displayedColumns = ['customer_behaviour_id', 'description', 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } @@ -39,7 +45,7 @@ export class CustomerBehaviourListComponent implements OnInit { // return this._MastersService.getAllCustomerBehaviour(); // } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getCustomerBehaviour(); diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html index e836328b1..22adb586a 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html @@ -2,7 +2,7 @@

Customer Segment                                        

-
--> +
Customer Segment
+ --> +
+

Customer Segment                                                 

+
+
+
+
+ diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html index e0632e646..802d18565 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html @@ -6,11 +6,11 @@
-
+ + + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.scss b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.scss index 3b5b29164..d48b35231 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -91,3 +91,24 @@ text-align: left; } +*/ +.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/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts index 29e7eb6d9..c82cb9db3 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts @@ -27,9 +27,15 @@ export class CustomerSegmentListComponent implements OnInit { displayedColumns = ['customer_segment_id', 'abbr', 'name', 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } @@ -38,7 +44,7 @@ export class CustomerSegmentListComponent implements OnInit { // return this._MastersService.getAllCustomerSegment(); // } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getCustomerSegment(); diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html index 85dd5b0f5..b425a40d2 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html @@ -2,7 +2,7 @@

Designation                                        

-
--> +
Designation
+--> +
+

Designation                                                 

+
+
+ +
- -
-
+
You must include a Name. @@ -31,7 +38,7 @@ -
+
You must include a Short Name. diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html index b0d993ac2..06204d88b 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html @@ -6,7 +6,7 @@
-
+ + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.scss b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.scss index 3b5b29164..632b268bc 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -89,5 +89,27 @@ th { text-align: left; - } + }*/ + + +.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; +} diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts index 2ab36b0cb..f2fb3aa54 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts @@ -29,9 +29,15 @@ export class DesignationListComponent implements OnInit { displayedColumns = ['designation_id', 'name', 'short_name','isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } @@ -40,7 +46,7 @@ export class DesignationListComponent implements OnInit { // return this._MastersService.getAllDesignation(); // } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getDesignation(); diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html index 49ccbd2e1..80a1bd05e 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html @@ -2,7 +2,7 @@

Frequency                                        

-
--> +
Frequency
+
--> +
+

Frequency                                                 

+
+
+ +
@@ -21,7 +30,7 @@
-
+
You must include a Name. diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html index f3004e09b..97761bf29 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html @@ -6,7 +6,7 @@
-
+ + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.scss b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.scss index af46dbc43..19796459f 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.scss @@ -84,7 +84,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -118,5 +118,28 @@ table { th { text-align: left; +}*/ + + + +.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; } diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts index f623b76e0..3c48e5932 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts @@ -28,6 +28,12 @@ export class FrequencyListComponent implements OnInit { displayedColumns = ['frequency_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -39,7 +45,7 @@ export class FrequencyListComponent implements OnInit { // return this._MastersService. getAllFrequency(); // } - dataSource = new UserDataSource(this._MastersService); + // dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getFrequency(); diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html index c358d229c..c79fd933f 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html @@ -2,7 +2,7 @@

Industry Classification                                        

-
--> +
Industry Classification
+
--> +
+

Industry Classification                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a Classified Name. diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html index eee766509..69596a38c 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html @@ -6,7 +6,7 @@
-
+ + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.scss b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.scss index 49827ebf1..72f98f906 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.scss @@ -80,7 +80,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -114,5 +114,27 @@ table { th { text-align: left; +}*/ + + +.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; } diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts index 18e27206d..faefa88d0 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts @@ -36,9 +36,16 @@ export class IndustryClassificationListComponent implements OnInit { displayedColumns = ['industry_classification_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //industry_classification_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + constructor(private dialog: MatDialog, private _IMService: MastersService) { } @@ -48,7 +55,7 @@ export class IndustryClassificationListComponent implements OnInit { // } //displayedColumns: string[] = ['ID','ClassifiedName']; - dataSource = new UserDataSource(this._IMService); + //dataSource = new UserDataSource(this._IMService); ngOnInit() { diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html index 556e1957e..bdfdff00e 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html @@ -2,7 +2,7 @@

Lender Hierarchy                                        

-
--> +
Lender Hierarchy
+
--> +
+

Lender Hierarchy                                                 

+
+
+
+
+ @@ -20,7 +30,7 @@ fxLayoutGap.xs="0">
-
+
You must include a Lender Hierarchy Name. diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html index d853be328..215905e28 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html @@ -6,7 +6,7 @@
-
+ + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.scss b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.scss index 3b5b29164..632b268bc 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -89,5 +89,27 @@ th { text-align: left; - } + }*/ + + +.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; +} diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts index 79b1adc79..dd630e7f1 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts @@ -28,6 +28,12 @@ export class LenderHierarchyListComponent implements OnInit { displayedColumns = ['lender_hierarchy_id', 'lender_hierarchy','isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -39,7 +45,7 @@ export class LenderHierarchyListComponent implements OnInit { // return this._MastersService. getAllLenderHierarchy(); // } - dataSource = new UserDataSource(this._MastersService); + // dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getLenderHierarchy(); diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html index db0003168..345cb06f2 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html @@ -2,7 +2,7 @@

Occupation of Non earning members                                        

-
--> +
Occupation of Non earning members
+
--> +
+

Occupation of Non earning members                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a Name. diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html index f3ec2f194..84f7056d1 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html @@ -6,11 +6,11 @@
-
+ + + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.scss b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.scss index e29cae6e3..c0d38979f 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.scss @@ -21,7 +21,7 @@ .header-cell{ display:flex; justify-content:center; - }*/ + }* .example-container { display: flex; @@ -56,4 +56,26 @@ th { text-align: left; - } \ No newline at end of file + } + +*/ +.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/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts index c1c667ce9..9daf55a5b 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts @@ -30,6 +30,14 @@ export class MembersOccupationListComponent implements OnInit { displayedColumns = ['occupation_non_earning_member_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //occupation_non_earning_member_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + // @ViewChild(MatPaginator) paginator: MatPaginator; + // @ViewChild(MatSort) sort: MatSort; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -45,7 +53,7 @@ export class MembersOccupationListComponent implements OnInit { this.getMemberOccupation(); } - dataSource = new UserDataSource(this._memberService); + //dataSource = new UserDataSource(this._memberService); addMemberOccupation() { this.isPopupOpened = true; diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-dialog/pd-allocation-type-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-dialog/pd-allocation-type-dialog.component.html index 05f46c8c2..3940035af 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-dialog/pd-allocation-type-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-dialog/pd-allocation-type-dialog.component.html @@ -2,7 +2,7 @@

PD Allocation Type                                        

-
--> +
PD Allocation Type
-
+
--> +
+

PD Allocation Type                                                 

+
+
+ +
+
+
-
+
You must include a Name. diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.html index 8db1d6b0b..66e7cf7aa 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.html @@ -6,7 +6,7 @@
-
+ +
+ + + +
+
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+
diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.scss b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.scss index 3b5b29164..18ec45b41 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -91,3 +91,25 @@ text-align: left; } + +*/ +.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/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.ts index ff9001407..5ad0b1271 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-allocation-type-list/pd-allocation-type-list.component.ts @@ -28,9 +28,15 @@ export class PdAllocationTypeListComponent implements OnInit { displayedColumns = ['pd_allocation_type_id','pd_allocation_type_name','isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } @@ -39,7 +45,7 @@ export class PdAllocationTypeListComponent implements OnInit { // return this._MastersService.getAllPDAllocationType(); // } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getPDAllocationType(); diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-dialog/pd-location-approach-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-dialog/pd-location-approach-dialog.component.html index 04bcbc70b..8108ea0ae 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-dialog/pd-location-approach-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-dialog/pd-location-approach-dialog.component.html @@ -2,7 +2,7 @@

PD Location Approach                                        

-
--> +
PD Location Approach
+
--> +
+

PD Location Approach                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a Description. diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.html b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.html index cabf987af..df1a85eb6 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.html @@ -6,7 +6,7 @@
-
+ + No Records @@ -62,6 +62,56 @@

--> + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.scss b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.scss index 3b5b29164..18ec45b41 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -91,3 +91,25 @@ text-align: left; } + +*/ +.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/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.ts index b3c8b4c52..3f7459816 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-location-approach-list/pd-location-approach-list.component.ts @@ -29,9 +29,15 @@ export class PdLocationApproachListComponent implements OnInit { displayedColumns = ['pd_allocation_type_id', 'pd_allocation_type_name', 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-type-dialog/pd-type-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd/pd-type-dialog/pd-type-dialog.component.html index fa7937d52..fff839b30 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-type-dialog/pd-type-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-type-dialog/pd-type-dialog.component.html @@ -2,7 +2,7 @@

PD TYPE                                        

-
--> +
PD type
+
--> +
+

PD type                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a type_name. diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.html index abbf22efa..53c392043 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.html @@ -6,7 +6,7 @@
-
+
+
+ + + +
+
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ diff --git a/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.scss b/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.scss index 3b5b29164..18ec45b41 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -91,3 +91,25 @@ text-align: left; } + +*/ +.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/masters/component/pd/pd-type-list/pd-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.ts index a8047e81b..54d0bf598 100644 --- a/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd/pd-type-list/pd-type-list.component.ts @@ -29,9 +29,15 @@ export class PdTypeListComponent implements OnInit { displayedColumns = ['pd_type_id', 'type_name', 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); + //displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _PDTypeService: MastersService) { } @@ -40,7 +46,7 @@ export class PdTypeListComponent implements OnInit { // return this._PDTypeService.getAllPDType(); // } - dataSource = new UserDataSource(this._PDTypeService); +// dataSource = new UserDataSource(this._PDTypeService); ngOnInit() { this.getPDType(); diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html index cc75e2f49..fe64fd52f 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html @@ -1,8 +1,8 @@ - +
Product Details
+
--> +
+

Product Details                                                 

+
+
+
+
+ @@ -20,7 +30,7 @@
-
+
You must include a Product name. @@ -28,7 +38,7 @@
-
+
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html index b30403538..cc01db53f 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html @@ -4,37 +4,53 @@

- - - +
+ + + +
-
- +
- - -
- + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} - - - - + + State Name + {{row.cityname}} - - - - + + Is Active + + done + clear + + + + + Actions + + + + - - - -
No. {{element.ID}} Name {{element.ProductName}} ProductAbbr {{element.ProductAbbr}}
+ + + + - +
+
Region
+
--> +
+

Region                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a Name. diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html index 37809dfdb..85157c375 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html @@ -6,7 +6,7 @@
-
+ + + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.scss b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.scss index 3b5b29164..18ec45b41 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -91,3 +91,25 @@ text-align: left; } + +*/ +.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/masters/component/regions/regions-list/regions-list.component.ts b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts index 5367ff932..95377ba98 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts @@ -30,9 +30,15 @@ export class RegionsListComponent implements OnInit { displayedColumns = ['region_id', 'name', 'isactive','actions']; //region_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _regionsService: MastersService) { } @@ -40,7 +46,7 @@ export class RegionsListComponent implements OnInit { // return this._regionsService.getAllregions(); // } - dataSource = new UserDataSource(this._regionsService); + //dataSource = new UserDataSource(this._regionsService); ngOnInit() { this.getregions(); diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html index 78ec48b91..3e5e20681 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html @@ -1,8 +1,8 @@ - +
Relation Ship
+
--> +
+

Relation Ship                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a Name. diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html index ff6f8dea3..faef295b1 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html @@ -6,7 +6,7 @@
-
+ + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.scss b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.scss index e5c82000e..6f15f1f03 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.scss @@ -82,7 +82,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -118,3 +118,24 @@ th { text-align: left; } +*/ +.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; +} diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts index 0be882a6d..47ff2fadd 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts @@ -41,14 +41,21 @@ export class RelationShipListComponent implements OnInit { displayedColumns = ['relationship_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //relationship_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); + // displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + ngOnInit() { this.getRelationShip(); } - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); addRelationShip() { this.isPopupOpened = true; diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html index 73baaf80b..782dd0feb 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html @@ -1,8 +1,8 @@ - +
State
+
--> +
+

State                                                 

+
+
+
+
+ @@ -20,7 +30,7 @@
-
+
{{ sd.name }} @@ -29,14 +39,14 @@
-
+
You must include a Name.
-
+
-
+
You must include a Code. diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html index c2ffaf4ac..5cc837937 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html @@ -6,7 +6,7 @@
-
+ + +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.scss b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.scss index 3b5b29164..18ec45b41 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.scss @@ -55,7 +55,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -91,3 +91,25 @@ text-align: left; } + +*/ +.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/masters/component/states/states-list/states-list.component.ts b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts index 1a9e4203f..0a264b780 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts @@ -28,9 +28,15 @@ export class StatesListComponent implements OnInit { //displayedColumns = ['states_id', 'fk_city_id', 'name', 'createdon', 'fk_createdby', 'updatedon', 'fk_updatedby', 'isactive','actions']; displayedColumns = ['state_id', 'fk_region_id','region_name', 'name', 'code', 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + constructor(private dialog: MatDialog, private _statesService: MastersService) { } @@ -39,7 +45,7 @@ export class StatesListComponent implements OnInit { // return this._statesService.getAllStates(); // } - dataSource = new UserDataSource(this._statesService); + //dataSource = new UserDataSource(this._statesService); ngOnInit() { this.getState(); diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html index bfff31848..ef4b96dc5 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html @@ -1,9 +1,9 @@ - +
Sub Product Details
+
--> +
+

Sub Product Details                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
-
+
{{ sd.name }} @@ -46,7 +56,7 @@
-
+
You must include a Sub Product name. @@ -55,7 +65,7 @@
-
+
You must include a Sub Product Abbrevation. diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html index 77d9d4cb1..7b8596d77 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html @@ -7,7 +7,7 @@
-
+
+ +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.scss b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.scss index e5c82000e..20ad983ab 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.scss @@ -82,7 +82,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -118,3 +118,25 @@ th { text-align: left; } + +*/ +.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/masters/component/sub-product/sub-product-list/sub-product-list.component.ts b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts index b994ebc7f..daae6dc67 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts @@ -39,10 +39,16 @@ export class SubProductListComponent implements OnInit { displayedColumns = ['subproduct_id','fk_product_id','product_name','name','abbr','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //subproduct_id, fk_product_id, name, abbr, createdon, fk_createdby, updatedon, fk_updatedby, isactive + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - - dataSource = new UserDataSource(this._MastersService); + + //dataSource = new UserDataSource(this._MastersService); ngOnInit() { diff --git a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html index ccc45b149..964b82d15 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html @@ -1,8 +1,8 @@ - +
Title
+
--> +
+

Title                                                 

+
+
+
+
+ @@ -21,7 +31,7 @@
-
+
You must include a Title. diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html index 7de36b7b0..be2ec794d 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html @@ -6,7 +6,7 @@
-
+
+ +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.scss b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.scss index 4c7ba0782..9992fa856 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.scss @@ -81,7 +81,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -117,3 +117,25 @@ th { text-align: left; } + +*/ +.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/masters/component/title/title-list/title-list.component.ts b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts index 5373d3eaf..b996dd2f9 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts @@ -36,10 +36,15 @@ export class TitleListComponent implements OnInit { displayedColumns = ['title_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //title_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - - dataSource = new UserDataSource(this._MastersService); + // get TitleList() { diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html index 4e6b095bd..13fe8d44d 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html @@ -13,7 +13,17 @@
Type of activity
+
--> +
+

Company                                                 

+
+
+
+
+ diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html index da8b1ad9e..d79789888 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html @@ -7,7 +7,7 @@
-
+ +
+ + + +
+
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.scss b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.scss index 49827ebf1..083f71b8e 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.scss @@ -80,7 +80,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -116,3 +116,25 @@ th { text-align: left; } + +*/ +.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/masters/component/type-of-activity/activity-list/activity-list.component.ts b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts index 2bf542b4d..9d8e711a8 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts @@ -27,13 +27,20 @@ export class ActivityListComponent implements OnInit { displayedColumns = ['type_of_activity_id', 'name', 'createdon', 'fk_createdby', 'updatedon', 'fk_updatedby', 'isactive','actions']; + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + constructor(private dialog: MatDialog, private _MastersService: MastersService) { } - dataSource = new UserDataSource(this._MastersService); + // dataSource = new UserDataSource(this._MastersService); ngOnInit() { this.getActivity(); diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html index 0fe11fc90..2e3baf30b 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html @@ -2,7 +2,7 @@

Unit of Measurement                                        

-
--> +
Unit of Measurement
+
--> +
+

Unit of Measurement                                                 

+
+
+
+
+ diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html index 01db74d5f..b14c7c940 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html @@ -7,7 +7,7 @@
-
+ +
+ + + +
+ +
+ + + + + Sl + {{i+1}} + + + + City Name + {{row.name}} + + + + State Name + {{row.cityname}} + + + + Is Active + + done + clear + + + + + Actions + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.scss b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.scss index 625557102..da099f8d4 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.scss @@ -81,7 +81,7 @@ overflow: auto; max-height: 500px; }*/ -/* Structure */ +/* Structure * .example-container { display: flex; flex-direction: column; @@ -115,4 +115,25 @@ table { th { text-align: left; +} +*/ +.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/masters/component/uom/uom-list/uom-list.component.ts b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts index 53e449b0b..626d64fb5 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts @@ -44,10 +44,17 @@ export class UomListComponent implements OnInit { displayedColumns = ['uom_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; //uom_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + userData = null; + + public dataLength: number; + public dataSource = new MatTableDataSource(); +// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + - dataSource = new UserDataSource(this._MastersService); + //dataSource = new UserDataSource(this._MastersService); addUOM() {