diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index d604ccc09..9e0e227f6 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -6,7 +6,7 @@
-

{{userDep}} +

{{userDep}}

diff --git a/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.html b/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.html index 8607f5530..c98778f50 100644 --- a/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.html @@ -105,18 +105,23 @@ Pincode is required. - - {{allocationLabel}} - - {{subAllocationLabel}} - - + +
+

Allocation

+
{{allocationLabel}} +
+
+ {{subAllocationLabel}} + +
+
+
@@ -134,7 +139,7 @@ - Email is required. + Email number is required. @@ -148,6 +153,7 @@
+
@@ -170,11 +176,13 @@
- +
+
Co-Applicant
- + + @@ -185,10 +193,11 @@
+
Document
- + @@ -204,9 +213,7 @@ - - + @@ -227,4 +234,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts b/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts index 2880b9299..1613e5c92 100644 --- a/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/add-pd/add-pd.component.ts @@ -12,7 +12,7 @@ import { AwsService } from '../../AwsService/aws.service'; }) export class AddPdComponent implements OnInit { @Output() loadParent = new EventEmitter(); - public notifier: NotifierService; + private notifier: NotifierService; public _PDtriggerForm: FormGroup; items: FormArray; productList:any; @@ -31,8 +31,8 @@ export class AddPdComponent implements OnInit { subAllocationTypeCheck: boolean; allocationLabel: string; subAllocationLabel: string; - constructor(private _fb: FormBuilder, - private _pd: PdTrigerService, private _aws:AwsService, notifier: NotifierService) { + constructor(notifier: NotifierService,private _fb: FormBuilder, + private _pd: PdTrigerService, private _aws:AwsService) { this.notifier = notifier; } public totalfiles: Array =[]; @@ -290,7 +290,7 @@ export class AddPdComponent implements OnInit { this._pd.addPdDetails(pd_form).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Saved Successfully.!'); + this.notifier.notify('success', 'PD Saved.'); this.loadPdListCompoent(); } else { diff --git a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html index 92e007b0b..198e3fb58 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html @@ -70,5 +70,6 @@ - + + \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts index b0c20d303..7d42232cf 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.ts @@ -105,7 +105,7 @@ export class EditPdApplicantComponent implements OnInit { this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Saved Successfully.!'); + this.notifier.notify('success', 'Applicants updated..'); this.loadPdMasterCompoent(); } else { diff --git a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html index cec20aecb..b1145bcb8 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html @@ -115,4 +115,3 @@ - diff --git a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts index 37558080b..9ed6604ac 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts @@ -21,7 +21,7 @@ export class EditPdMasterComponent implements OnInit { @Input() masterChild: any; @Output() loadPdView = new EventEmitter(); public _EditPDtriggerForm:FormGroup; - private notifier: NotifierService; + public notifier: NotifierService; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService,) { this.notifier=notifier @@ -121,7 +121,7 @@ export class EditPdMasterComponent implements OnInit { } } loadPdMasterCompoent() { - this.notifier.notify('success', 'Your Changes Updated.!'); + // this.notifier.notify('success', 'Your Changes Updated.!'); this.loadPdView.emit('1') } diff --git a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html index ec2759fa7..60888e66e 100644 --- a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html @@ -1,19 +1,21 @@ -
- +
+ +
- All PD Details + All +
- +

{{details.applicat_details[0].applicant_name}}

-

{{details.lender_full_name}}    {{details.lender_applicant_id}}   {{details.pd_date_of_initiation}}

-

{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}   {{details.loan_amount}}    {{details.city_name}}/{{details.state_name}}-{{details.pincode}}

+

{{details.lender_full_name}} {{details.lender_applicant_id}}{{details.pd_date_of_initiation}}

+

{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}}  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}

- In Progress PD Details + In Progress - {{tile.text}} @@ -78,9 +80,47 @@ -
+
--> - --> + + + Scheduled + + + + + + Completed + + + + @@ -88,3 +128,4 @@ + diff --git a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts index 5d6597f80..f7d1c702e 100644 --- a/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts @@ -1,6 +1,6 @@ import { Component, ViewChild, OnInit, ViewEncapsulation, EventEmitter, Output } from '@angular/core'; -import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; import { PdTrigerService } from '../pd-service/pd-triger.service'; +import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; @Component({ selector: 'app-list-pd', @@ -109,9 +109,6 @@ export class ListPdComponent implements OnInit { } }, error => this.errorMessage = error); } - ngAfterViewInit() { - this.dataSource.paginator = this.paginator; - } addPdDetails(){ this.showParentComponent=false this.showEditComponent=false @@ -152,7 +149,6 @@ export class ListPdComponent implements OnInit { this.pdListData = data.records; this.dataLength = data.records.length; this.dataSource.data = this.pdListData; - this.recordStatus=false; } else{ diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html index 15ad414a8..d677abc20 100644 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html +++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html @@ -1,27 +1,43 @@ - +
+ {{pageTitle}} -
- -
- - - {{ ct.categroy_name }} - - Select name. - -
+ + + +

+ {{officer.first_name}} +

+

+ Allocated +

+

+ Scheduled +

+

+ Inprogress +

+ + + + + +

PD officer not available..

+ +
- +
- -
+ +
+ + + - \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss index e69de29bb..6e263adae 100644 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss +++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.scss @@ -0,0 +1,3 @@ +.example-full-width{ + width: 100%; +} \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts deleted file mode 100644 index c2547603e..000000000 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PdAllocationComponent } from './pd-allocation.component'; - -describe('PdAllocationComponent', () => { - let component: PdAllocationComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PdAllocationComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PdAllocationComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts index e146a8df3..ac56fdf9e 100644 --- a/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts +++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts @@ -15,54 +15,61 @@ export class PdAllocationComponent implements OnInit { public pdOfficerList: any = []; errorMessage: any; notifier : NotifierService; + selectedItem:any; + isDisabled: boolean; constructor( notifier: NotifierService, private _fb: FormBuilder, private dialogRef: MatDialogRef, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier=notifier; - console.log(this.data) - this.getPDOfficerList(); } ngOnInit() { - this._pdAllocationForm = this._fb.group({ - pd_primary_id: [null], - allocation_id: [null, Validators.compose([Validators.required])], - }); + this.isDisabled=true; + this.getPDOfficerList(this.data.pd_id); + + // this._pdAllocationForm = this._fb.group({ + // pd_primary_id: [null], + // allocation_id: [null], + // }); } // convenience getter for easy access to form fields -get readForm() { return this._pdAllocationForm.controls; } +// get readForm() { return this._pdAllocationForm.controls; } // pd officer list - getPDOfficerList(){ - this._pd.getPdOfficerList().subscribe( + getPDOfficerList(pdID:string){ + this._pd.getPdOfficerList(pdID).subscribe( data => { if (data.status == 200) { - this.pdOfficerList=data.records.pd_master_details; + this.pdOfficerList=data.records; } }, error => this.errorMessage = error); } - /** To Save/Edited Popup Data */ - onSubmit() { - // stop here if form is invalid - if (this._pdAllocationForm.invalid) { - this.errorMessage = "Please Fill All Mandate Fields."; - return; - } else { - var updateData = this._pdAllocationForm.value; + // select pd officer list + selectPdOfficer(selected:any){ + this.isDisabled=false; + this.selectedItem=selected; + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - //To Remove The "Null" With Key also - Object.keys(updateData).forEach((key) => (updateData[key] == null) && delete updateData[key]); - - //Add BRANCH data with help Service File + } + /** To update pd officer*/ + updatePdOfficer(allocateDate:any) { + if(this.isDisabled){ + this.notifier.notify('warning', 'Please Choose PD Officer.!'); + } + else { + let updateData = { + "pd_id":this.data.pd_id, + "fk_pd_allocated_to":allocateDate.fk_user_id, + } this._pd.updatePdOfficer(updateData).subscribe( result => { if (result.status == 200) { - this.notifier.notify('success', 'Your Changes Updated.!'); + this.notifier.notify('success', 'PD Allocated.!'); this.dialogRef.close(); } else { @@ -72,14 +79,12 @@ get readForm() { return this._pdAllocationForm.controls; } }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); this.errorMessage = "Some Thing Wents Wrong Try Again.!"; - this.dialogRef.close(); + // this.dialogRef.close(); }); - //After Saving the BRANCH data then popup close - // this.dialogRef.close(); } } /** For Popup Close Button */ -closeAllocationComponent(): void { - this.dialogRef.close(); -} + closeAllocationComponent(): void { + this.dialogRef.close(); + } } diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts index c77b0d72a..62f166ac7 100644 --- a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts @@ -21,10 +21,9 @@ export interface Master { export class PdTrigerService { private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; - //private apiUrl = "http://192.168.15.5:9999/AWSEC2/sparqapi/api/"; + //private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; + //private apiUrl = "http://ssa.sineedge.com/sparqtest/api/"; - - constructor(private _http: HttpClient, private _aws:AwsService) { } // get add pd master details @@ -113,6 +112,7 @@ export class PdTrigerService { updatePdApplicant(editData:any):Observable{ // editData.fk_updatedby = this._aws.getlocale(); // editData.updatedon = currentdate; + console.log(editData) return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":editData}) .pipe( @@ -121,23 +121,25 @@ export class PdTrigerService { } // get pd allocation to details - getPdOfficerList(): Observable { - return this._http.get(this.apiUrl+"getListPDOfficers") + getPdOfficerList(pdID:string): Observable { + return this._http.post(this.apiUrl+"getListPDOfficers",{"pdid":pdID}) .pipe( catchError(this.handleError('operation', [])) ) } // update pd officer updatePdOfficer(updateData: any): Observable { - return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":updateData}) + updateData.fk_updatedby = this._aws.getlocale(); + updateData.updatedon = currentdate; + return this._http.post(this.apiUrl+"allocatePD",{"records":updateData}) .pipe( catchError(this.handleError('operation', [])) ) } - - private handleError(operation = 'operation', result?: T) { - return (error: any): Observable => { - return of(result as T); - }; - } + + private handleError(operation = 'operation', result?: T) { + return (error: any): Observable => { + return of(result as T); + }; + } } diff --git a/ng6-seed/src/app/pd-triger/pd-triger.module.ts b/ng6-seed/src/app/pd-triger/pd-triger.module.ts index fa393eedf..ce716f451 100644 --- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts +++ b/ng6-seed/src/app/pd-triger/pd-triger.module.ts @@ -8,7 +8,7 @@ import { MatRadioModule, MatButtonModule,MatTableModule,MatPaginatorModule, MatProgressBarModule,MatDialogModule, MatSortModule, - MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule } from '@angular/material'; + MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule } from '@angular/material'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; @@ -19,8 +19,6 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; -import {MatDatepickerModule} from '@angular/material/datepicker'; - import 'hammerjs'; import { PdTrigerRoutes } from './pd-triger-routing.module'; @@ -35,7 +33,7 @@ import { PdAllocationComponent } from './pd-allocation/pd-allocation.component'; /** * Custom angular notifier options */ -const customNotifierOptions: NotifierOptions = { +const pdCustomNotifierOptions: NotifierOptions = { position: { horizontal: { position: 'right', @@ -79,7 +77,7 @@ const customNotifierOptions: NotifierOptions = { imports: [ CommonModule, RouterModule.forChild(PdTrigerRoutes), - NotifierModule.withConfig(customNotifierOptions), + NotifierModule.withConfig(pdCustomNotifierOptions), MatCardModule, MatIconModule, MatInputModule, @@ -92,15 +90,15 @@ const customNotifierOptions: NotifierOptions = { FlexLayoutModule, NgxDatatableModule, FormsModule,MatSlideToggleModule, - MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, + MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule, ReactiveFormsModule, FileUploadModule, TreeModule, MatDialogModule,MatSortModule, - NgxMatSelectSearchModule,MatTooltipModule, MatDatepickerModule, + NgxMatSelectSearchModule,MatTooltipModule, ], declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent], - entryComponents: [PdAllocationComponent], + entryComponents:[PdAllocationComponent], providers: [PdTrigerService] }) export class PdTrigerModule { } diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html index 7e0b016bd..f5d233149 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html @@ -1,13 +1,11 @@ -
- - +
+
-
@@ -17,7 +15,6 @@  {{master.city_name}} / {{master.state_name}}-{{master.pincode}} -

{{master.product_name}} / {{master.subproduct_name}}

{{master.pd_type_name}}   {{master.pd_allocation_type_name}}    {{master.pd_allocated_to}}

@@ -40,7 +37,7 @@ Applicants - +

@@ -53,8 +50,10 @@ + + @@ -67,17 +66,18 @@ Documents -

- {{documents.pd_document_title}}     + {{documents.pd_document_title}}     -  {{documents.pd_document_name}} -

+  {{documents.pd_document_name}} +

+ - + + @@ -86,11 +86,6 @@ - - - + + diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss index 542c06744..fd48f4449 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss @@ -1,3 +1,3 @@ .cardEdit { - display: inline;float:right; + display: inline;float:right;padding-top:3%; } \ No newline at end of file diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts index 29e3ba07a..f0324f37e 100644 --- a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit,ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core'; -import { MatDialog } from '@angular/material'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; +import { MatDialog } from '@angular/material'; import { NotifierService } from 'angular-notifier'; import { PdTrigerService } from '../pd-service/pd-triger.service'; import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component'; @@ -11,7 +11,7 @@ import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component' encapsulation: ViewEncapsulation.None }) export class ViewPdComponent implements OnInit { - public notifier:NotifierService; + private notifier:NotifierService; errorMessage: any; pdMasterData: any; pdApplicantData: any; @@ -25,8 +25,8 @@ export class ViewPdComponent implements OnInit { @Input() childData: string; @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm:FormGroup; - constructor(private _fb: FormBuilder, - private _pd: PdTrigerService, notifier:NotifierService, private dialog: MatDialog,) { + constructor(notifier:NotifierService,private dialog: MatDialog,private _fb: FormBuilder, + private _pd: PdTrigerService) { this.notifier=notifier } @@ -70,9 +70,11 @@ export class ViewPdComponent implements OnInit { }); dialogRef.afterClosed() .subscribe(dataresult => { - //this.getQuestionsMasters(); + // this.notifier.notify('success', 'Successfully allocated.!'); + this.viewPdDetails(this.childData) }); } + updateViewComponent(editBack:string) { if(editBack=='1'){ diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 56f2a1c6f..05091acef 100644 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -4,12 +4,12 @@
@@ -175,6 +188,7 @@ (click)="onReset()">settings_backup_restore
- + +
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts index 300fb31a0..750cd6fbe 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts @@ -33,7 +33,9 @@ export class EntityEditComponent implements OnInit{ @Input() public childMessage: any; -public pageTitle: string = "Edit Entity Master Details"; +public pageTitle: string = "Entity"; + public subTitle1: string = "Tax Info"; + public subTitle2: string = "Contacts"; public _addQuesFrom: FormGroup; public submitted = false; public categories: any = []; @@ -95,12 +97,10 @@ public pageTitle: string = "Edit Entity Master Details"; fk_state: [this.childMessage.fk_state, Validators.compose([Validators.required])], fk_city: [this.childMessage.fk_city, Validators.compose([Validators.required])], fk_branch: [this.childMessage.fk_branch, Validators.compose([Validators.required])], - addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])], + addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])], pincode: [this.childMessage.pincode, Validators.compose([Validators.required])], - official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])], - alt_email: [this.childMessage.alt_email, Validators.compose([Validators.required, Validators.email])], - phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])], - mobile_no: [this.childMessage.mobile_no, Validators.compose([Validators.required])], + official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])], + phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])], remarks: [this.childMessage.remarks, Validators.compose([Validators.required])], pan: [this.childMessage.pan, Validators.compose([Validators.required])], gst_no: [this.childMessage.gst_no, Validators.compose([Validators.required])], diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index 1f33e28f2..ade078062 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -1,12 +1,13 @@
- +
-
Entity Master
-
List of Entity Master Details
+
Entity Master
+ +
-
+
- + +
- +

