From 72e10b4b26143192e37fb9f982dfc81e04d81fac Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 22 Sep 2018 13:03:34 +0530 Subject: [PATCH] master changes --- ng6-seed/src/app/AwsService/aws.service.ts | 2 +- .../city/city-list/city-list.component.html | 2 +- .../city/city-list/city-list.component.ts | 38 ++++++++----- .../comments-on-locality-list.component.html | 15 ++--- .../comments-on-locality-list.component.ts | 38 ++++++++----- .../company-dialog.component.html | 26 ++++----- .../company-dialog.component.ts | 16 +++--- .../company-list/company-list.component.html | 28 ++++----- .../company-list/company-list.component.ts | 37 ++++++++---- .../customer-behaviour-list.component.html | 13 ++--- .../customer-behaviour-list.component.ts | 36 ++++++++---- .../customer-segment-list.component.html | 15 ++--- .../customer-segment-list.component.ts | 36 ++++++++---- .../designation-list.component.html | 4 +- .../designation-list.component.ts | 36 ++++++++---- .../frequency-list.component.html | 13 ++--- .../frequency-list.component.ts | 36 ++++++++---- ...ndustry_classification-list.component.html | 15 ++--- .../industry_classification-list.component.ts | 19 +++++-- .../lender-hierarchy-list.component.html | 4 +- .../lender-hierarchy-list.component.ts | 15 ++++- .../members-occupation-list.component.html | 13 ++--- .../members-occupation-list.component.ts | 17 +++++- .../pd-allocation-type-list.component.html | 4 +- .../pd-allocation-type-list.component.ts | 18 +++++- .../pd-location-approach-list.component.ts | 37 +++++++----- .../pd-type-list/pd-type-list.component.html | 4 +- .../pd/pd-type-list/pd-type-list.component.ts | 37 +++++++----- .../product-list/product-list.component.html | 28 ++++----- .../product-list/product-list.component.ts | 35 ++++++++---- .../regions-list/regions-list.component.html | 12 ++-- .../regions-list/regions-list.component.ts | 38 ++++++++----- .../relation-ship-list.component.html | 10 +--- .../relation-ship-list.component.ts | 55 +++++++++++------- .../states-list/states-list.component.html | 14 ++--- .../states-list/states-list.component.ts | 37 +++++++----- .../sub-product-list.component.html | 16 +++--- .../sub-product-list.component.ts | 57 ++++++++++++------- .../title-list/title-list.component.html | 13 ++--- .../title/title-list/title-list.component.ts | 45 +++++++++------ .../activity-list/activity-list.component.ts | 37 +++++++----- .../uom/uom-list/uom-list.component.html | 12 ++-- .../uom/uom-list/uom-list.component.ts | 54 +++++++++++------- .../service/masters/masters.service.ts | 3 +- .../src/app/settings/service/user.service.ts | 3 +- ng6-seed/src/environments/environment.ts | 3 +- 46 files changed, 622 insertions(+), 424 deletions(-) diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index 2e8ec1c6a..8bf4f6133 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -52,7 +52,7 @@ const sineedgeIdentity = environment.identityPoolId//"ap-south-1:9a551eab-97cf-4 const lenderIdentity = "ap-south-1:ca22dabc-db59-4af5-9bb8-265f7ec95907"; const vendorIdenttiy = ""; // serviceProvider -const apiurl = "http://localhost/sineedge/sparqapi/api/"; +const apiurl = environment.apiUrl; const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); @Injectable({ 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 1d6d639c5..353f13c92 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 @@ -109,7 +109,7 @@ Actions - + 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 42bfc149f..37d834b9e 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 @@ -26,19 +26,31 @@ export class CityListComponent implements OnInit { CityList: any = []; //, createdon, fk_createdby, updatedon, fk_updatedby, isactive - displayedColumns = ['city_id','name', 'fk_state_id','state_name' , 'isactive','actions']; +// 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']; + displayedColumns = ['SerialNo','CityName','Name', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllCity().subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + + } // get CityList() { // return this._MastersService.getAllCity(); @@ -47,7 +59,7 @@ export class CityListComponent implements OnInit { //dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getCity(); + //this.getCity(); } @@ -77,18 +89,18 @@ export class CityListComponent implements OnInit { } //To get data for listing - getCity() { - this.loader = true; - this._MastersService.getAllCity().subscribe(dataresult => { + //getCity() { + //this.loader = true; + // this._MastersService.getAllCity().subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.CityList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.CityList = dataresult.records; + // } + // }) - } + //} deleteCity(id: number) { var PrimaryKeyWithValue ={'city_id':id}; 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 57e785702..ed3bb97ee 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 @@ -76,16 +76,11 @@ {{i+1}} - - City Name - {{row.name}} + + Comments On Locality Name + {{row.rating}} - - State Name - {{row.cityname}} - - Is Active @@ -97,8 +92,8 @@ Actions - - + + 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 d55cb3c44..87d449c07 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 @@ -26,19 +26,31 @@ export class CommentsOnLocalityListComponent implements OnInit { loader: boolean = false; CommentsOnLocalityList: any = []; - displayedColumns = ['comments_on_locality_id','rating','isactive','actions']; + //displayedColumns = ['comments_on_locality_id','rating','isactive','actions']; userData = null; public dataLength: number; public dataSource = new MatTableDataSource(); - //displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + displayedColumns = ['SerialNo','CommentsOnLocalityName', 'IsActive','Actions']; + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('COMMENTSONLOCALITY').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get CommentsOnLocalityList() { // return this._MastersService.getAllCommentsOnLocality(); @@ -47,7 +59,7 @@ export class CommentsOnLocalityListComponent implements OnInit { // dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getCommentsOnLocality(); + //this.getCommentsOnLocality(); } @@ -77,18 +89,18 @@ export class CommentsOnLocalityListComponent implements OnInit { } //To get data for listing - getCommentsOnLocality() { - this.loader = true; - this._MastersService.getAllMasterData('COMMENTSONLOCALITY').subscribe(dataresult => { + // getCommentsOnLocality() { + // this.loader = true; + // this._MastersService.getAllMasterData('COMMENTSONLOCALITY').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.CommentsOnLocalityList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.CommentsOnLocalityList = dataresult.records; + // } + // }) - } + // } deleteCommentsOnLocality(id: number) { var PrimaryKeyWithValue ={'comments_on_locality_id':id}; 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 9acbcf32b..344853cee 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 @@ -1,4 +1,4 @@ - -
+
You must include a Name.
-
+
You must include a addressline1.
-
+
You must include a Name.
-
+
You must include a Name.
- -
+
@@ -76,7 +76,7 @@ fxLayoutAlign="center">
-
+
pincode should be in 6 digit format @@ -87,7 +87,7 @@ fxLayoutAlign="center">
-
+
{{ sd.name }} @@ -96,7 +96,7 @@ fxLayoutAlign="center">
- -
+ -
+ {{img}} +
-->
diff --git a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.ts index f793a0737..74fdfc053 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.ts @@ -44,7 +44,7 @@ export class CompanyDialogComponent implements OnInit { city: [this.data.city, Validators.compose([Validators.required])], state: [this.data.state, Validators.compose([Validators.required])], pincode: [this.data.pincode, Validators.compose([Validators.required, Validators.minLength(5), Validators.maxLength(6)])], - logo : [this.data.logo] + // logo : [this.data.logo] }); this._masterService.getAllMasterData('STATE') @@ -68,14 +68,14 @@ export class CompanyDialogComponent implements OnInit { } - onFileChange($event) { - //console.log($event.target.files[0]); + // onFileChange($event) { + // //console.log($event.target.files[0]); - //if($event.target.files[0] < 0 ){ - this.files = $event.target.files[0]; - //} - //console.log(this.files); - } + // //if($event.target.files[0] < 0 ){ + // this.files = $event.target.files[0]; + // //} + // //console.log(this.files); + // } // onSubmit() { // if (isNaN(this.data.ID)) { // this._companyService.addCompany(this._companyForm.value); 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 c0fd15667..e6c819585 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 @@ -109,29 +109,25 @@ {{i+1}} - - City Name + + Name {{row.name}} - + State Name - {{row.cityname}} + {{row.city_name}} + + + + State Name + {{row.state_name}} - - Is Active - - done - clear - - - - - Actions + + Actions - - + 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 a9adb57ee..911cea78a 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 @@ -27,7 +27,8 @@ export class CompanyListComponent implements OnInit { CompanyList: any = []; //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']; + //displayedColumns = ['company_id', 'name', 'addressline1', 'addressline2','addressline3', 'city', 'state','city_name', 'state_name', 'pincode', 'logo','action']; + displayedColumns = ['SerialNo', 'Name', 'City', 'State' , 'Action']; userData = null; @@ -41,7 +42,19 @@ export class CompanyListComponent implements OnInit { constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + + this._MastersService.getAllCompany().subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get CompanyList() { // return this._MastersService.getAllCompany(); @@ -50,7 +63,7 @@ export class CompanyListComponent implements OnInit { //dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getCompany(); + //this.getCompany(); } @@ -80,18 +93,18 @@ export class CompanyListComponent implements OnInit { } //To get data for listing - getCompany() { - this.loader = true; - this._MastersService.getAllCompany().subscribe(dataresult => { + // getCompany() { + // this.loader = true; + // this._MastersService.getAllCompany().subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.CompanyList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.CompanyList = dataresult.records; + // } + // }) - } + // } deleteCompany(id: number) { var PrimaryKeyWithValue ={'company_id':id}; 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 f023a0e38..49d7cffd2 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 @@ -75,16 +75,11 @@ {{i+1}} - + City Name - {{row.name}} + {{row.description}} - - State Name - {{row.cityname}} - - Is Active @@ -96,8 +91,8 @@ Actions - - + + 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 1c0b79bec..00b6e960c 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 @@ -26,20 +26,32 @@ export class CustomerBehaviourListComponent implements OnInit { loader: boolean = false; CustomerBehaviourList: any = []; - displayedColumns = ['customer_behaviour_id', 'description', 'isactive','actions']; + //displayedColumns = ['customer_behaviour_id', 'description', 'isactive','actions']; userData = null; public dataLength: number; public dataSource = new MatTableDataSource(); // displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; +displayedColumns = ['SerialNo','Description', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('CUSTOMERBEHAVIOUR').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get CustomerBehaviourList() { // return this._MastersService.getAllCustomerBehaviour(); @@ -48,7 +60,7 @@ export class CustomerBehaviourListComponent implements OnInit { //dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getCustomerBehaviour(); + //this.getCustomerBehaviour(); } @@ -78,18 +90,18 @@ export class CustomerBehaviourListComponent implements OnInit { } //To get data for listing - getCustomerBehaviour() { - this.loader = true; - this._MastersService.getAllMasterData('CUSTOMERBEHAVIOUR').subscribe(dataresult => { + // getCustomerBehaviour() { + // this.loader = true; + // this._MastersService.getAllMasterData('CUSTOMERBEHAVIOUR').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.CustomerBehaviourList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.CustomerBehaviourList = dataresult.records; + // } + // }) - } + // } deleteCustomerBehaviour(id: number) { var PrimaryKeyWithValue ={'customer_behaviour_id':id}; 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 802d18565..1ecf4b1bc 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 @@ -81,16 +81,11 @@ {{i+1}} - - City Name + + CustomerSegmentName {{row.name}} - - State Name - {{row.cityname}} - - Is Active @@ -100,10 +95,10 @@ - Actions + Actions - - + + 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 c82cb9db3..e32570661 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 @@ -25,20 +25,32 @@ export class CustomerSegmentListComponent implements OnInit { loader: boolean = false; CustomerSegmentList: any = []; - displayedColumns = ['customer_segment_id', 'abbr', 'name', 'isactive','actions']; +// displayedColumns = ['customer_segment_id', 'abbr', 'name', 'isactive','actions']; userData = null; public dataLength: number; public dataSource = new MatTableDataSource(); // displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; +displayedColumns = ['SerialNo','CustomerSegmentName', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('CUSTOMERSEGMENT').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get CustomerSegmentList() { // return this._MastersService.getAllCustomerSegment(); @@ -47,7 +59,7 @@ export class CustomerSegmentListComponent implements OnInit { //dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getCustomerSegment(); + // this.getCustomerSegment(); } @@ -77,18 +89,18 @@ export class CustomerSegmentListComponent implements OnInit { } //To get data for listing - getCustomerSegment() { - this.loader = true; - this._MastersService.getAllMasterData('CUSTOMERSEGMENT').subscribe(dataresult => { + // getCustomerSegment() { + // this.loader = true; + // this._MastersService.getAllMasterData('CUSTOMERSEGMENT').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.CustomerSegmentList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.CustomerSegmentList = dataresult.records; + // } + // }) - } + // } deleteCustomerSegment(id: number) { var PrimaryKeyWithValue ={'customer_segment_id':id}; 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 06204d88b..0233d611b 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 @@ -102,8 +102,8 @@ Actions - - + + 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 f2fb3aa54..9599ae221 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 @@ -26,7 +26,8 @@ export class DesignationListComponent implements OnInit { loader: boolean = false; DesignationList: any = []; - displayedColumns = ['designation_id', 'name', 'short_name','isactive','actions']; + // displayedColumns = ['designation_id', 'name', 'short_name','isactive','actions']; + displayedColumns = ['SerialNo','Designation Name', 'IsActive','Actions']; userData = null; @@ -40,7 +41,18 @@ export class DesignationListComponent implements OnInit { constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('DESIGNATION').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get DesignationList() { // return this._MastersService.getAllDesignation(); @@ -49,7 +61,7 @@ export class DesignationListComponent implements OnInit { //dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getDesignation(); + //this.getDesignation(); } @@ -79,18 +91,18 @@ export class DesignationListComponent implements OnInit { } //To get data for listing - getDesignation() { - this.loader = true; - this._MastersService.getAllMasterData('DESIGNATION').subscribe(dataresult => { + // getDesignation() { + // this.loader = true; + // this._MastersService.getAllMasterData('DESIGNATION').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.DesignationList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.DesignationList = dataresult.records; + // } + // }) - } + // } deleteDesignation(id: number) { var PrimaryKeyWithValue ={'designation_id':id}; 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 97761bf29..2d1146b84 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 @@ -90,16 +90,11 @@ {{i+1}} - + City Name {{row.name}} - - State Name - {{row.cityname}} - - Is Active @@ -109,10 +104,10 @@ - Actions + Actions - - + + 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 3c48e5932..e28b61337 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 @@ -26,20 +26,32 @@ export class FrequencyListComponent implements OnInit { loader: boolean = false; FrequencyList: any = []; - displayedColumns = ['frequency_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; + // 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']; + displayedColumns = ['SerialNo','FrequencyName', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('FREQUENCY').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get FrequencyList() { // return this._MastersService. getAllFrequency(); @@ -48,7 +60,7 @@ export class FrequencyListComponent implements OnInit { // dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getFrequency(); + //this.getFrequency(); } @@ -78,18 +90,18 @@ export class FrequencyListComponent implements OnInit { } //To get data for listing - getFrequency() { - this.loader = true; - this._MastersService.getAllMasterData('FREQUENCY').subscribe(dataresult => { + // getFrequency() { + // this.loader = true; + // this._MastersService.getAllMasterData('FREQUENCY').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.FrequencyList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.FrequencyList = dataresult.records; + // } + // }) - } + // } deleteFrequency(id: number) { var PrimaryKeyWithValue ={'frequency_id':id}; 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 69596a38c..834afb6c7 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 @@ -91,16 +91,11 @@ {{i+1}} - - City Name + + Industry Classification Name {{row.name}} - - State Name - {{row.cityname}} - - Is Active @@ -110,10 +105,10 @@ - Actions + Actions - - + + 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 faefa88d0..3e1e845e3 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 @@ -33,14 +33,14 @@ export class IndustryClassificationListComponent implements OnInit { IndustryClassificationList: any = []; - displayedColumns = ['industry_classification_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; + //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']; + displayedColumns = ['SerialNo','Industry Classification', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -48,7 +48,18 @@ export class IndustryClassificationListComponent implements OnInit { constructor(private dialog: MatDialog, - private _IMService: MastersService) { } + private _IMService: MastersService) { + this._IMService.getAllMasterData('INDUSTRYCLASSIFICATION').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get IndustryClassificationList() { // return this._IMService.getAllIndustryClassification(); @@ -59,7 +70,7 @@ export class IndustryClassificationListComponent implements OnInit { ngOnInit() { - this.getIndustryClassification(); + // this.getIndustryClassification(); } 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 215905e28..3d7c013e3 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 @@ -96,8 +96,8 @@ Actions - - + + 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 dd630e7f1..682819e6f 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 @@ -39,7 +39,18 @@ export class LenderHierarchyListComponent implements OnInit { constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('LENDERHIERARCHY').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get LenderHierarchyList() { // return this._MastersService. getAllLenderHierarchy(); @@ -48,7 +59,7 @@ export class LenderHierarchyListComponent implements OnInit { // dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getLenderHierarchy(); + // this.getLenderHierarchy(); } 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 84f7056d1..0d48cfdb4 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 @@ -95,15 +95,12 @@ {{i+1}} - - City Name + + Occupation Non Earning Member {{row.name}} - - State Name - {{row.cityname}} - + Is Active @@ -116,8 +113,8 @@ Actions - - + + 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 9daf55a5b..fb4dec5c7 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 @@ -27,7 +27,7 @@ export class MembersOccupationListComponent implements OnInit { MemberOccupationList: any = []; - displayedColumns = ['occupation_non_earning_member_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; + //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; @@ -36,14 +36,25 @@ export class MembersOccupationListComponent implements OnInit { public dataLength: number; public dataSource = new MatTableDataSource(); -// displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + displayedColumns = ['SerialNo','OccupationMember', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _memberService: MastersService) { } + private _memberService: MastersService) { + this._memberService.getAllMasterData('OCCUPATIONMEMBERS').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get MemberOccupationList() { // return this._memberService.getAllMembersOccupation(); 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 66e7cf7aa..3fdf3d85b 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 @@ -93,8 +93,8 @@ Actions - - + + 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 5ad0b1271..77577b76b 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 @@ -26,20 +26,32 @@ export class PdAllocationTypeListComponent implements OnInit { loader: boolean = false; PDAllocationTypeList: any = []; - displayedColumns = ['pd_allocation_type_id','pd_allocation_type_name','isactive','actions']; + //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']; + displayedColumns = ['SerialNo','PD Allocation Type', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('PDALLOCATIONTYPE').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + + } // get PDAllocationTypeList() { // return this._MastersService.getAllPDAllocationType(); 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 3f7459816..18473f74b 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 @@ -27,20 +27,31 @@ export class PdLocationApproachListComponent implements OnInit { loader: boolean = false; PdLocationApproachList: any = []; - displayedColumns = ['pd_allocation_type_id', 'pd_allocation_type_name', 'isactive','actions']; +// 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']; + displayedColumns = ['SerialNo','PD Location Name','IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('PDLOCATIONAPPROACH').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get PdLocationApproachList() { // return this._MastersService.getAllPdLocationApproach(); @@ -49,7 +60,7 @@ export class PdLocationApproachListComponent implements OnInit { //dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getPdLocationApproach(); + // this.getPdLocationApproach(); } @@ -79,18 +90,18 @@ export class PdLocationApproachListComponent implements OnInit { } //To get data for listing - getPdLocationApproach() { - this.loader = true; - this._MastersService.getAllMasterData('PDLOCATIONAPPROACH').subscribe(dataresult => { + // getPdLocationApproach() { + // this.loader = true; + // this._MastersService.getAllMasterData('PDLOCATIONAPPROACH').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.PdLocationApproachList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.PdLocationApproachList = dataresult.records; + // } + // }) - } + // } deletePdLocationApproach(id: number) { var PrimaryKeyWithValue ={'pd_allocation_type_id':id}; 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 53c392043..6693e88f7 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 @@ -95,8 +95,8 @@ Actions - - + + 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 54d0bf598..cf13990c6 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 @@ -27,20 +27,31 @@ export class PdTypeListComponent implements OnInit { loader: boolean = false; PDTypeList: any = []; - displayedColumns = ['pd_type_id', 'type_name', 'isactive','actions']; + //displayedColumns = ['pd_type_id', 'type_name', 'isactive','actions']; userData = null; public dataLength: number; public dataSource = new MatTableDataSource(); - //displayedColumns = ['SerialNo','BranchName','CityName', 'IsActive','Actions']; + displayedColumns = ['SerialNo','PD Type', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _PDTypeService: MastersService) { } + private _PDTypeService: MastersService) { + this._PDTypeService.getAllMasterData('PDTYPE').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // get PDTypeList() { // return this._PDTypeService.getAllPDType(); @@ -49,7 +60,7 @@ export class PdTypeListComponent implements OnInit { // dataSource = new UserDataSource(this._PDTypeService); ngOnInit() { - this.getPDType(); + //this.getPDType(); } @@ -79,18 +90,18 @@ export class PdTypeListComponent implements OnInit { } //To get data for listing - getPDType() { - this.loader = true; - this._PDTypeService.getAllMasterData('PDTYPE').subscribe(dataresult => { + // getPDType() { + // this.loader = true; + // this._PDTypeService.getAllMasterData('PDTYPE').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.PDTypeList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.PDTypeList = dataresult.records; + // } + // }) - } + // } deletePDType(id: number) { var PrimaryKeyWithValue ={'pd_type_id':id}; 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 cc01db53f..24d4ff9a1 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 @@ -19,14 +19,14 @@ {{i+1}} - - City Name + + Product Name {{row.name}} - - State Name - {{row.cityname}} + + Abbrevation + {{row.abbr}} @@ -40,8 +40,8 @@ Actions - - + + @@ -204,7 +204,7 @@
--> -
+ - No Records + + -
-
+ @@ -117,8 +112,8 @@ Actions - - + + 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 b996dd2f9..5873b5cfd 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 @@ -27,33 +27,42 @@ export class TitleListComponent implements OnInit { isPopupOpened = true; loader: boolean = false; TitleList: any = []; - - - - constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } - - displayedColumns = ['title_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; + //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']; + displayedColumns = ['SerialNo','TitleName', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + + constructor(private dialog: MatDialog, + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('TITLES').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } + // get TitleList() { // return this._MastersService.getAllTitle(); // } ngOnInit() { - this.getTitle(); + //this.getTitle(); } @@ -83,18 +92,18 @@ export class TitleListComponent implements OnInit { } //To get data for listing - getTitle() { - this.loader = true; - this._MastersService.getAllMasterData('TITLES').subscribe(dataresult => { + // getTitle() { + // this.loader = true; + // this._MastersService.getAllMasterData('TITLES').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.TitleList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.TitleList = dataresult.records; + // } + // }) - } + // } deleteTitle(id: number) { var PrimaryKeyWithValue ={'title_id':id}; 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 9d8e711a8..aa0046f2b 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 @@ -25,25 +25,36 @@ export class ActivityListComponent implements OnInit { loader: boolean = false; ActivityList: any = []; - displayedColumns = ['type_of_activity_id', 'name', 'createdon', 'fk_createdby', 'updatedon', 'fk_updatedby', 'isactive','actions']; + // 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']; + displayedColumns = ['SerialNo','ActivityName','IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('TYPEOFACTIVITY').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } // dataSource = new UserDataSource(this._MastersService); ngOnInit() { - this.getActivity(); + //this.getActivity(); } @@ -73,18 +84,18 @@ export class ActivityListComponent implements OnInit { } //To get data for listing - getActivity() { - this.loader = true; - this._MastersService.getAllMasterData('TYPEOFACTIVITY').subscribe(dataresult => { + // getActivity() { + // this.loader = true; + // this._MastersService.getAllMasterData('TYPEOFACTIVITY').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.ActivityList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.ActivityList = dataresult.records; + // } + // }) - } + // } deleteActivity(id: number) { 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 b14c7c940..acc15bbdd 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 @@ -90,15 +90,11 @@ {{i+1}} - - City Name + + UOM Name {{row.name}} - - State Name - {{row.cityname}} - Is Active @@ -111,8 +107,8 @@ Actions - - + + 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 626d64fb5..64016ac25 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 @@ -29,30 +29,42 @@ export class UomListComponent implements OnInit { isPopupOpened = true; loader: boolean = false; UOMList: any = []; - - constructor(private dialog: MatDialog, - private _MastersService: MastersService) { } - - // get UOMList() { - // return this._MastersService.getAllUom(); - // } - - ngOnInit() { - this.getUOM(); - } - - displayedColumns = ['uom_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions']; + //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']; + displayedColumns = ['SerialNo','UOMName', 'IsActive','Actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; + + constructor(private dialog: MatDialog, + private _MastersService: MastersService) { + this._MastersService.getAllMasterData('UOM').subscribe( + data => { + this.userData = data.records; + if(data.records === ''){ + this.dataLength = data.records.length; + }else{ + this.dataLength = 0} + this.dataSource.data = this.userData; + } + ) + } + + // get UOMList() { + // return this._MastersService.getAllUom(); + // } + + ngOnInit() { + //this.getUOM(); + } + + //dataSource = new UserDataSource(this._MastersService); @@ -84,15 +96,15 @@ export class UomListComponent implements OnInit { //To get data for listing getUOM() { - this.loader = true; - this._MastersService.getAllMasterData('UOM').subscribe(dataresult => { + // this.loader = true; + // this._MastersService.getAllMasterData('UOM').subscribe(dataresult => { - this.loader = false; + // this.loader = false; - if (dataresult.dataStatus  === true) { - this.UOMList = dataresult.records; - } - }) + // if (dataresult.dataStatus  === true) { + // this.UOMList = dataresult.records; + // } + // }) } diff --git a/ng6-seed/src/app/settings/service/masters/masters.service.ts b/ng6-seed/src/app/settings/service/masters/masters.service.ts index a9f771cc1..457fac286 100644 --- a/ng6-seed/src/app/settings/service/masters/masters.service.ts +++ b/ng6-seed/src/app/settings/service/masters/masters.service.ts @@ -7,6 +7,7 @@ import { of } from 'rxjs'; /** Imported Service Files Are., */ import { AwsService } from '../../../AwsService/aws.service'; +import { environment } from 'environments/environment'; /** Consant Value For Created Date And Updated Date */ @@ -24,7 +25,7 @@ export interface Master { export class MastersService { - private apiUrl = 'http://localhost/sparqapi/api/'; + private apiUrl = environment.apiUrl; constructor(private _http: HttpClient, diff --git a/ng6-seed/src/app/settings/service/user.service.ts b/ng6-seed/src/app/settings/service/user.service.ts index 4714e85ad..62cb1cd87 100644 --- a/ng6-seed/src/app/settings/service/user.service.ts +++ b/ng6-seed/src/app/settings/service/user.service.ts @@ -2,7 +2,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/internal/Observable'; import { AwsService } from '../../AwsService/aws.service'; -const apiurl = 'http://localhost/sineedge/sparqapi/api/'; +import { environment } from 'environments/environment'; +const apiurl = environment.apiUrl; const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); @Injectable({ diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 4bd1efd8b..7a2a068d0 100644 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -23,5 +23,6 @@ export const environment = { sts_endpoint: '', dynamodb_endpoint: '', s3_endpoint: '', - accessToken:'' + accessToken:'', + apiUrl:'http://localhost/sparqapi/api/' };