From 39bf3181b7173056ea8b3016be2387f5f99dd9ac Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 20 Sep 2018 14:37:24 +0530 Subject: [PATCH] masterdetail changes --- .../branch-list/branch-list.component.html | 2 +- .../city/city-list/city-list.component.html | 1 + .../comments-on-locality-list.component.html | 1 + .../company-list/company-list.component.html | 1 + .../customer-behaviour-list.component.html | 5 +- .../customer-segment-list.component.html | 1 + .../designation-list.component.html | 1 + .../entity-type-dialog.component.html | 44 ------- .../entity-type-dialog.component.scss | 3 - .../entity-type-dialog.component.spec.ts | 25 ---- .../entity-type-dialog.component.ts | 73 ------------ .../entity-type-list.component.html | 66 ----------- .../entity-type-list.component.scss | 93 --------------- .../entity-type-list.component.spec.ts | 25 ---- .../entity-type-list.component.ts | 107 ----------------- .../frequency-list.component.html | 1 + ...ndustry_classification-list.component.html | 23 ++-- .../industry_classification-list.component.ts | 3 + .../lender-hierarchy-list.component.html | 1 + .../component/masters/masters.component.html | 16 +-- .../component/masters/masters.component.ts | 16 +-- .../members-occupation-list.component.html | 1 + .../pd-allocation-type-list.component.html | 3 +- .../pd-location-approach-list.component.html | 1 + .../pd-status-dialog.component.html | 43 ------- .../pd-status-dialog.component.scss | 3 - .../pd-status-dialog.component.spec.ts | 25 ---- .../pd-status-dialog.component.ts | 66 ----------- .../pd-status-list.component.html | 61 ---------- .../pd-status-list.component.scss | 93 --------------- .../pd-status-list.component.spec.ts | 25 ---- .../pd-status-list.component.ts | 110 ------------------ .../pd-type-list/pd-type-list.component.html | 1 + .../product-list/product-list.component.html | 3 +- .../regions-list/regions-list.component.html | 5 +- .../relation-ship-list.component.html | 3 +- .../states-list/states-list.component.html | 2 +- .../sub-product-list.component.html | 2 +- .../title-list/title-list.component.html | 1 + .../activity-list.component.html | 1 + .../uom/uom-list/uom-list.component.html | 1 + .../service/master/masters.service.ts | 3 +- sineedge/src/app/settings/settings.module.ts | 12 +- 43 files changed, 63 insertions(+), 910 deletions(-) delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.html delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.scss delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.spec.ts delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.ts delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.html delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.scss delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.spec.ts delete mode 100644 sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.ts delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.html delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.scss delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.spec.ts delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.ts delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.html delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.scss delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.spec.ts delete mode 100644 sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.ts diff --git a/sineedge/src/app/settings/component/branch/branch-list/branch-list.component.html b/sineedge/src/app/settings/component/branch/branch-list/branch-list.component.html index 2cc743e..00cadd9 100644 --- a/sineedge/src/app/settings/component/branch/branch-list/branch-list.component.html +++ b/sineedge/src/app/settings/component/branch/branch-list/branch-list.component.html @@ -17,7 +17,7 @@ Isactive Action - + No Records {{i+1}} {{BL.name}} diff --git a/sineedge/src/app/settings/component/city/city-list/city-list.component.html b/sineedge/src/app/settings/component/city/city-list/city-list.component.html index 77916f1..29e5506 100644 --- a/sineedge/src/app/settings/component/city/city-list/city-list.component.html +++ b/sineedge/src/app/settings/component/city/city-list/city-list.component.html @@ -19,6 +19,7 @@ Action + No Records {{i+1}} {{CL.name}} diff --git a/sineedge/src/app/settings/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html b/sineedge/src/app/settings/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html index 6a1ac98..013d6dd 100644 --- a/sineedge/src/app/settings/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html +++ b/sineedge/src/app/settings/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html @@ -16,6 +16,7 @@ Action + No Records {{i+1}} {{CLL.comments_on_locality_id}} diff --git a/sineedge/src/app/settings/component/company/company-list/company-list.component.html b/sineedge/src/app/settings/component/company/company-list/company-list.component.html index cf50df4..09a8dfd 100644 --- a/sineedge/src/app/settings/component/company/company-list/company-list.component.html +++ b/sineedge/src/app/settings/component/company/company-list/company-list.component.html @@ -17,6 +17,7 @@ Action + No Records {{i+1}} {{CL.name}} diff --git a/sineedge/src/app/settings/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html b/sineedge/src/app/settings/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html index 6b247e9..2b7b90e 100644 --- a/sineedge/src/app/settings/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html +++ b/sineedge/src/app/settings/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html @@ -6,8 +6,8 @@
-
- +
+
@@ -16,6 +16,7 @@ + diff --git a/sineedge/src/app/settings/component/customer-segment/customer-segment-list/customer-segment-list.component.html b/sineedge/src/app/settings/component/customer-segment/customer-segment-list/customer-segment-list.component.html index 6e4c562..e0632e6 100644 --- a/sineedge/src/app/settings/component/customer-segment/customer-segment-list/customer-segment-list.component.html +++ b/sineedge/src/app/settings/component/customer-segment/customer-segment-list/customer-segment-list.component.html @@ -17,6 +17,7 @@ + diff --git a/sineedge/src/app/settings/component/designation/designation-list/designation-list.component.html b/sineedge/src/app/settings/component/designation/designation-list/designation-list.component.html index ed6e572..0845517 100644 --- a/sineedge/src/app/settings/component/designation/designation-list/designation-list.component.html +++ b/sineedge/src/app/settings/component/designation/designation-list/designation-list.component.html @@ -15,6 +15,7 @@ + diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.html b/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.html deleted file mode 100644 index c9c1a79..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.html +++ /dev/null @@ -1,44 +0,0 @@ -
-

