From 2ab01dcbed586004e1b1a1076030f9d331e67682 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 10 Oct 2018 10:46:51 +0530 Subject: [PATCH] pd team master new menu creation : ps --- .../company-details.module.spec.ts | 13 ++ .../company-details/company-details.module.ts | 10 ++ .../company-details.routing.ts | 12 ++ .../branch-list/branch-list.component.html | 119 ++++++------- .../city/city-list/city-list.component.html | 11 +- .../comments-on-locality-list.component.html | 12 +- .../pd-notification-list.component.html | 2 +- .../pd-notification-list.component.ts | 14 +- .../pd-team-list/pd-team-list.component.html | 149 ----------------- .../pd-team-list/pd-team-list.component.ts | 156 ------------------ .../uom/uom-list/uom-list.component.html | 90 +--------- .../settings/masters/masters.component.html | 2 +- .../app/settings/masters/masters.module.ts | 7 +- .../pd-team-add/pd-team-add.component.html | 70 ++++++++ .../pd-team-add/pd-team-add.component.scss | 0 .../pd-team-add/pd-team-add.component.spec.ts | 25 +++ .../pd-team-add/pd-team-add.component.ts | 147 +++++++++++++++++ .../pd-team-dialog.component.html | 24 ++- .../pd-team-dialog.component.scss | 0 .../pd-team-dialog.component.spec.ts | 0 .../pd-team-dialog.component.ts | 28 +++- .../pd-team-edit/pd-team-edit.component.html | 3 + .../pd-team-edit/pd-team-edit.component.scss | 0 .../pd-team-edit.component.spec.ts | 25 +++ .../pd-team-edit/pd-team-edit.component.ts | 15 ++ .../pd-team-list/pd-team-list.component.html | 85 ++++++++++ .../pd-team-list/pd-team-list.component.scss | 36 +--- .../pd-team-list.component.spec.ts | 0 .../pd-team-list/pd-team-list.component.ts | 104 ++++++++++++ .../settings/pd-team/pd-team.module.spec.ts | 13 ++ .../app/settings/pd-team/pd-team.module.ts | 111 +++++++++++++ .../app/settings/pd-team/pd-team.routing.ts | 21 +++ .../service/masters/masters.service.ts | 1 + .../service/masters/pd-team.service.ts | 17 +- ng6-seed/src/app/settings/settings.module.ts | 7 +- ng6-seed/src/app/settings/settings.routing.ts | 9 +- .../src/app/shared/menu-items/menu-items.ts | 1 + 37 files changed, 800 insertions(+), 539 deletions(-) create mode 100644 ng6-seed/src/app/settings/company-details/company-details.module.spec.ts create mode 100644 ng6-seed/src/app/settings/company-details/company-details.module.ts create mode 100755 ng6-seed/src/app/settings/company-details/company-details.routing.ts delete mode 100644 ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html delete mode 100644 ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.scss create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.spec.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts rename ng6-seed/src/app/settings/{masters/component => }/pd-team/pd-team-dialog/pd-team-dialog.component.html (92%) rename ng6-seed/src/app/settings/{masters/component => }/pd-team/pd-team-dialog/pd-team-dialog.component.scss (100%) rename ng6-seed/src/app/settings/{masters/component => }/pd-team/pd-team-dialog/pd-team-dialog.component.spec.ts (100%) rename ng6-seed/src/app/settings/{masters/component => }/pd-team/pd-team-dialog/pd-team-dialog.component.ts (93%) create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.scss create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.spec.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html rename ng6-seed/src/app/settings/{masters/component => }/pd-team/pd-team-list/pd-team-list.component.scss (62%) rename ng6-seed/src/app/settings/{masters/component => }/pd-team/pd-team-list/pd-team-list.component.spec.ts (100%) create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team.module.spec.ts create mode 100644 ng6-seed/src/app/settings/pd-team/pd-team.module.ts create mode 100755 ng6-seed/src/app/settings/pd-team/pd-team.routing.ts diff --git a/ng6-seed/src/app/settings/company-details/company-details.module.spec.ts b/ng6-seed/src/app/settings/company-details/company-details.module.spec.ts new file mode 100644 index 000000000..db014c808 --- /dev/null +++ b/ng6-seed/src/app/settings/company-details/company-details.module.spec.ts @@ -0,0 +1,13 @@ +import { CompanyDetailsModule } from './company-details.module'; + +describe('CompanyDetailsModule', () => { + let companyDetailsModule: CompanyDetailsModule; + + beforeEach(() => { + companyDetailsModule = new CompanyDetailsModule(); + }); + + it('should create an instance', () => { + expect(companyDetailsModule).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/settings/company-details/company-details.module.ts b/ng6-seed/src/app/settings/company-details/company-details.module.ts new file mode 100644 index 000000000..1c7bfd8aa --- /dev/null +++ b/ng6-seed/src/app/settings/company-details/company-details.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +@NgModule({ + imports: [ + CommonModule + ], + declarations: [] +}) +export class CompanyDetailsModule { } diff --git a/ng6-seed/src/app/settings/company-details/company-details.routing.ts b/ng6-seed/src/app/settings/company-details/company-details.routing.ts new file mode 100755 index 000000000..acac68aca --- /dev/null +++ b/ng6-seed/src/app/settings/company-details/company-details.routing.ts @@ -0,0 +1,12 @@ +import { Routes } from '@angular/router'; +//import { MastersComponent } from './masters.component'; + + +export const CompanyDetailsRoutes: Routes = [ +{ + + //path: '', + //component: PdTeamListComponent + //component: IndustryMasterListComponent + +}]; diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html index 07d63f9c1..41aef2ea3 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html @@ -1,79 +1,80 @@ -
+
-
-
- - - -
-
- -
-
+
+
+ + + +
+ +
+ +
+
- - - - Sl - {{row.serialno}} - + + + + Sl + {{row.serialno}} + - - Branch Name - {{row.name}} - + + Branch Name + {{row.name}} + - - City Name - {{row.city_name}} - + + City Name + {{row.city_name}} + - - Actions - - - - - + + Actions + + + + + - - Is Active - - - - - - + + Is Active + + + + + + - - + + - - - - - - + + + + + +
- + \ No newline at end of file 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 1653f558a..3d4975b76 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 @@ -69,7 +69,7 @@
--> -
+
-
+
+
@@ -91,7 +92,7 @@ - + Sl @@ -160,11 +161,11 @@ - +
- + \ No newline at end of file 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 55a916d08..2b024c19c 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 @@ -63,18 +63,19 @@
--> -
+
-
+
+
@@ -85,7 +86,7 @@ - + Sl @@ -139,9 +140,8 @@ - +
- - + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html index b30935485..0f5bbdbe5 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html @@ -27,7 +27,7 @@ Sl - {{i+1}} + {{row.serialno}} diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts index 5cca5ffec..11be83104 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts @@ -128,12 +128,12 @@ export class PdNotificationListComponent implements OnInit { }); //console.log(this.notificationData); this.dataLength = data.records.length; - // if(data.records.length >= 1){ - // this.notificationData = this.notificationData.map((val, i)=>{ - // val['serialno'] = i + 1; - // return val; - // }) - // } + if(data.records.length >= 1){ + this.notificationData = this.notificationData.map((val, i)=>{ + val['serialno'] = i + 1; + return val; + }) + } this.dataSource.data = this.notificationData; }else{ this.noRecordFound = true; @@ -193,7 +193,7 @@ SaveData(dataSource){ dataresult => { if(dataresult.dataStatus == true){ //alert('Updated Successfully !'); - this.getPdNotification(); + //this.getPdNotification(); this.notifier.notify('success', 'Record Updated Successfully.!'); }else{ diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html deleted file mode 100644 index cbef78bdc..000000000 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.html +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - - -
-
- -
-
- - - - - - - Sl - {{row.serialno}} - - - - PD Team Name - {{row.team_name}} - - - - - - Is Active - - - - - - - - - - - - Actions - - - - - - - - - - - - - -
- - - - \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts deleted file mode 100644 index 98a1e9063..000000000 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts +++ /dev/null @@ -1,156 +0,0 @@ -import { Component, - OnInit, - ViewChild } from '@angular/core'; - -import { MatDialog, - MatDialogRef, - MatDialogConfig, - MatPaginator, - MatSort, -MatTableDataSource } from '@angular/material'; -/** Service */ -import { MastersService } from '../../../../service/masters/masters.service'; -import { PdTeamService } from '../../../../service/masters/pd-team.service'; -import { NotifierService } from 'angular-notifier'; - -/** Dialog Component */ -import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component'; - - -@Component({ - selector: 'app-pd-team-list', - templateUrl: './pd-team-list.component.html', - styleUrls: ['./pd-team-list.component.scss'] -}) -export class PdTeamListComponent implements OnInit { - - //Variable Declaration part - isPopupOpened: boolean = true; - loader: boolean = false; - PdTeamList: any = []; - color = 'primary'; - userData = null; - noRecordFound: boolean = false; - private notifier: NotifierService; - - - public dataLength: number; - public dataSource = new MatTableDataSource(); - displayedColumns = ['serialno','team_name','actions', 'isactive']; - - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - - constructor(private dialog: MatDialog, notifier: NotifierService, - private _MasterService: MastersService, - private _PdTeamService: PdTeamService) { - this.getPdTeam(); - this.notifier = notifier; - } - - ngOnInit() {} - - //To open dialog for add the data - addPdTeam() { - this.isPopupOpened = true; - const dialogRef = this.dialog.open(PdTeamDialogComponent, { - data: {} - }); - - dialogRef.afterClosed().subscribe(result => { - this.getPdTeam(); - this.isPopupOpened = false; - }); - } - - //To open dialog for edit the data - editPdTeam(arr: any[]) { - // let a:any; - // if(arr.length !=0){ - // a = arr; - // }else{ - // a =''; - // } - // console.log(a); - this.isPopupOpened = true; - const dialogRef = this.dialog.open(PdTeamDialogComponent, { - - data: arr - }); - - dialogRef.afterClosed().subscribe(result => { - this.getPdTeam(); - this.isPopupOpened = false; - }); - } - - //To get data for listing - getPdTeam() { - - //this.loader = true; - this._PdTeamService.getAllPdTeamList().subscribe( - //this._MasterService.getAllMasterData('PDTEAM').subscribe( - data => { - if(data.dataStatus == true){ - //this.loader = false; - this.noRecordFound = false; - this.userData = data.records; - this.dataLength = data.records.length; - if(data.records.length >= 1){ - this.userData = this.userData.map((val, i)=>{ - val['serialno'] = i + 1; - return val; - }) - } - this.dataSource.data = this.userData; - }else{ - this.noRecordFound = true; - this.dataLength = 0 - } - }) -} - - //To inactive the data - deletePdTeam(id: number) { - var PrimaryKeyWithValue ={'pdteam_id':id}; - this._MasterService.deleteMasterDetails(PrimaryKeyWithValue,'PDTEAM') - .subscribe( data => { }); - this.getPdTeam(); - - } - - /** For Changing Active States., which means both Changing Active And Inactive alternatively */ - isactivePdTeam(id: number,isactive : number) { - - let ActiveDatas = isactive == 0 - ? { 'pdteam_id':id,'isactive': '1'} - : { 'pdteam_id':id,'isactive': '0'} - - this._MasterService.editMasterDetails(ActiveDatas,'PDTEAM') - .subscribe(dataresult=>{ - if (dataresult.dataStatus == true){ - //alert("my check"); - this.getPdTeam(); - } - else{ - //alert("SomeThing Wents Wrong Try Again !"); - this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); - } - }); -} - -/** For Display Tables Pagination And Sorting */ -ngAfterViewInit() { - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; -} - -/** For Display Tables Filtering */ -applyFilter(filterValue: string) { - filterValue = filterValue.trim(); // Remove whitespace - filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches - this.dataSource.filter = filterValue; -} - -} -/** End of ListComponent */ \ No newline at end of file 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 e51108937..7846b4bba 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 @@ -1,94 +1,18 @@ - - - - - - -
+ +
-
+
+
@@ -97,7 +21,7 @@ - + Sl @@ -146,9 +70,9 @@ - +
- + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/masters.component.html b/ng6-seed/src/app/settings/masters/masters.component.html index 633362bec..d4432748c 100644 --- a/ng6-seed/src/app/settings/masters/masters.component.html +++ b/ng6-seed/src/app/settings/masters/masters.component.html @@ -93,7 +93,7 @@ - +
diff --git a/ng6-seed/src/app/settings/masters/masters.module.ts b/ng6-seed/src/app/settings/masters/masters.module.ts index b4ae6b935..3690e9add 100644 --- a/ng6-seed/src/app/settings/masters/masters.module.ts +++ b/ng6-seed/src/app/settings/masters/masters.module.ts @@ -55,7 +55,7 @@ import { PdLocationApproachListComponent } from './component/pd-location-approac import { PdTypeListComponent } from './component/pd-type/pd-type-list/pd-type-list.component'; import { LenderHierarchyListComponent } from './component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component'; import { QuestionCategoryListComponent } from './component/question-category/question-category-list/question-category-list.component'; -import { PdTeamDialogComponent } from './component/pd-team/pd-team-dialog/pd-team-dialog.component'; +//import { PdTeamDialogComponent } from './component/pd-team/pd-team-dialog/pd-team-dialog.component'; /** Master Child Component - For Dialogboxes*/ @@ -82,7 +82,7 @@ import { CityDialogComponent } from './component/city/city-dialog/city-dialog.co import { RegionsDialogComponent } from './component/regions/regions-dialog/regions-dialog.component'; import { QuestionCategoryDialogComponent } from './component/question-category/question-category-dialog/question-category-dialog.component'; import { PdNotificationListComponent } from './component/pd-notification/pd-notification-list.component'; -import { PdTeamListComponent } from './component/pd-team/pd-team-list/pd-team-list.component'; +//import { PdTeamListComponent } from './component/pd-team/pd-team-list/pd-team-list.component'; /** Master Routes */ @@ -208,8 +208,6 @@ const customNotifierOptions: NotifierOptions = { CompanyDialogComponent, CityDialogComponent, RegionsDialogComponent, - PdTeamDialogComponent, - PdTeamListComponent, QuestionCategoryDialogComponent, QuestionCategoryListComponent ], @@ -238,7 +236,6 @@ const customNotifierOptions: NotifierOptions = { CompanyDialogComponent, CityDialogComponent, RegionsDialogComponent, - PdTeamDialogComponent, QuestionCategoryDialogComponent ], diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html new file mode 100644 index 000000000..7d3a80b2c --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html @@ -0,0 +1,70 @@ +
+
+ +
+

PD TEAM

+
+
+ +
+
+ +
Team Details

+
+ + + You must Include Team Name. + + + + + {{ ld.short_name }} {{ ld.full_name }} + + You must Select Lender Name. + +
+ +
Cities Coverd

+
+ + + {{ cd.name }} + + You must Select Cities. + + + +
+ +
Products

+
+ + + {{ pd.name }} + + You must Select Product. + +
+ +
Customers Segment

+
+ + + + {{csd.name}} + + You must Select Customer Segment. + +
+ +
+ + +
+ +
+
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.scss b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.spec.ts b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.spec.ts new file mode 100644 index 000000000..782f6d074 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PdTeamAddComponent } from './pd-team-add.component'; + +describe('PdTeamAddComponent', () => { + let component: PdTeamAddComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PdTeamAddComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PdTeamAddComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts new file mode 100644 index 000000000..c2f3c43fc --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts @@ -0,0 +1,147 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { FormBuilder, + FormGroup, + Validators, + FormControl } from '@angular/forms'; + import { MatDialog, + MatDialogRef, + MAT_DIALOG_DATA } from '@angular/material'; + /** Service */ + import { MastersService } from '../../service/masters/masters.service'; + import { PdTeamService } from '../../service/masters/pd-team.service'; + import { NotifierService } from 'angular-notifier'; +import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-pd-team-add', + templateUrl: './pd-team-add.component.html', + styleUrls: ['./pd-team-add.component.scss'] +}) +export class PdTeamAddComponent implements OnInit { + +public _pdTeamForm: FormGroup; +public submitted = false; + +citydatas: any[]; +lenderdatas: any[]; +productdatas: any[]; +customerSegmentdatas: any[]; + +pdTeamCityArray: Array<{teamid: number, cityid: number}> = []; +pdTeamProductArray: Array<{teamid: number, productid: number}> = []; +pdTeamCustomerSegmentArray: Array<{teamid: number, customerid: number}> = []; + +color = 'primary'; +errorMessage:string; + +constructor(private _formBuilder: FormBuilder, + private _notifier: NotifierService, + private _pdTeamService: PdTeamService, + private _router: Router, + private _masterService: MastersService) + { + this._notifier = _notifier; + } + + +ngOnInit() { +this.PdTeamFormDatas(); + +/** To Display The City Data For City DropDown */ +this._masterService.getAllMasterData('CITY').subscribe( + dataresult => { + if (dataresult.status == 200) { + this.citydatas = dataresult.records; + this.citydatas = this.citydatas.filter(city=>city.isactive == 1 ); + } + + }, error => this.errorMessage = error); + +/** To Display The Entities Data For Entities DropDown */ +this._masterService.getAllMasterData('ENTITY').subscribe( + dataresult => { + if (dataresult.status == 200) { + this.lenderdatas = dataresult.records; + this.lenderdatas = this.lenderdatas.filter(entity=>entity.isactive == 1 ); + } + }, error => this.errorMessage = error); + +/** To Display The Entities Data For Entities DropDown */ +this._masterService.getAllMasterData('PRODUCTS').subscribe( + dataresult => { + if (dataresult.status == 200) { + this.productdatas = dataresult.records; + this.productdatas = this.productdatas.filter(product=>product.isactive == 1 ); + } + }, error => this.errorMessage = error); + +/** To Display The Entities Data For Entities DropDown */ +this._masterService.getAllMasterData('CUSTOMERSEGMENT').subscribe( + dataresult => { + if (dataresult.status == 200) { + this.customerSegmentdatas = dataresult.records; + this.customerSegmentdatas = this.customerSegmentdatas.filter(segment=>segment.isactive == 1 ); + } + }, error => this.errorMessage = error); +} + +/** Pd Team Form Datas */ +PdTeamFormDatas(){ +this._pdTeamForm = this._formBuilder.group({ + pdteam_id: [null, Validators.compose([Validators.required])], + team_name: [null, Validators.compose([Validators.required])], + fk_lender: [null, Validators.compose([Validators.required])], + fk_city: [null, Validators.compose([Validators.required])], + fk_customer_segment: [null, Validators.compose([Validators.required])], + fk_product:[null, Validators.compose([Validators.required])], + +}); + +} + +/** convenience getter for easy access to form fields */ +get f() { return this._pdTeamForm.controls; } + +/** For Popup Close Button */ +onNoClick(): void { + this._router.navigate(['/setting/pdteam/pdteamlist']); +} + +/** To Save/Edited Popup Data */ +onSubmit() { + this.submitted = true; + alert("onsubmit function"); + console.log(this._pdTeamForm.value); + + var pdTeamFormValues = this._pdTeamForm.value; + + Object.keys(pdTeamFormValues).forEach( + (key) => ( pdTeamFormValues[key] == null) && delete pdTeamFormValues[key]); + + this._pdTeamService.addPdTeamDetail(this._pdTeamForm.value).subscribe( + dataresult=>{ + + if(dataresult.dataStatus == true){ + alert('Saved'); + } + else{ + alert('Not Saved'); + } + + }); + +} + +/** To Reset Popup Data For Add*/ + +onResetForAdd(){ +alert("reset function"); +} +toggleAllSelection($event){ + console.log($event); + let srcarray = $event['source'] + console.log(srcarray._mostRecentViewValue); +} +} +/** End Of Pd Dialog Component */ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.html similarity index 92% rename from ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html rename to ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.html index 5ffd4161b..b1a63ac70 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.html @@ -36,14 +36,13 @@ You must Pick Up the City Name.
- -
+ - + - + @@ -53,26 +52,22 @@ + - + - - + + -
S.noS.no Lender Name City NameActionAction
{{i+PDTeamMaplen+1}}{{PM.lenderid.full_name}} {{PM.cityid.name}}
- - -
- -
+

@@ -87,4 +82,5 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.scss b/ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.scss similarity index 100% rename from ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.scss rename to ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.scss diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.spec.ts b/ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.spec.ts similarity index 100% rename from ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.spec.ts rename to ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.spec.ts diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.ts similarity index 93% rename from ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts rename to ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.ts index ab11dd8a8..6a01db192 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.ts @@ -9,8 +9,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ -import { MastersService } from '../../../../service/masters/masters.service'; -import { PdTeamService } from '../../../../service/masters/pd-team.service'; +import { MastersService } from '../../service/masters/masters.service'; +import { PdTeamService } from '../../service/masters/pd-team.service'; import { NotifierService } from 'angular-notifier'; @Component({ @@ -115,10 +115,13 @@ isactivePDTeamChild(id: number,isactive : number) { this._masterService.editMasterDetails(ActiveDatas,'PDTEAMMAP') .subscribe(dataresult=>{ if (dataresult.dataStatus == true){ - alert("Successfully InActive !"); + //alert("Successfully InActive !"); + this.notifier.notify('success', 'Record Successfully InActive.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'Sorry Try Again !'); } }); } @@ -171,7 +174,8 @@ if((this._pdTeamForm.controls['fk_city_id'].value.city_id != '') (item.lenderid['entity_id'] == this._pdTeamForm.controls['fk_lender_id'].value.entity_id)) { check++; - alert('Already Exists'); + //alert(''); + this.notifier.notify('info', 'Already Exists.!'); } }); @@ -183,7 +187,9 @@ if((this._pdTeamForm.controls['fk_city_id'].value.city_id != '') (item.fk_lender_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id)) { check++; - alert('Already Exists on Other Team "'+item.team_name+'"'); + //this.notifier.notify('success', 'Already Exists.!'); + //alert('Already Exists on Other Team "'+item.team_name+'"'); + this.notifier.notify( 'info', 'Already Exists on Other Team'+item.team_name ); } } }); @@ -198,7 +204,9 @@ if((this._pdTeamForm.controls['fk_city_id'].value.city_id != '') (item.fk_lender_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id)) { check++; - alert('Already Exists'); + //alert('Already Exists'); + this.notifier.notify( 'info', 'Already Exists'); + } }); } @@ -256,6 +264,7 @@ if(isNaN(this.data.pdteam_id)) { //console.log(pdTeamFormValues); //To Remove The "Null" With Key Object.keys(pdTeamFormValues).forEach( + //getAllPdTeam(); (key) => ( pdTeamFormValues[key] == null) && delete pdTeamFormValues[key] && delete pdTeamFormValues['fk_lender_id'] && delete pdTeamFormValues['fk_city_id']); @@ -272,10 +281,11 @@ if (dataresult.dataStatus == true){ this.dialogRef.close(); //Need To Dispaly saving Datas // alert("Data Saved Successfully"); - this.notifier.notify('success', 'Record Saved Successfully.!'); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert(""); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html new file mode 100644 index 000000000..5c2225a56 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html @@ -0,0 +1,3 @@ +

+ pd-team-edit works! +

diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.scss b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.spec.ts b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.spec.ts new file mode 100644 index 000000000..7bd983178 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PdTeamEditComponent } from './pd-team-edit.component'; + +describe('PdTeamEditComponent', () => { + let component: PdTeamEditComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PdTeamEditComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PdTeamEditComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts new file mode 100644 index 000000000..5dae7698b --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-pd-team-edit', + templateUrl: './pd-team-edit.component.html', + styleUrls: ['./pd-team-edit.component.scss'] +}) +export class PdTeamEditComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html new file mode 100644 index 000000000..80bb14541 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html @@ -0,0 +1,85 @@ + +
+
+ PD Team Masters +
+
+ + + +
+
+
+ + + +
+ +
+ +
+
+ + + + + + + Sl + {{row.serialno}} + + + + PD Team Name + {{row.team_name}} + + + + Lender Name + {{row.lender_name}} + + + + Is Active + + + + + + + + + + + + Actions + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.scss b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.scss similarity index 62% rename from ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.scss rename to ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.scss index dcc8578ca..723622401 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.scss +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.scss @@ -1,35 +1,7 @@ - -// .example-container { -// display: flex; -// flex-direction: column; -// min-width: 300px; -// } - -// .example-header { -// min-height: 64px; -// padding: 8px 24px 0; -// } - -// .mat-form-field { -// font-size: 14px; -// width: 100%; -// } - -// .mat-table { -// overflow: auto; -// max-height: 500px; -// } - -// .nocontent { -// color: red; -// font-size: 16px; -// text-align: center; -// } - -// .example-margin { -// margin: 10px; -// } - +/** Card title */ +.mat-card-title{ + font-size: 25px !important; +} /** Table SerialNo CSS */ .example-margin { diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.spec.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.spec.ts similarity index 100% rename from ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.spec.ts rename to ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.spec.ts diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts new file mode 100644 index 000000000..892b0e2f7 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts @@ -0,0 +1,104 @@ +import { Component, + OnInit, + ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { MatSort, + MatPaginator, +MatTableDataSource } from '@angular/material'; +/** Service */ +import { MastersService } from '../../service/masters/masters.service'; +import { PdTeamService } from '../../service/masters/pd-team.service'; + +import { NotifierService } from 'angular-notifier'; + +/** Dialog Component */ +import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component'; +/** Add Component */ +//import { } from '../pd-team-add/pd-team-add.component; +/** Edit Component */ +//import { } from '../pd-team-add/pd-team-add.component; + + +@Component({ + selector: 'app-pd-team-list', + templateUrl: './pd-team-list.component.html', + styleUrls: ['./pd-team-list.component.scss'] +}) +export class PdTeamListComponent implements OnInit { + + //Variable Declaration part + isPopupOpened: boolean = true; + loader: boolean = false; + PdTeamList: any = []; + color = 'primary'; + userData = null; + noRecordFound: boolean = false; + private notifier: NotifierService; + + public dataLength: number; + public dataSource = new MatTableDataSource(); + displayedColumns = ['serialno','team_name','lender_name','actions','isactive']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + + constructor(notifier: NotifierService, + private router: Router, + private _MasterService: MastersService, + private _PdTeamService: PdTeamService) { + this.getPdTeam(); + this.notifier = notifier; + } + + ngOnInit() {} + + /** To add data */ + addPdTeam() { + this.router.navigate(['/setting/pdteam/addpdteam']); + } + + /** To edit data */ + editPdTeam() { + this.router.navigate(['/setting/pdteam/editpdteam']); + } + + /** To get data for listing */ + getPdTeam() { + + this._PdTeamService.getAllPdTeam().subscribe( + data => { + //console.log('data',data); + if(data.dataStatus == true){ + + this.noRecordFound = false; + this.userData = data.records; + this.dataLength = data.records.length; + if(data.records.length >= 1){ + this.userData = this.userData.map((val, i)=>{ + val['serialno'] = i + 1; + return val; + }) + } + this.dataSource.data = this.userData; + }else{ + this.noRecordFound = true; + this.dataLength = 0 + } + }) +} + + /** For Display Tables Pagination And Sorting */ + ngAfterViewInit() { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + + /** For Display Tables Filtering */ + applyFilter(filterValue: string) { + filterValue = filterValue.trim(); // Remove whitespace + filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches + this.dataSource.filter = filterValue; + } + +} +/** End of ListComponent */ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.module.spec.ts b/ng6-seed/src/app/settings/pd-team/pd-team.module.spec.ts new file mode 100644 index 000000000..9bb68af94 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team.module.spec.ts @@ -0,0 +1,13 @@ +import { PdTeamModule } from './pd-team.module'; + +describe('PdTeamModule', () => { + let pdTeamModule: PdTeamModule; + + beforeEach(() => { + pdTeamModule = new PdTeamModule(); + }); + + it('should create an instance', () => { + expect(pdTeamModule).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.module.ts b/ng6-seed/src/app/settings/pd-team/pd-team.module.ts new file mode 100644 index 000000000..c17d54794 --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team.module.ts @@ -0,0 +1,111 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { CommonModule } from '@angular/common'; +import { + MatCardModule, + MatIconModule, + MatInputModule, + MatRadioModule, + MatButtonModule, + MatSelectModule, + MatDialogModule, + MatProgressBarModule,MatToolbarModule,MatCheckboxModule, + MatTableModule,MatPaginatorModule,MatSortModule} from '@angular/material'; + import {MatSlideToggleModule} from '@angular/material/slide-toggle'; + +import { MatTooltipModule } from '@angular/material/tooltip'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; +import { NgxDatatableModule } from '@swimlane/ngx-datatable'; +import { NotifierModule, NotifierOptions } from 'angular-notifier'; +import { FlexLayoutModule } from '@angular/flex-layout'; + +import { PdTeamDialogComponent } from './pd-team-dialog/pd-team-dialog.component'; +import { PdTeamListComponent } from './pd-team-list/pd-team-list.component'; + +/** Route */ +import { PdTeamRoutes } from './pd-team.routing'; + +/** Service */ +import { PdTeamService } from '../service/masters/pd-team.service'; +import { PdTeamAddComponent } from './pd-team-add/pd-team-add.component'; +import { PdTeamEditComponent } from './pd-team-edit/pd-team-edit.component'; + +/** + * Custom angular notifier options + */ +const customNotifierOptions: NotifierOptions = { + position: { + horizontal: { + position: 'right', + distance: 12 + }, + vertical: { + position: 'top', + distance: 32, + gap: 10 + } + }, + theme: 'material', + behaviour: { + autoHide: 5000, + onClick: 'hide', + onMouseover: 'pauseAutoHide', + showDismissButton: true, + stacking: 4 + }, + animations: { + enabled: true, + show: { + preset: 'slide', + speed: 300, + easing: 'ease' + }, + hide: { + preset: 'fade', + speed: 300, + easing: 'ease', + offset: 50 + }, + shift: { + speed: 300, + easing: 'ease' + }, + overlap: 150 + } +}; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, ReactiveFormsModule, + RouterModule.forChild(PdTeamRoutes), + MatCardModule, + MatIconModule, + MatInputModule, + MatRadioModule, + MatButtonModule, + MatTableModule, + MatPaginatorModule, + MatProgressBarModule, + MatDialogModule, + MatSortModule, + MatToolbarModule, + MatSelectModule, + FlexLayoutModule, + NgxMatSelectSearchModule, + NgxDatatableModule, + MatSortModule, + MatSlideToggleModule, + MatTooltipModule, + NotifierModule.withConfig(customNotifierOptions), + ], + declarations: [PdTeamDialogComponent, + PdTeamListComponent, + PdTeamAddComponent, + PdTeamEditComponent], + + providers: [PdTeamService ], + entryComponents: [PdTeamDialogComponent] +}) +export class PdTeamModule { } diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts b/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts new file mode 100755 index 000000000..e792e720a --- /dev/null +++ b/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts @@ -0,0 +1,21 @@ +import { Routes } from '@angular/router'; +import { PdTeamAddComponent } from '../pd-team/pd-team-add/pd-team-add.component'; +import { PdTeamEditComponent } from '../pd-team/pd-team-edit/pd-team-edit.component'; +import { PdTeamListComponent } from '../pd-team/pd-team-list/pd-team-list.component'; + + +export const PdTeamRoutes: Routes = [{ + + path: '', + children: [{ + path: 'pdteamlist', + component: PdTeamListComponent + },{ + path: 'addpdteam', + component: PdTeamAddComponent + },{ + path:'editpdteam', + component:PdTeamEditComponent + }] +}]; + 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 e8a381e1e..3015d8376 100644 --- a/ng6-seed/src/app/settings/service/masters/masters.service.ts +++ b/ng6-seed/src/app/settings/service/masters/masters.service.ts @@ -299,6 +299,7 @@ editPDAllocationType(Records: any,MasterName:string): Observable { item.fk_updatedby = this._aws.getlocale();//to get user id for who is update the record item.updatedon = currentdate;//to get Current date and Time for when the Record is updated delete item.pd_status_name; // to delete the pd_status_name + delete item.serialno; }); //console.log('Service Data',Records); diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts index 3fdf1d120..d2a4dbc68 100644 --- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts +++ b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts @@ -23,8 +23,8 @@ export interface Master { export class PdTeamService { -private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; -//private apiUrl = "http://localhost/sparqapi/api/"; +//private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; +private apiUrl = "http://localhost/sparqapi/api/"; constructor(private _http: HttpClient, @@ -37,7 +37,7 @@ private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; * 1st argument is "Records": any - Set of Data To Adding to database */ addPdTeamDetail(Records: any): Observable { - + console.log('From Service Data',Records); Records.fk_createdby = this._aws.getlocale();//to get user id for who is created the Record Records.createdon = currentdate;//to get Current date and Time for when the Record is created // Records.fk_updatedby = this._aws.getlocale();//to get user id for who is update the record @@ -189,4 +189,15 @@ return this._http.post(this.apiUrl+"savePDTeam", ArrayData) }; } + /** + * + */ +getAllPdTeam(): Observable { + return this._http.get(this.apiUrl+'getListOfPDTeam') + .pipe( + catchError(this.handleError('role', [])) + ) + +} + } \ No newline at end of file diff --git a/ng6-seed/src/app/settings/settings.module.ts b/ng6-seed/src/app/settings/settings.module.ts index 14ffb9cdc..1278c61a9 100644 --- a/ng6-seed/src/app/settings/settings.module.ts +++ b/ng6-seed/src/app/settings/settings.module.ts @@ -26,11 +26,9 @@ import { RouterModule } from '@angular/router'; import { SettingsRoutes } from './settings.routing'; import { RegisterComponent } from '../session/register/register.component'; import { UserService } from './service/user.service'; + import { MastersModule } from './masters/masters.module'; -// import { EntityModule } from './entity/entity.module'; -// import { AddEntityComponent } from './entity/add-entity/add-entity.component'; -// import { EditEntityComponent } from './entity/edit-entity/edit-entity.component'; -// import { EntityListComponent } from './entity/entity-list/entity-list.component'; +import { PdTeamModule } from './pd-team/pd-team.module'; import { EntityModule } from './entity/entity.module'; // import { HttpClientModule } from '@angular/common/http'; @@ -39,6 +37,7 @@ import { EntityModule } from './entity/entity.module'; CommonModule, RouterModule.forChild(SettingsRoutes),MatCardModule, MastersModule, + PdTeamModule, EntityModule, MatIconModule, MatInputModule, diff --git a/ng6-seed/src/app/settings/settings.routing.ts b/ng6-seed/src/app/settings/settings.routing.ts index eb410c394..4ec51d0ea 100644 --- a/ng6-seed/src/app/settings/settings.routing.ts +++ b/ng6-seed/src/app/settings/settings.routing.ts @@ -1,6 +1,6 @@ import { Routes } from '@angular/router'; import { MastersModule } from './masters/masters.module'; - +import { PdTeamModule } from './pd-team/pd-team.module'; import { EntityModule } from './entity/entity.module'; //import { EntityModule } from './entity/entity.module'; @@ -16,10 +16,9 @@ export const SettingsRoutes: Routes = [{ },{ path:'entity', loadChildren:'./entity/entity.module#EntityModule' + },{ + path:'pdteam', + loadChildren:'./pd-team/pd-team.module#PdTeamModule' } - // { - // path:'entitymodule', - // loadChildren:'./entity/entity.module#EntityModule' - // } ] }] \ No newline at end of file diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 8ab9b85f3..55f03f401 100644 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -53,6 +53,7 @@ const MENUITEMS : Menu[] = [ {state:'users',name:'Users'}, {state:'mastermodule',name:'Master Details'}, {state:'entity',name:'Entities'}, + {state:'pdteamlist',name:'PD Team'}, ],