Branch                                                 

- +
- -
+
@@ -35,38 +29,21 @@ fxLayoutAlign="center">
- You must inculde a Name + You must inculde a Branch Name
- -
- + - - +
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts index 183d58b2d..4b051e7fc 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts @@ -14,6 +14,7 @@ import { MatDialog, import { MastersService } from '../../../../service/masters/masters.service'; /** Model */ import { Branch,City } from '../../../model/branch'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -27,11 +28,20 @@ export class BranchDialogComponent implements OnInit { citydatas: City[]; errorMessage:string; + color = 'primary'; + /** + * Notifier service + */ + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor( + notifier: NotifierService, + private _formBuilder: FormBuilder, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: Branch) { } + @Inject(MAT_DIALOG_DATA) public data: Branch) { + this.notifier = notifier; + } ngOnInit() { @@ -81,10 +91,12 @@ export class BranchDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the BRANCH data then popup close - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); + //alert("SomeThing Wents Wrong Try Again !"); } }); @@ -94,10 +106,12 @@ export class BranchDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the BRANCH data then popup close - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); + //alert("SomeThing Wents Wrong Try Again !"); } }); } 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 f3e00b871..c9e265933 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,21 +1,40 @@ - -
- -
-
+ + + + + + + +
-
- - - -
- + + +
+
+ + + +
+
+ + +
+
- Sl {{row.serialno}} @@ -99,11 +118,13 @@ -
+
- \ No newline at end of file + + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss index 6e1848231..ed0fe77d4 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss @@ -6,6 +6,7 @@ min-width: 300px; } + .example-header { min-height: 56px; max-height: 56px; @@ -116,7 +117,6 @@ .example-margin { margin: 10px; } - .mat-table { display: table; diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html index 884aaaed6..4d1ddc672 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html @@ -19,6 +19,7 @@ fxLayoutAlign="center">

City                                                 

+
@@ -53,11 +54,11 @@ fxLayoutAlign="center">
-->
- + - +
diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts index 87f89c8ed..eeabab7ef 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; /** Model */ import { States } from '../../../model/states'; @Component({ @@ -22,14 +23,18 @@ export class CityDialogComponent implements OnInit { public _cityForm: FormGroup; + private notifier: NotifierService; stateDatas: any[]; errorMessage:string; + color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -84,10 +89,12 @@ export class CityDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the City data then popup close - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -99,10 +106,12 @@ export class CityDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the City data then popup close - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); 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 a8d021ddc..1653f558a 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 @@ -1,12 +1,8 @@ - -
- -
-
-
- -
-
+ + - +
-
+ + +
+
+ + + +
+
+ + + +
@@ -157,4 +166,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html index 4100cd447..4de4790c4 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html @@ -18,6 +18,7 @@ fxLayout="row" fxLayoutAlign="center">

Comment On Locality            

+
@@ -38,11 +39,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts index 4277c6146..dc0cc1e35 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.ts @@ -13,6 +13,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -21,14 +22,17 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./comments-on-locality-dialog.component.scss'] }) export class CommentsOnLocalityDialogComponent implements OnInit { - + color = 'primary'; public _CommentOnLocalityForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { this.commentOnLocalityFormDatas(); } @@ -59,10 +63,12 @@ export class CommentsOnLocalityDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the City data then popup close - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -74,10 +80,13 @@ export class CommentsOnLocalityDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the City data then popup close - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); + } }); } 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 7622723c5..55a916d08 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 @@ -1,8 +1,9 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ + + + +
@@ -125,8 +139,9 @@ - +
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html index 9e26d0b9f..7198faac0 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html @@ -18,6 +18,7 @@ fxLayout="row" fxLayoutAlign="center">

Customer Behaviour                                                 

+
@@ -42,9 +43,9 @@ fxLayoutAlign="center">
- + - + diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts index b3d208980..e0b9cb434 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -19,13 +20,16 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./customer-behaviour-dialog.component.scss'] }) export class CustomerBehaviourDialogComponent implements OnInit { - + color = 'primary'; public _customerBehaviourForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } @@ -76,10 +80,12 @@ onNoClick(): void { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the data then popup close - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -91,10 +97,12 @@ onNoClick(): void { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the City data then popup close - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); //After Editing the data then popup close 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 d7f29801f..94659c65d 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 @@ -1,8 +1,10 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ + + +
+
@@ -133,3 +147,4 @@ + diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html index cf3bd22c0..af713ed41 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html @@ -18,7 +18,8 @@ fxLayout="row" fxLayoutAlign="center">

Customer Segment         

- + +
diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts index 4714ea906..03d489b89 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -19,13 +20,14 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./customer-segment-dialog.component.scss'] }) export class CustomerSegmentDialogComponent implements OnInit { - + color = 'primary'; public _customerSegmentForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -74,10 +76,12 @@ export class CustomerSegmentDialogComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ this.dialogRef.close();//After Saving the BRANCH data then popup close - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -88,10 +92,12 @@ export class CustomerSegmentDialogComponent implements OnInit { if (dataresult.dataStatus == true){ this.dialogRef.close();//After Editing the BRANCH data then popup close - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 6865392b7..3e3666663 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 @@ -1,8 +1,8 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ +
@@ -131,4 +141,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html index 273592ffc..fd3e2e99a 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html @@ -19,6 +19,7 @@ fxLayoutAlign="center">

Designation                                                 

+
diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts index cd886b1d6..8cff41902 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -21,11 +22,15 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class DesignationDialogComponent implements OnInit { public _designationForm: FormGroup; + private notifier: NotifierService; + color="primary"; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -70,10 +75,12 @@ export class DesignationDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -85,10 +92,12 @@ export class DesignationDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 1ef859cfa..f92d574fc 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 @@ -1,8 +1,9 @@ -
- +
-
+ +
+
+ + + +
+
+ + +
@@ -129,3 +141,5 @@ + + diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html index 1e1d8ad54..caa3b9348 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html @@ -19,6 +19,7 @@ fxLayoutAlign="center">

Frequency                                                 

+
@@ -40,11 +41,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts index 25670082e..b46989985 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -21,11 +22,15 @@ export class FrequencyDialogComponent implements OnInit { public _frequencyForm: FormGroup; + private notifier: NotifierService; + color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -57,10 +62,12 @@ export class FrequencyDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -70,10 +77,12 @@ export class FrequencyDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + // alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 4f6729632..daf5161f5 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 @@ -1,8 +1,9 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ + +
@@ -135,4 +147,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html index f8827e60d..9fae64052 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html @@ -1,6 +1,6 @@

Industry Classification                                 

- +
@@ -39,10 +39,10 @@ fxLayoutAlign="center">

- - + + - + diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts index f2f843a38..8511783fb 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -20,12 +21,16 @@ import { MastersService } from '../../../../service/masters/masters.service'; }) export class IndustryClassificationDialogComponent implements OnInit { + color = 'primary'; public _IndustryClassificationForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _contactService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -73,10 +78,12 @@ onNoClick(): void { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -87,10 +94,12 @@ onNoClick(): void { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 8ae413df0..c97c287c6 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 @@ -1,17 +1,28 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ +
@@ -68,4 +79,5 @@
--> - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html index b4bc0c60c..e176790fd 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html @@ -1,6 +1,6 @@

Lender Hierarchy       

- +
@@ -38,12 +38,12 @@ fxLayoutAlign="center">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts index 3ee7db23b..161e4e663 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -17,13 +18,16 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./lender-hierarchy-dialog.component.scss'] }) export class LenderHierarchyDialogComponent implements OnInit { - + color = 'primary'; public _lenderHierarchyForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -71,10 +75,12 @@ export class LenderHierarchyDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -89,10 +95,12 @@ export class LenderHierarchyDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 52c0bdde5..26e1142b1 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 @@ -1,8 +1,10 @@ - -
- -
-
+ + + @@ -61,10 +63,21 @@
-->
-
+ +
+
+ + + +
+
+ + +
@@ -124,4 +137,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html index dc323c978..21bb919a7 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html @@ -1,6 +1,6 @@

Occupation of Non earning members

- +
@@ -38,12 +38,12 @@ fxLayout="row">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts index 0d73c6013..b86c207b2 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -18,13 +19,16 @@ import { MastersService } from '../../../../service/masters/masters.service'; }) export class MembersOccupationDialogComponent implements OnInit { - + color = 'primary'; public _occupationForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _memberService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } occupationFormDatas(){ this._occupationForm = this._formBuilder.group({ @@ -56,10 +60,12 @@ export class MembersOccupationDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -70,10 +76,12 @@ export class MembersOccupationDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 ec2dbb980..99937af69 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 @@ -1,8 +1,9 @@ - -
- -
-
+ + + @@ -80,10 +81,21 @@
-->
-
+ +
+
+ + + +
+
+ + +
@@ -143,4 +155,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html index ef344ae78..7a97c0acc 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html @@ -1,16 +1,23 @@ -
- +
-
+ +
+
+ + + +
@@ -81,3 +88,4 @@ + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts index 103ab9456..629b200a8 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts @@ -11,6 +11,7 @@ import { MatDialog, MatTableDataSource } from '@angular/material'; /** Service */ import { MastersService } from '../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; /** Model */ import { PdAllocationType } from '../../model/pd'; @@ -28,7 +29,7 @@ export class PdAllocationTypeListComponent implements OnInit { noRecordFound: boolean = false; dataSourceRecords = null; color = 'primary'; - + private notifier: NotifierService; public dataLength: number; public dataSource = new MatTableDataSource(); @@ -39,8 +40,9 @@ export class PdAllocationTypeListComponent implements OnInit { @ViewChild(MatSort) sort: MatSort; - constructor(private _MastersService: MastersService) { + constructor(private _MastersService: MastersService,notifier: NotifierService) { this.getPDAllocationType(); + this.notifier = notifier; } ngOnInit() {} @@ -106,10 +108,12 @@ export class PdAllocationTypeListComponent implements OnInit { if (dataresult.dataStatus == true){ //this.getPDAllocationType(); - alert("Done"); + //alert("Done"); + this.notifier.notify('success', 'Done.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); //console.log('at last Completed Section'); diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html index 44465d8c9..bf39530f1 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html @@ -1,6 +1,6 @@

PD Location Approach                                     

- +
@@ -41,12 +41,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts index c149eb043..86c83e83b 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -17,13 +18,16 @@ import { MastersService } from '../../../../service/masters/masters.service'; styleUrls: ['./pd-location-approach-dialog.component.scss'] }) export class PdLocationApproachDialogComponent implements OnInit { - + color = 'primary'; public _pdLocationApproachForm: FormGroup; + private notifier: NotifierService; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } //pd_location_approach_id, description, createdon, fk_createdby, updatedon, fk_updatedby, isactive @@ -69,10 +73,12 @@ export class PdLocationApproachDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -86,10 +92,12 @@ export class PdLocationApproachDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html index 047d41d03..b942c7527 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html @@ -1,8 +1,9 @@ - -
- -
-
+ + + @@ -63,10 +64,21 @@
-->
-
+ +
+
+ + + +
+
+ + +
@@ -122,3 +134,4 @@ + 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 3b1c9e42f..b30935485 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 @@ -1,19 +1,26 @@ -
- + + 'mail_lender', 'mail_pdincharge','mail_pdofficer'];
-
+
-->
-
+ +
+
+ + + +
@@ -134,3 +141,4 @@ + 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 d7592c64b..5cca5ffec 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 @@ -11,6 +11,7 @@ import 'rxjs/add/operator/map'; /** Service */ import { MastersService } from '../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-pd-notification-list', @@ -29,7 +30,7 @@ export class PdNotificationListComponent implements OnInit { }; notificationData = null; noRecordFound: boolean = false; - + private notifier: NotifierService; public dataLength: number; public dataSource = new MatTableDataSource(); @@ -38,9 +39,10 @@ export class PdNotificationListComponent implements OnInit { @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - constructor(private dialog: MatDialog, + constructor(private dialog: MatDialog,notifier: NotifierService, private _MastersService: MastersService) { this.getPdNotification(); + this.notifier = notifier; } ngOnInit() {} @@ -126,6 +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; + // }) + // } this.dataSource.data = this.notificationData; }else{ this.noRecordFound = true; @@ -184,10 +192,13 @@ SaveData(dataSource){ this._MastersService.saveAllPDNotification(PDNotificationArray).subscribe( dataresult => { if(dataresult.dataStatus == true){ - alert('Updated Successfully !'); + //alert('Updated Successfully !'); this.getPdNotification(); + this.notifier.notify('success', 'Record Updated Successfully.!'); + }else{ - alert('Sorry Try Again !'); + //alert('Sorry Try Again !'); + this.notifier.notify('warning', 'Sorry Try Again !'); } }); 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/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html index e1d6b0de3..5ffd4161b 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/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html @@ -3,7 +3,7 @@ fxLayoutAlign="center">

PD Team Details                                 

- +
@@ -75,14 +75,14 @@
- - + + + mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForAdd()" >settings_backup_restore - + - +
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/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts index 26b0e8920..ab11dd8a8 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/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.ts @@ -11,6 +11,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; import { PdTeamService } from '../../../../service/masters/pd-team.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-pd-team-dialog', @@ -22,6 +23,8 @@ import { PdTeamService } from '../../../../service/masters/pd-team.service'; export class PdTeamDialogComponent implements OnInit { public _pdTeamForm: FormGroup; +private notifier: NotifierService; +color = 'primary'; citydatas: any[]; lenderdatas: any[]; errorMessage:string; @@ -33,11 +36,13 @@ AllPDTeamMapData: any[]; PDTeamMaplen:any = 0; -constructor(private _formBuilder: FormBuilder, +constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _pdTeamService: PdTeamService, private _masterService: MastersService, -@Inject(MAT_DIALOG_DATA) public data: any) { } +@Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; +} ngOnInit() { @@ -261,11 +266,13 @@ Object.keys(pdTeamFormValues).forEach( //this._memberService.addMasterDetails(OccupationFormValues,'OCCUPATIONMEMBERS').subscribe( this._pdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe( dataresult=>{ + console.log(dataresult); if (dataresult.dataStatus == true){ //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + // alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ alert("SomeThing Wents Wrong Try Again !"); @@ -283,10 +290,12 @@ if (dataresult.dataStatus == true){ //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas -alert("Data Edited Successfully"); +//alert("Data Edited Successfully"); +this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 index 5e9b2f1c6..cbef78bdc 100644 --- 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 @@ -1,8 +1,9 @@ - -
- -
-
+ + + @@ -71,10 +72,20 @@
-
+ +
+
+ + + +
+
+ +
@@ -134,4 +145,5 @@ onclick="return confirm('Are you sure?')">
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html index 9e7d68b31..bbc649150 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html @@ -1,6 +1,6 @@

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts index fe757e694..596776797 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts @@ -11,6 +11,8 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; + @Component({ selector: 'app-jazz-dialog', templateUrl: './pd-type-dialog.component.html', @@ -19,11 +21,15 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class PdTypeDialogComponent implements OnInit { public _pdTypeForm: FormGroup; + private notifier: NotifierService; + color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _pdTypeService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { @@ -67,10 +73,12 @@ export class PdTypeDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -83,10 +91,12 @@ export class PdTypeDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html index 38a05026d..2207eeb89 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html @@ -1,8 +1,9 @@ - -
- -
-
+ + + @@ -61,10 +62,22 @@
-
+ +
+
+ + + +
+
+ + + +
@@ -121,3 +134,4 @@ + diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html index b74575fad..5793c6d43 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html @@ -1,6 +1,6 @@
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts index 6ce52a005..19c5b18ac 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -20,11 +21,14 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class ProductDialogComponent implements OnInit { public _productMasterForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { + this.notifier = notifier; + } ngOnInit() { this.productFormDatas(); @@ -61,10 +65,12 @@ export class ProductDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -75,10 +81,12 @@ export class ProductDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 de0d0df93..adf9da364 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 @@ -1,19 +1,31 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ + +
+
@@ -343,4 +355,5 @@
--> - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html index 68f94150e..4158e2813 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html @@ -22,11 +22,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts index d0b86e89e..f276c315f 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts @@ -10,6 +10,7 @@ import { FormBuilder, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; + import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-question-category-dialog', @@ -19,11 +20,12 @@ import { FormBuilder, export class QuestionCategoryDialogComponent implements OnInit { public _questionCategoryForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { this.formfunction(); } @@ -52,10 +54,12 @@ export class QuestionCategoryDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + // alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -66,10 +70,12 @@ export class QuestionCategoryDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + // alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html index becf850c0..9519b5708 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html @@ -1,20 +1,32 @@ - -
- -
-
+ + + -
+
-
+ +
+
+ + + +
+
+ + +
+
@@ -66,4 +78,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html index 767fcc38a..92891a919 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html @@ -1,6 +1,6 @@

Region                                                 

- +
@@ -41,12 +41,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts index d3304d889..2fbc640d4 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -20,11 +21,12 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class RegionsDialogComponent implements OnInit { public _regionsForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _regionsService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -66,10 +68,12 @@ onNoClick(): void { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -81,10 +85,12 @@ onNoClick(): void { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html index 70a17c3a1..ac665e0a7 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html @@ -1,8 +1,9 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ + +
@@ -128,4 +140,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html index 4548e3b2b..415e9ff95 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html @@ -1,6 +1,6 @@

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts index d9b63c2f0..6791ad3a1 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @@ -22,11 +23,12 @@ export class RelationShipDialogComponent implements OnInit { public _relationShipForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef< RelationShipDialogComponent>, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -68,10 +70,12 @@ onNoClick(): void { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -83,10 +87,12 @@ onNoClick(): void { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html index d05e1b1fc..7e67fd576 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html @@ -1,8 +1,9 @@ -
- +
-
+ +
+
+ + + +
+
+ + + +
@@ -144,4 +157,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html index 76e68ef9a..78827813d 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html @@ -1,6 +1,6 @@

State                                                 

- +
@@ -65,12 +65,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts index cfe28ef85..85acbc4da 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; import { States } from '../../../model/states'; @Component({ @@ -20,14 +21,16 @@ import { States } from '../../../model/states'; export class StatesDialogComponent implements OnInit { public _statesForm: FormGroup; + private notifier: NotifierService; + color = 'primary'; regionDatas : any[]; foundBooks: any; errorMessage:string; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } @@ -88,10 +91,12 @@ export class StatesDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -103,10 +108,12 @@ export class StatesDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html index e5a9a6c96..8645bbeee 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html @@ -1,8 +1,9 @@ -
- +
-
+ +
+
+ + + +
+
+ + +
@@ -168,4 +180,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html index 2a13aef45..e0193cf07 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html @@ -1,7 +1,7 @@

Sub Product Details                                       

- +
@@ -72,12 +72,12 @@ fxLayoutAlign="center">
- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts index cf6ce3b43..99a731df2 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts @@ -13,6 +13,7 @@ import { MatDialog, /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -22,13 +23,15 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class SubProductDialogComponent implements OnInit { public _subProductMasterForm: FormGroup; + private notifier: NotifierService; productDatas : any[]; errorMessage:string; + color = 'primary'; - constructor(private _formBuilder: FormBuilder, + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { this.subProductFormDatas(); @@ -82,10 +85,12 @@ export class SubProductDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -97,10 +102,12 @@ export class SubProductDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html index ac0d0d151..c359ea303 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html @@ -1,6 +1,7 @@
- + +

+
+
+ + + +
+
+ + +
@@ -158,4 +170,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html index ee7afaf7d..c841bcd07 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html @@ -1,6 +1,6 @@

- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts index 8677b06b2..ee59fc61d 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.ts @@ -12,6 +12,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -22,11 +23,12 @@ export class TitleDialogComponent implements OnInit { public _titleForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -70,10 +72,12 @@ export class TitleDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -84,10 +88,12 @@ export class TitleDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html index bea5993fe..af8fbf74c 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html @@ -1,8 +1,6 @@ - -
- -
-
+ + + +
+
+ + + +
+
+ + + +
@@ -143,4 +153,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html index 1d25e960b..548195fed 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html @@ -1,6 +1,6 @@ @@ -11,7 +11,7 @@ fxLayoutGap="35px" fxLayoutGap.xs="0">
Type of activity
-
+
-->

Type of activity                                

- +
@@ -40,12 +40,12 @@ fxLayoutAlign="center">

- - + + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts index f4c738932..e178eb52f 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.ts @@ -12,6 +12,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -22,11 +23,12 @@ import { MastersService } from '../../../../service/masters/masters.service'; export class ActivityDialogComponent implements OnInit { public _activityMasterForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _MastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } @@ -61,10 +63,12 @@ onSubmit() { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -76,10 +80,12 @@ onSubmit() { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html index 0b15f7c8a..351c2e113 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html @@ -1,8 +1,9 @@ - -
- -
-
+ + + + + +
-
+ +
+
+ + + +
+
+ +
@@ -136,4 +147,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html index 304fd2686..6e73ecfda 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html @@ -18,7 +18,7 @@ fxLayout="row" fxLayoutAlign="center">

Unit of Measurement      

- +
@@ -39,11 +39,11 @@ fxLayoutAlign="center">
- + - + - +
diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts index 27d6118d5..63c0090fc 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts @@ -12,6 +12,7 @@ import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { MastersService } from '../../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-jazz-dialog', @@ -22,11 +23,12 @@ export class UomDialogComponent implements OnInit { public _uomForm: FormGroup; - - constructor(private _formBuilder: FormBuilder, + private notifier: NotifierService; + color = 'primary'; + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, private dialogRef: MatDialogRef, private _mastersService: MastersService, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } ngOnInit() { @@ -73,10 +75,12 @@ export class UomDialogComponent implements OnInit { //After Saving the data then popup close this.dialogRef.close(); //Need To Dispaly saving Datas - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -88,10 +92,12 @@ export class UomDialogComponent implements OnInit { //After Editing the data then popup close this.dialogRef.close(); //Need To Display saving Datas - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); } 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 3ec3f22ba..e51108937 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,8 +1,9 @@ - -
- -
-
+ + +
-
+ +
+
+ + + +
+
+ + +
@@ -138,4 +150,5 @@
- \ No newline at end of file + + \ 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 117b1a40a..633362bec 100644 --- a/ng6-seed/src/app/settings/masters/masters.component.html +++ b/ng6-seed/src/app/settings/masters/masters.component.html @@ -1,31 +1,21 @@ - Masters - Pick up for Master - - - -
+
+ Masters
-
+
{{master.name}} - - + You must Pickup Master Name. +
-
- - - -
-
diff --git a/ng6-seed/src/app/settings/masters/masters.component.scss b/ng6-seed/src/app/settings/masters/masters.component.scss index 3e80f0dbb..c6f670615 100644 --- a/ng6-seed/src/app/settings/masters/masters.component.scss +++ b/ng6-seed/src/app/settings/masters/masters.component.scss @@ -1,3 +1,6 @@ mat-form-field{ width:100%; -} \ No newline at end of file +} +.mat-card-title{ + font-size: 25px !important; +} \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/masters.module.ts b/ng6-seed/src/app/settings/masters/masters.module.ts index 4ddc5f0a2..b4ae6b935 100644 --- a/ng6-seed/src/app/settings/masters/masters.module.ts +++ b/ng6-seed/src/app/settings/masters/masters.module.ts @@ -23,6 +23,7 @@ import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; 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 'hammerjs'; @@ -91,6 +92,49 @@ import { MastersRoutes } from './masters.routing'; import { MastersService } from '../service/masters/masters.service'; import { PdTeamService } from '../service/masters/pd-team.service'; +/** + * 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: [ @@ -116,6 +160,7 @@ import { PdTeamService } from '../service/masters/pd-team.service'; MatSortModule, MatSlideToggleModule, MatTooltipModule, + NotifierModule.withConfig(customNotifierOptions), MatCheckboxModule ], declarations: [MastersComponent, diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.html b/ng6-seed/src/app/settings/users/user-list/user-list.component.html index f1f9c37fa..cc5a4df7a 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.html +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.html @@ -20,7 +20,7 @@ Sl - {{i+1}} + {{us.SerialNo}} diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts index 99448064f..6e6e4be5d 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts @@ -70,6 +70,12 @@ export class UserListComponent implements OnInit { console.log(data.records.length); this.dataLength = data.records.length; this.dataSource.data = this.userdata; + if(data.records.length >= 1){ + this.userdata = this.userdata.map((val, i)=>{ + val['SerialNo'] = i + 1; + return val; + }) + } } }) } diff --git a/ng6-seed/src/assets/images/lime.jpg b/ng6-seed/src/assets/images/lime.jpg new file mode 100644 index 000000000..07d8fe7d8 Binary files /dev/null and b/ng6-seed/src/assets/images/lime.jpg differ diff --git a/ng6-seed/src/assets/styles/scss/_material.variables.scss b/ng6-seed/src/assets/styles/scss/_material.variables.scss index 3bd0a9f79..c218bf189 100644 --- a/ng6-seed/src/assets/styles/scss/_material.variables.scss +++ b/ng6-seed/src/assets/styles/scss/_material.variables.scss @@ -3,7 +3,8 @@ ---------------*/ @import '~@angular/material/theming'; -$primary: mat-palette($mat-deep-purple); +/**-- $primary: mat-palette($mat-deep-purple); --*/ +$primary: mat-palette($mat-light-blue); $accent: mat-palette($mat-amber, A200, A100, A400); $warn: mat-palette($mat-red); $theme: mat-light-theme($primary, $accent, $warn); @@ -12,7 +13,8 @@ $foreground: map-get($theme, foreground); @include mat-core(); -$dark-primary: mat-palette($mat-blue-grey); +/**-- $dark-primary: mat-palette($mat-blue-grey); --**/ +$dark-primary: mat-palette($mat-light-blue); $dark-accent: mat-palette($mat-amber, A200, A100, A400); $dark-warn: mat-palette($mat-deep-orange); $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn); diff --git a/ng6-seed/src/favicon.ico b/ng6-seed/src/favicon.ico index 8081c7cea..cfeddd3c1 100644 Binary files a/ng6-seed/src/favicon.ico and b/ng6-seed/src/favicon.ico differ