Main Applicant Details
+Main Applicant
-
-
-
-
-
-
- {{PDtriggerForm.controls.items.controls[i].controls.label.value}} {{i+1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{coDetails.controls.label.value}} {{i+1}}
+ +
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
+
+
+
-
-
+
+
+
+
+
-
+
+
error);
}
+ ngAfterViewInit() {
+ this.dataSource.paginator = this.paginator;
+ }
addPdDetails(){
this.showParentComponent=false
this.showEditComponent=false
+ this.showViewComponent=false
this.showAddComponent=!this.showAddComponent
-
-
}
editPdDetails(editID:string){
this.showParentComponent=false
this.showAddComponent=false
+ this.showViewComponent=false
this.showEditComponent=!this.showEditComponent
this.parentEditData=editID
}
+ viewPdDetails(editID:string){
+ this.showParentComponent=false
+ this.showAddComponent=false
+ this.showEditComponent=false
+ this.showViewComponent=!this.showViewComponent
+ this.parentViewData=editID
+ }
updateParentComponent(event:string) {
this.showParentComponent=!this.showParentComponent
if(event=='1'){
@@ -102,14 +140,30 @@ export class ListPdComponent implements OnInit {
}
else if(event=='2'){
this.showEditComponent=!this.showEditComponent
+ }
+ else if(event=='3'){
+ this.showViewComponent=!this.showViewComponent
}
this._pd.getPdDetails()
.subscribe(
data => {
if (data.status == 200) {
this.pdList = data.records;
+ this.pdListData = data.records;
+ this.dataLength = data.records.length;
+ this.dataSource.data = this.pdListData;
+ this.recordStatus=false;
+
+ }
+ else{
+ this.pdList=[];
+ this.dataLength = null;
+ this.recordStatus=true;
}
}, error => this.errorMessage = error);
}
+pageChange(e) {
+ console.log(e);
+}
}
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
new file mode 100644
index 000000000..15ad414a8
--- /dev/null
+++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html
@@ -0,0 +1,27 @@
+
+
+ {{pageTitle}}
+
+
+
+
+
+
+
+;
+
+ 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
new file mode 100644
index 000000000..e146a8df3
--- /dev/null
+++ b/ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts
@@ -0,0 +1,85 @@
+import { Component, OnInit, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
+import { NotifierService } from 'angular-notifier';
+import { PdTrigerService } from '../pd-service/pd-triger.service';
+
+@Component({
+ selector: 'app-pd-allocation',
+ templateUrl: './pd-allocation.component.html',
+ styleUrls: ['./pd-allocation.component.scss']
+})
+export class PdAllocationComponent implements OnInit {
+ public pageTitle: string = "PD Allocation To";
+ public _pdAllocationForm: FormGroup;
+ public pdOfficerList: any = [];
+ errorMessage: any;
+ notifier : NotifierService;
+ 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])],
+ });
+ }
+
+// convenience getter for easy access to form fields
+get readForm() { return this._pdAllocationForm.controls; }
+
+// pd officer list
+ getPDOfficerList(){
+ this._pd.getPdOfficerList().subscribe(
+ data => {
+ if (data.status == 200) {
+ this.pdOfficerList=data.records.pd_master_details;
+
+ }
+ }, 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;
+
+ //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
+ this._pd.updatePdOfficer(updateData).subscribe(
+ result => {
+ if (result.status == 200) {
+ this.notifier.notify('success', 'Your Changes Updated.!');
+ this.dialogRef.close();
+ }
+ else {
+ this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ this.errorMessage = "Something Wents Wrong Try Again.!";
+ }
+ }, error => {
+ this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ this.errorMessage = "Some Thing Wents Wrong Try Again.!";
+ this.dialogRef.close();
+ });
+ //After Saving the BRANCH data then popup close
+ // this.dialogRef.close();
+ }
+ }
+/** For Popup Close Button */
+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 1babea421..c77b0d72a 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
@@ -1,7 +1,7 @@
/** Common Import Section */
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';//for Datatables
-import { HttpClient } from '@angular/common/http';
+import { HttpClient,HttpParams } from '@angular/common/http';
import { catchError } from 'rxjs/operators';
import { of } from 'rxjs';
@@ -21,6 +21,8 @@ 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/";
+
constructor(private _http: HttpClient,
@@ -32,22 +34,110 @@ export class PdTrigerService {
catchError(this.handleError('role', []))
)
}
+ //get product and subproduct master details
+ getProductsDetails(): Observable {
+ return this._http.get(this.apiUrl+'getListOfProducts')
+ .pipe(
+ catchError(this.handleError('role', []))
+ )
+ }
+ // get lenders list
+ getLenderDetails(): Observable {
+ return this._http.get(this.apiUrl+'getListOfLenders')
+ .pipe(
+ catchError(this.handleError('role', []))
+ )
+ }
+ // get customers list
+ getCustomersDetails(): Observable {
+ return this._http.get(this.apiUrl+'getListOfCustomerSegments')
+ .pipe(
+ catchError(this.handleError('role', []))
+ )
+ }
+ // get Pd Allocation type details list
+ getPDAllocationDetails(): Observable {
+ return this._http.get(this.apiUrl+'getListOfPDAllocationTypes')
+ .pipe(
+ catchError(this.handleError('role', []))
+ )
+ }
+ // get state and city details
+ getStateCityDetails(): Observable {
+ return this._http.get(this.apiUrl+'getListOfStatesAndCities')
+ .pipe(
+ catchError(this.handleError('role', []))
+ )
+ }
+ // get pd type and allocation type details
+ getPDTypeDetails():Observable {
+ return this._http.get(this.apiUrl+'getListOfPDAllocationTypes')
+ .pipe(
+ catchError(this.handleError('role', []))
+ )
+ }
+ // add pd details
addPdDetails(pdForm: any): Observable {
return this._http.post(this.apiUrl+"triggerNewPD", pdForm)
.pipe(
catchError(this.handleError('operation', []))
)
}
+ // get pd details
getPdDetails(): Observable {
return this._http.get(this.apiUrl+"listLessPDDetails/get")
.pipe(
catchError(this.handleError('operation', []))
)
}
-
- private handleError(operation = 'operation', result?: T) {
- return (error: any): Observable => {
- return of(result as T);
- };
- }
+
+ // get edit row pd details
+ editPdDetails(editId:string):Observable{
+ let httpParams = new HttpParams().set('pdid', editId);
+ return this._http.post(this.apiUrl+"getFullPDDetails",httpParams)
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+ // update pd master details
+ editPdMasterDetails(editData:any):Observable{
+ editData.fk_updatedby = this._aws.getlocale();
+ editData.updatedon = currentdate;
+ return this._http.post(this.apiUrl+"triggerNewPD",{records:editData})
+
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+ // update pd applicant
+ updatePdApplicant(editData:any):Observable{
+ // editData.fk_updatedby = this._aws.getlocale();
+ // editData.updatedon = currentdate;
+ return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":editData})
+
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+
+ // get pd allocation to details
+ getPdOfficerList(): Observable {
+ return this._http.get(this.apiUrl+"getListPDOfficers")
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+ // update pd officer
+ updatePdOfficer(updateData: any): Observable {
+ return this._http.post(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":updateData})
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+
+ 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 0dab02906..fa393eedf 100644
--- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts
+++ b/ng6-seed/src/app/pd-triger/pd-triger.module.ts
@@ -15,8 +15,12 @@ import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
import { TreeModule } from 'angular-tree-component';
import { NgxDatatableModule } from '@swimlane/ngx-datatable';
import { FlexLayoutModule } from '@angular/flex-layout';
+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';
@@ -24,11 +28,58 @@ import { AddPdComponent } from './add-pd/add-pd.component';
import { PdTrigerService } from './pd-service/pd-triger.service';
import { ListPdComponent } from './list-pd/list-pd.component';
import { EditPdComponent } from './edit-pd/edit-pd.component';
-
+import { ViewPdComponent } from './view-pd/view-pd.component';
+import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component';
+import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component';
+import { PdAllocationComponent } from './pd-allocation/pd-allocation.component';
+/**
+ * Custom angular notifier options
+ */
+const customNotifierOptions: NotifierOptions = {
+ position: {
+ horizontal: {
+ position: 'right',
+ distance: 12
+ },
+ vertical: {
+ position: 'top',
+ distance: 32,
+ gap: 10
+ }
+ },
+ theme: 'material',
+ behaviour: {
+ autoHide: 5000,
+ onClick: 'hide',
+ onMouseover: 'pauseAutoHide',
+ showDismissButton: true,
+ stacking: 4
+ },
+ animations: {
+ enabled: true,
+ show: {
+ preset: 'slide',
+ speed: 300,
+ easing: 'ease'
+ },
+ hide: {
+ preset: 'fade',
+ speed: 300,
+ easing: 'ease',
+ offset: 50
+ },
+ shift: {
+ speed: 300,
+ easing: 'ease'
+ },
+ overlap: 150
+ }
+};
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(PdTrigerRoutes),
+ NotifierModule.withConfig(customNotifierOptions),
MatCardModule,
MatIconModule,
MatInputModule,
@@ -45,10 +96,11 @@ import { EditPdComponent } from './edit-pd/edit-pd.component';
ReactiveFormsModule,
FileUploadModule,
TreeModule,
- MatDialogModule,
- NgxMatSelectSearchModule
+ MatDialogModule,MatSortModule,
+ NgxMatSelectSearchModule,MatTooltipModule, MatDatepickerModule,
],
- declarations: [AddPdComponent, ListPdComponent, EditPdComponent],
+ declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, 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
new file mode 100644
index 000000000..7e0b016bd
--- /dev/null
+++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html
@@ -0,0 +1,96 @@
+
+
+ Applicants
+
+
+
+
+
+
+
+
+
+
+
+ Documents
+
+
+
+
+
+
+
+
+
+
+ PD History
+
+
+
+
+
+
+
+
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
new file mode 100644
index 000000000..542c06744
--- /dev/null
+++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss
@@ -0,0 +1,3 @@
+.cardEdit {
+ display: inline;float:right;
+}
\ No newline at end of file
diff --git a/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.spec.ts b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.spec.ts
new file mode 100644
index 000000000..51de6afa9
--- /dev/null
+++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ViewPdComponent } from './view-pd.component';
+
+describe('ViewPdComponent', () => {
+ let component: ViewPdComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ViewPdComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ViewPdComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 000000000..29e3ba07a
--- /dev/null
+++ b/ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts
@@ -0,0 +1,90 @@
+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 { NotifierService } from 'angular-notifier';
+import { PdTrigerService } from '../pd-service/pd-triger.service';
+import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
+@Component({
+ selector: 'app-view-pd',
+ templateUrl: './view-pd.component.html',
+ styleUrls: ['./view-pd.component.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class ViewPdComponent implements OnInit {
+ public notifier:NotifierService;
+ errorMessage: any;
+ pdMasterData: any;
+ pdApplicantData: any;
+ pdDocumentsData: any;
+ pdLogsData: any;
+ editMasterData: any[];
+ editApplicantData: any[];
+ showEditMasterComponent: boolean;
+ showEditApplicantComponent: boolean;
+ showEditDocumentComponent: boolean;
+ @Input() childData: string;
+ @Output() loadParent = new EventEmitter();
+ public _EditPDtriggerForm:FormGroup;
+ constructor(private _fb: FormBuilder,
+ private _pd: PdTrigerService, notifier:NotifierService, private dialog: MatDialog,) {
+ this.notifier=notifier
+ }
+
+ ngOnInit() {
+
+ this.viewPdDetails(this.childData);
+ this.showEditMasterComponent=false;
+ this.showEditApplicantComponent=false;
+ this.showEditDocumentComponent=false;
+ }
+ viewPdDetails(editID:string){
+ this._pd.editPdDetails(editID).subscribe(
+ data => {
+ if (data.status == 200) {
+ this.pdMasterData=data.records.pd_master_details;
+ this.pdApplicantData= data.records.applicants_details;
+ this.pdDocumentsData=data.records.pd_documnets;
+ this.pdLogsData=data.records.pd_logs;
+ }
+}, error => this.errorMessage = error);
+ }
+
+ loadPdListCompoent() {
+ this.loadParent.emit('3')
+ }
+
+ editPdMaster(masterData:any){
+ this.editMasterData=masterData;
+ this.showEditMasterComponent=!this.showEditMasterComponent;
+ }
+ editPdApplicant(applicantData:any){
+ this.editApplicantData=applicantData;
+ this.showEditApplicantComponent=!this.showEditApplicantComponent;
+ }
+ // pd allocation to
+ // edit questions master details popup model
+ pdAllocationTo(pdID:any) {
+ const dialogRef = this.dialog.open(PdAllocationComponent, {
+ data: pdID,
+ disableClose: true
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ //this.getQuestionsMasters();
+ });
+ }
+ updateViewComponent(editBack:string) {
+
+ if(editBack=='1'){
+ this.showEditMasterComponent=!this.showEditMasterComponent
+ }
+ else if(editBack=='2'){
+ this.showEditApplicantComponent=!this.showEditApplicantComponent
+ }
+ else if(editBack=='3'){
+ this.showEditMasterComponent=!this.showEditMasterComponent
+ }
+ this.viewPdDetails(this.childData);
+ }
+
+}
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 4c7d9286b..f3e00b871 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,6 +1,6 @@
+
{{details.applicat_details[0].applicant_name}}
-{{details.lender_applicant_id}} {{details.pd_date_of_initiation}}
-{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}} {{details.state_name}}/{{details.city_name}}
+{{details.lender_full_name}} {{details.lender_applicant_id}} {{details.pd_date_of_initiation}}
+{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}
-
+
+
+
+
+
+
+ 
+ {{master.lender_full_name}} - {{master.lender_applicant_id}}
+
+ {{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}}
+{{master.addressline1}}
+{{master.addressline2}}
+{{master.addressline3}}
+ +{{master.pd_status_name}} {{master.pd_date_of_initiation}}
+ +
+
+
+ Main Applicant
+
+ {{documents.pd_document_title}} +
+
-
+
-
{{details.applicat_details[0].applicant_name}}
- -{{details.lender_applicant_id}} {{details.pd_date_of_initiation}}
-{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}} {{details.state_name}}/{{details.city_name}}
- + + --
{{details.applicat_details[0].applicant_name}}
- -{{details.lender_applicant_id}} {{details.pd_date_of_initiation}}
-{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}} {{details.state_name}}/{{details.city_name}}
- - --
{{details.applicat_details[0].applicant_name}}
- -{{details.lender_applicant_id}} {{details.pd_date_of_initiation}}
-{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}} {{details.state_name}}/{{details.city_name}}
- - -- - - + +
No Record Found ...
+ +