Entity Type                                         - -

-
-
-
Branch
-
-
-
- - - - -
- - -
- - - - You must include a Name. -
- - - - -
-
- - - -
- - -
- - - \ No newline at end of file diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.scss b/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.scss deleted file mode 100644 index 3e80f0d..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -mat-form-field{ - width:100%; -} \ No newline at end of file diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.spec.ts b/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.spec.ts deleted file mode 100644 index 4eca89c..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EntityTypeDialogComponent } from './entity-type-dialog.component'; - -describe('EntityTypeDialogComponent', () => { - let component: EntityTypeDialogComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EntityTypeDialogComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EntityTypeDialogComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.ts b/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.ts deleted file mode 100644 index 7a67bdf..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-dialog/entity-type-dialog.component.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { MastersService } from '../../../service/master/masters.service'; - - -@Component({ - selector: 'app-designation-dialog', - templateUrl: './entity-type-dialog.component.html', - styleUrls: ['./entity-type-dialog.component.scss'] -}) -export class EntityTypeDialogComponent implements OnInit { - - public _entityTypeForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, - private dialogRef: MatDialogRef, - private _ETService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } - - onNoClick(): void { - this.dialogRef.close(); - } - - ngOnInit() { - - this._entityTypeForm = this._formBuilder.group({ - //Designation_id: any; fk_city_id: any; - entity_type_id: [this.data.entity_type_id], - name: [this.data.name, Validators.compose([Validators.required])] - - }); - //console.log(this._entityTypeForm); - } - - // onSubmit() { - // if (isNaN(this.data.ID)) { - // this._MastersService.addDesignation(this._entityTypeForm.value); - // this.dialogRef.close(); - // } else { - // this._MastersService.editDesignation(this._entityTypeForm.value); - // this.dialogRef.close(); - // } - // } - - onSubmit() { - if(isNaN(this.data.entity_type_id)) { - var my_array = this._entityTypeForm.value; - Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); - console.log(my_array); - this._ETService.addMasterDetails(my_array,'ENTITYTYPE').subscribe(); - //addEntityType(my_array) - this.dialogRef.close(); - alert("saved"); - } else { - this._ETService.editMasterDetails(this._entityTypeForm.value,'ENTITYTYPE').subscribe(); - this.dialogRef.close(); - alert("edited"); - } - } - - - - onReset(){ - this._entityTypeForm.reset(); - } -} - - - - - - diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.html b/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.html deleted file mode 100644 index d3a481e..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.html +++ /dev/null @@ -1,66 +0,0 @@ - -
- -
-
-
- -
-
-
# CustomerBehaviour IDAction
No Records
{{i+1}} {{CBL.customer_behaviour_id}}Action
No Records
{{i+1}} {{CSL.name}}Action
No Records
{{i+1}} {{DL.designation_id}} {{DL.name}}
- - - - - - - - - - - - - - -
#EntityType NameIsActiveAction
{{i+1}}{{EL.entity_type_id}} {{EL.name}}{{EL.isactive}} - edit - delete_outline - -
- -
- - - - - \ No newline at end of file diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.scss b/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.scss deleted file mode 100644 index 3b5b291..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.scss +++ /dev/null @@ -1,93 +0,0 @@ - -/* Structure -.example-container { - display: flex; - flex-direction: column; - min-width: 300px; -} - -.example-header { - min-height: 56px; - max-height: 56px; - display: flex; - align-items: center; - padding: 8px 24px 0; - font-size: 20px; - justify-content: space-between; - border-bottom: 1px solid transparent; -} - -.mat-input-container { - font-size: 14px; - flex-grow: 1; - margin-left: 32px; - margin-top: 8px; -} - -.example-no-results { - display: flex; - justify-content: center; - padding: 24px; - font-size: 12px; - font-style: italic; -} - -/** Selection styles -.example-selection-header { - font-size: 18px; - background: rgba(255, 64, 129, 0.3); - border-bottom: 1px solid #d696ac; -} - -.mat-column-select { - max-width: 54px; -} - -.mat-row:hover, .example-selected-row { - background: #f5f5f5; -} - -.mat-row:active, .mat-row.example-selected-row { - background: #eaeaea; -} - -.mat-table { - overflow: auto; - max-height: 500px; -}*/ -/* Structure */ -.example-container { - display: flex; - flex-direction: column; - min-width: 30px; - width : 80%; - margin : 20px auto; - } - - .example-header { - min-height: 64px; - padding: 8px 24px 0; - } - - //mat-cell{ - .cell{ - display:flex !important; - justify-content:center!important; - - } - - // mat-header-cell { - .header-cell{ - display:flex; - justify-content:center; - } - - - table { - width: 100%; - } - - th { - text-align: left; - } - diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.spec.ts b/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.spec.ts deleted file mode 100644 index 8d01d29..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EntityTypeListComponent } from './entity-type-list.component'; - -describe('EntityTypeListComponent', () => { - let component: EntityTypeListComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EntityTypeListComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EntityTypeListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.ts b/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.ts deleted file mode 100644 index 15d6a7c..0000000 --- a/sineedge/src/app/settings/component/entity-type/entity-type-list/entity-type-list.component.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; -import { MatDialog, MatDialogRef, MatDialogConfig,MatPaginator, MatSort,MatTableDataSource } from '@angular/material'; - -import { Observable, Subject } from 'rxjs'; -import { Http, Response } from '@angular/http'; -import 'rxjs/add/operator/map'; - -import { DataSource } from '@angular/cdk/collections'; -import { map } from 'rxjs/operators'; -import { of as observableOf, merge } from 'rxjs'; - - -import { MastersService } from '../../../service/master/masters.service'; -import { EntityTypeDialogComponent } from '../entity-type-dialog/entity-type-dialog.component'; -import { EntityType } from '../../../model/entity-type'; - - -@Component({ - selector: 'app-entity-type-list', - templateUrl: './entity-type-list.component.html', - styleUrls: ['./entity-type-list.component.scss'] -}) -export class EntityTypeListComponent implements OnInit { - - isPopupOpened = true; - loader: boolean = false; - EntityTypeList: any = []; - - displayedColumns = ['entity_type_id', 'name','isactive','actions']; - - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - - - constructor(private dialog: MatDialog, - private _EtService: MastersService) { } - - // get EntityTypeList() { - // return this._EtService. getAllEntityType(); - // } - - dataSource = new UserDataSource(this._EtService); - - ngOnInit() { - this.getEntityType(); - } - - - addEntityType() { - this.isPopupOpened = true; - const dialogRef = this.dialog.open(EntityTypeDialogComponent, { - data: {} - }); - - - dialogRef.afterClosed().subscribe(result => { - this.isPopupOpened = false; - }); - } - - editEntityType(arr: any) { - this.isPopupOpened = true; - //const contact = this._EtService.getAllEntityType().find(c => c.ID === id); - const dialogRef = this.dialog.open(EntityTypeDialogComponent, { - data: arr - }); - - - dialogRef.afterClosed().subscribe(result => { - this.isPopupOpened = false; - }); - } - - //To get data for listing - getEntityType() { - this.loader = true; - this._EtService.getAllMasterData('ENTITYTYPE').subscribe(dataresult => { - - this.loader = false; - - if (dataresult.status == 200) { - this.EntityTypeList = dataresult.records; - } - }) - - } - - deleteEntityType(id: number) { - //this._EtService.deleteMasterDetails('',id,'ENTITYTYPE'); - //deleteMasterDetails(id,'ENTITYTYPE'); - } -} - -export class UserDataSource extends DataSource { - //jkj - - constructor(private _ets: MastersService ) { - super(); - } - - connect(): Observable { - //return this.userService.getUser(); - //return this._ets.getAllEntityType(); - return this._ets.getAllMasterData('ENTITYTYPE'); - } - disconnect() {} -} \ No newline at end of file diff --git a/sineedge/src/app/settings/component/frequency/frequency-list/frequency-list.component.html b/sineedge/src/app/settings/component/frequency/frequency-list/frequency-list.component.html index 55414be..f3004e0 100644 --- a/sineedge/src/app/settings/component/frequency/frequency-list/frequency-list.component.html +++ b/sineedge/src/app/settings/component/frequency/frequency-list/frequency-list.component.html @@ -15,6 +15,7 @@ Action + No Records {{i+1}} {{FL.name}} diff --git a/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.html b/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.html index 3753bd1..eee7665 100644 --- a/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.html +++ b/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.html @@ -15,16 +15,19 @@ IsActive Action - - - {{i+1}} - {{IM.name}} - {{IM.isactive}} - - edit - delete_outline - - + + + No Records + + {{i+1}} + {{IM.name}} + {{IM.isactive}} + + edit + delete_outline + + + diff --git a/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.ts b/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.ts index 6c890f4..d01f62d 100644 --- a/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.ts +++ b/sineedge/src/app/settings/component/industry_classification/industry_classification-list/industry_classification-list.component.ts @@ -91,6 +91,9 @@ export class IndustryClassificationListComponent implements OnInit { if (dataresult.status == 200) { this.IndustryClassificationList = dataresult.records; } + else{ + this.IndustryClassificationList = []; + } }) } diff --git a/sineedge/src/app/settings/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html b/sineedge/src/app/settings/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html index cbb749c..9676744 100644 --- a/sineedge/src/app/settings/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html +++ b/sineedge/src/app/settings/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html @@ -15,6 +15,7 @@ Action + No Records {{i+1}} {{LHL.lender_hierarchy_id}} {{LHL.lender_hierarchy}} diff --git a/sineedge/src/app/settings/component/masters/masters.component.html b/sineedge/src/app/settings/component/masters/masters.component.html index d33c490..9395514 100644 --- a/sineedge/src/app/settings/component/masters/masters.component.html +++ b/sineedge/src/app/settings/component/masters/masters.component.html @@ -102,29 +102,23 @@
- -
-
-
+
-
+
-
+
-
+
-
+
-
- -
+
+ No Records {{i+1}} {{PAL.pd_location_approach_id}} {{PAL.description}} diff --git a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.html b/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.html deleted file mode 100644 index 5729ff1..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.html +++ /dev/null @@ -1,43 +0,0 @@ - -
-
PD Status
-
-
-
- - - -
- -
- - -
- - - You must include a PD Status Name. - - -
- -
-
- - - -
- - -
- -
- \ No newline at end of file diff --git a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.scss b/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.scss deleted file mode 100644 index 3e80f0d..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -mat-form-field{ - width:100%; -} \ No newline at end of file diff --git a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.spec.ts b/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.spec.ts deleted file mode 100644 index bd1ed0b..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PdStatusDialogComponent } from './pd-status-dialog.component'; - -describe('PdStatusDialogComponent', () => { - let component: PdStatusDialogComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PdStatusDialogComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PdStatusDialogComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.ts b/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.ts deleted file mode 100644 index ce929cb..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-dialog/pd-status-dialog.component.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { MastersService } from '../../../service/master/masters.service'; - -@Component({ - selector: 'app-jazz-dialog', - templateUrl: './pd-status-dialog.component.html', - styleUrls: ['./pd-status-dialog.component.scss'] -}) -export class PdStatusDialogComponent implements OnInit { - - public _PdStatusForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, - private dialogRef: MatDialogRef, - private _PdStatusService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } - - onNoClick(): void { - this.dialogRef.close(); - } - - ngOnInit() { - - this._PdStatusForm = this._formBuilder.group({ - - pd_status_id: [this.data.pd_status_id], - pd_status_name: [this.data.pd_status_name, Validators.compose([Validators.required])], - - }); - //console.log(this._PdStatusForm); - } - - // onSubmit() { - // if (isNaN(this.data.ID)) { - // this._PdStatusService.addPdStatus(this._PdStatusForm.value); - // this.dialogRef.close(); - // } else { - // this._PdStatusService.editPdStatus(this._PdStatusForm.value); - // this.dialogRef.close(); - // } - // } - - onSubmit() { - if(isNaN(this.data.pd_status_id)) { - var my_array = this._PdStatusForm.value; - Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); - console.log(my_array); - this._PdStatusService.addMasterDetails(my_array,'PDSTATUS').subscribe(); - this.dialogRef.close(); - alert("saved"); - } else { - - this._PdStatusService.editMasterDetails(this._PdStatusForm.value,'PDSTATUS').subscribe(); - this.dialogRef.close(); - alert("edited"); - } - } - - - - onReset(){ - this._PdStatusForm.reset(); - } -} \ No newline at end of file diff --git a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.html b/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.html deleted file mode 100644 index 291758a..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.html +++ /dev/null @@ -1,61 +0,0 @@ - -
- -
-
-
- -
-
- - - - - - - - - - - - - - - -
#PD Status NameIsactiveAction
{{i+1}}{{BL.pd_status_id}} {{BL.pd_status_name}}{{BL.isactive}} - edit - delete_outline -
-
- - - - diff --git a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.scss b/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.scss deleted file mode 100644 index 3b5b291..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.scss +++ /dev/null @@ -1,93 +0,0 @@ - -/* Structure -.example-container { - display: flex; - flex-direction: column; - min-width: 300px; -} - -.example-header { - min-height: 56px; - max-height: 56px; - display: flex; - align-items: center; - padding: 8px 24px 0; - font-size: 20px; - justify-content: space-between; - border-bottom: 1px solid transparent; -} - -.mat-input-container { - font-size: 14px; - flex-grow: 1; - margin-left: 32px; - margin-top: 8px; -} - -.example-no-results { - display: flex; - justify-content: center; - padding: 24px; - font-size: 12px; - font-style: italic; -} - -/** Selection styles -.example-selection-header { - font-size: 18px; - background: rgba(255, 64, 129, 0.3); - border-bottom: 1px solid #d696ac; -} - -.mat-column-select { - max-width: 54px; -} - -.mat-row:hover, .example-selected-row { - background: #f5f5f5; -} - -.mat-row:active, .mat-row.example-selected-row { - background: #eaeaea; -} - -.mat-table { - overflow: auto; - max-height: 500px; -}*/ -/* Structure */ -.example-container { - display: flex; - flex-direction: column; - min-width: 30px; - width : 80%; - margin : 20px auto; - } - - .example-header { - min-height: 64px; - padding: 8px 24px 0; - } - - //mat-cell{ - .cell{ - display:flex !important; - justify-content:center!important; - - } - - // mat-header-cell { - .header-cell{ - display:flex; - justify-content:center; - } - - - table { - width: 100%; - } - - th { - text-align: left; - } - diff --git a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.spec.ts b/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.spec.ts deleted file mode 100644 index 19ee525..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PdStatusListComponent } from './pd-status-list.component'; - -describe('PdStatusListComponent', () => { - let component: PdStatusListComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PdStatusListComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PdStatusListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.ts b/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.ts deleted file mode 100644 index 08e5737..0000000 --- a/sineedge/src/app/settings/component/pd/pd-status-list/pd-status-list.component.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; -import { MatDialog, MatDialogRef, MatDialogConfig,MatPaginator, MatSort,MatTableDataSource } from '@angular/material'; - -import { Observable, Subject } from 'rxjs'; -import { Http, Response } from '@angular/http'; -import 'rxjs/add/operator/map'; - -import { DataSource } from '@angular/cdk/collections'; -import { map } from 'rxjs/operators'; -import { of as observableOf, merge } from 'rxjs'; - - -import { MastersService } from '../../../service/master/masters.service'; -import { PdStatusDialogComponent } from '../pd-status-dialog/pd-status-dialog.component'; -import { PdStatus } from '../../../model/pd'; - - -@Component({ - selector: 'app-pd-status-list', - templateUrl: './pd-status-list.component.html', - styleUrls: ['./pd-status-list.component.scss'] -}) -export class PdStatusListComponent implements OnInit { - - - isPopupOpened = true; - loader: boolean = false; - PdStatusList: any = []; - - displayedColumns = ['pd_status_id', 'pd_status_name','isactive','actions']; - - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - - - constructor(private dialog: MatDialog, - private _PdStatusService: MastersService) { } - - // get PdStatusList() { - // return this._PdStatusService.getAllPdStatus(); - // } - - dataSource = new UserDataSource(this._PdStatusService); - - ngOnInit() { - this.getPdStatus(); - } - - - addPdStatus() { - this.isPopupOpened = true; - const dialogRef = this.dialog.open(PdStatusDialogComponent, { - data: {} - }); - - - dialogRef.afterClosed().subscribe(result => { - this.isPopupOpened = false; - }); - } - - editPdStatus(arr: any[]) { - this.isPopupOpened = true; - //const contact = this._PdStatusService.getAllPdStatus().find(c => c.ID === id); - const dialogRef = this.dialog.open(PdStatusDialogComponent, { - data: arr - }); - - - dialogRef.afterClosed().subscribe(result => { - this.isPopupOpened = false; - }); - } - - //To get data for listing - getPdStatus() { - this.loader = true; - this._PdStatusService.getAllMasterData('PDSTATUS').subscribe(dataresult => { - - this.loader = false; - - if (dataresult.status == 200) { - this.PdStatusList = dataresult.records; - } - }) - - } - - deletePdStatus(id: number) { - var PrimaryKeyWithValue ={'pd_status_id':id}; - this._PdStatusService.deleteMasterDetails(PrimaryKeyWithValue,'PDSTATUS'); - } -} - -export class UserDataSource extends DataSource { - - - constructor(private _bs: MastersService) { - super(); - } - - connect(): Observable { - //return this.userService.getUser(); - //return this._bs.getAllPDStatus(); - return this._bs.getAllMasterData('PDSTATUS'); - } - disconnect() {} -} - - diff --git a/sineedge/src/app/settings/component/pd/pd-type-list/pd-type-list.component.html b/sineedge/src/app/settings/component/pd/pd-type-list/pd-type-list.component.html index 9d0aeaa..501c6e4 100644 --- a/sineedge/src/app/settings/component/pd/pd-type-list/pd-type-list.component.html +++ b/sineedge/src/app/settings/component/pd/pd-type-list/pd-type-list.component.html @@ -15,6 +15,7 @@ Action + No Records {{i+1}} {{BL.pd_type_id}} {{BL.type_name}} diff --git a/sineedge/src/app/settings/component/product/product-list/product-list.component.html b/sineedge/src/app/settings/component/product/product-list/product-list.component.html index a74256f..b304035 100644 --- a/sineedge/src/app/settings/component/product/product-list/product-list.component.html +++ b/sineedge/src/app/settings/component/product/product-list/product-list.component.html @@ -211,6 +211,7 @@ --> + No Records {{i+1}} @@ -221,7 +222,7 @@ edit - delete_outline + delete_outline diff --git a/sineedge/src/app/settings/component/regions/regions-list/regions-list.component.html b/sineedge/src/app/settings/component/regions/regions-list/regions-list.component.html index 55a26fa..37809df 100644 --- a/sineedge/src/app/settings/component/regions/regions-list/regions-list.component.html +++ b/sineedge/src/app/settings/component/regions/regions-list/regions-list.component.html @@ -15,14 +15,15 @@ Action - + No Records + {{i+1}} {{RL.name}} {{RL.isactive}} edit delete_outline - + diff --git a/sineedge/src/app/settings/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/sineedge/src/app/settings/component/relation-ship/relation-ship-list/relation-ship-list.component.html index d5a4838..ff6f8de 100644 --- a/sineedge/src/app/settings/component/relation-ship/relation-ship-list/relation-ship-list.component.html +++ b/sineedge/src/app/settings/component/relation-ship/relation-ship-list/relation-ship-list.component.html @@ -16,7 +16,8 @@ Action - + No Records + {{i+1}} {{RL.name}} diff --git a/sineedge/src/app/settings/component/states/states-list/states-list.component.html b/sineedge/src/app/settings/component/states/states-list/states-list.component.html index b62bd8b..c2ffaf4 100644 --- a/sineedge/src/app/settings/component/states/states-list/states-list.component.html +++ b/sineedge/src/app/settings/component/states/states-list/states-list.component.html @@ -15,7 +15,7 @@ Isactive Action - + No Records {{i+1}} {{SL.name}} diff --git a/sineedge/src/app/settings/component/sub-product/sub-product-list/sub-product-list.component.html b/sineedge/src/app/settings/component/sub-product/sub-product-list/sub-product-list.component.html index d93d013..6f051cf 100644 --- a/sineedge/src/app/settings/component/sub-product/sub-product-list/sub-product-list.component.html +++ b/sineedge/src/app/settings/component/sub-product/sub-product-list/sub-product-list.component.html @@ -17,7 +17,7 @@ Isactive Action - + No Records {{i+1}} {{SPM.product_name}} diff --git a/sineedge/src/app/settings/component/title/title-list/title-list.component.html b/sineedge/src/app/settings/component/title/title-list/title-list.component.html index faeaafd..2046998 100644 --- a/sineedge/src/app/settings/component/title/title-list/title-list.component.html +++ b/sineedge/src/app/settings/component/title/title-list/title-list.component.html @@ -16,6 +16,7 @@ Action + No Records {{i+1}} {{TL.name}} diff --git a/sineedge/src/app/settings/component/type-of-activity/activity-list/activity-list.component.html b/sineedge/src/app/settings/component/type-of-activity/activity-list/activity-list.component.html index 63f146b..da8b1ad 100644 --- a/sineedge/src/app/settings/component/type-of-activity/activity-list/activity-list.component.html +++ b/sineedge/src/app/settings/component/type-of-activity/activity-list/activity-list.component.html @@ -16,6 +16,7 @@ Action + No Records {{i+1}} {{AL.name}} diff --git a/sineedge/src/app/settings/component/uom/uom-list/uom-list.component.html b/sineedge/src/app/settings/component/uom/uom-list/uom-list.component.html index d8eee70..01db74d 100644 --- a/sineedge/src/app/settings/component/uom/uom-list/uom-list.component.html +++ b/sineedge/src/app/settings/component/uom/uom-list/uom-list.component.html @@ -16,6 +16,7 @@ Action + No Records {{i+1}} {{UL.name}} diff --git a/sineedge/src/app/settings/service/master/masters.service.ts b/sineedge/src/app/settings/service/master/masters.service.ts index 9b95951..a115490 100644 --- a/sineedge/src/app/settings/service/master/masters.service.ts +++ b/sineedge/src/app/settings/service/master/masters.service.ts @@ -181,7 +181,8 @@ getAllMasterData(TableName:string): Observable { } private handleError(operation = 'operation', result?: T) { - alert(); + //alert(); + console.log('handleError'); return (error: any): Observable => { return of(result as T); }; diff --git a/sineedge/src/app/settings/settings.module.ts b/sineedge/src/app/settings/settings.module.ts index 9f2518e..9948af0 100755 --- a/sineedge/src/app/settings/settings.module.ts +++ b/sineedge/src/app/settings/settings.module.ts @@ -53,7 +53,7 @@ import { CommentsOnLocalityListComponent } from './component/comments-on-localit import { PdAllocationTypeListComponent } from './component/pd/pd-allocation-type-list/pd-allocation-type-list.component'; import { PdLocationApproachListComponent } from './component/pd/pd-location-approach-list/pd-location-approach-list.component'; import { PdTypeListComponent } from './component/pd/pd-type-list/pd-type-list.component'; -import { PdStatusListComponent } from './component/pd/pd-status-list/pd-status-list.component'; +// import { PdStatusListComponent } from './component/pd/pd-status-list/pd-status-list.component'; import { LenderHierarchyListComponent } from './component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component'; /** Master Child Component - For Dialogboxes*/ @@ -70,7 +70,7 @@ import { FrequencyDialogComponent } from './component/frequency/frequency-dialog import { PdTypeDialogComponent } from './component/pd/pd-type-dialog/pd-type-dialog.component'; import { PdLocationApproachDialogComponent } from './component/pd/pd-location-approach-dialog/pd-location-approach-dialog.component'; import { PdAllocationTypeDialogComponent } from './component/pd/pd-allocation-type-dialog/pd-allocation-type-dialog.component'; -import { PdStatusDialogComponent } from './component/pd/pd-status-dialog/pd-status-dialog.component'; +//import { PdStatusDialogComponent } from './component/pd/pd-status-dialog/pd-status-dialog.component'; import { LenderHierarchyDialogComponent } from './component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component'; import { CommentsOnLocalityDialogComponent } from './component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component'; import { DesignationDialogComponent } from './component/designation/designation-dialog/designation-dialog.component'; @@ -136,7 +136,7 @@ import { MastersService } from './service/master/masters.service'; CommentsOnLocalityListComponent, PdAllocationTypeListComponent, PdLocationApproachListComponent, - PdStatusListComponent, + // PdStatusListComponent, PdTypeListComponent, LenderHierarchyListComponent, ProductDialogComponent, @@ -152,7 +152,7 @@ import { MastersService } from './service/master/masters.service'; PdTypeDialogComponent, PdLocationApproachDialogComponent, PdAllocationTypeDialogComponent, - PdStatusDialogComponent, + // PdStatusDialogComponent, // //EntityTypeDialogComponent, LenderHierarchyDialogComponent, CommentsOnLocalityDialogComponent, @@ -180,8 +180,8 @@ entryComponents: [ PdTypeDialogComponent, PdLocationApproachDialogComponent, PdAllocationTypeDialogComponent, - PdStatusDialogComponent, - //EntityTypeDialogComponent, + // PdStatusDialogComponent, + // EntityTypeDialogComponent, LenderHierarchyDialogComponent, CommentsOnLocalityDialogComponent, DesignationDialogComponent,