diff --git a/ng6-seed/src/app/AwsService/aws.service.ts b/ng6-seed/src/app/AwsService/aws.service.ts index b0b47f371..86c7d6afb 100755 --- a/ng6-seed/src/app/AwsService/aws.service.ts +++ b/ng6-seed/src/app/AwsService/aws.service.ts @@ -770,14 +770,29 @@ adminlistgroup(enitiy){ } -adminSetpassword(awsuser){ +adminSetpassword(awsuser,lenname){ + // console.log(awsuser,lenname); this.getconfig(); - var params = { - Password: 'temp1234', /* required */ - UserPoolId: se_poolData.UserPoolId, /* required */ - Username: awsuser, /* required */ - Permanent: false - }; + if(lenname == 'SINEEDGE'){ + var params = { + Password: 'temp1234', /* required */ + UserPoolId: se_poolData.UserPoolId, /* required */ + Username: awsuser, /* required */ + Permanent: false + }; + } + else{ + if(lenname == 'LENDER'){ + var params = { + Password: 'temp1234', /* required */ + UserPoolId: lender_poolData.UserPoolId, /* required */ + Username: awsuser, /* required */ + Permanent: false + }; + } + + } + return Observable.create(observe=>{ let cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider(); cognitoidentityserviceprovider.adminSetUserPassword(params, function(err, data) { diff --git a/ng6-seed/src/app/app.module.ts b/ng6-seed/src/app/app.module.ts index 0036bc60e..e9e4bbaa0 100755 --- a/ng6-seed/src/app/app.module.ts +++ b/ng6-seed/src/app/app.module.ts @@ -54,6 +54,8 @@ import { AngularFireModule } from '@angular/fire'; import { MessagingService } from './shared/messaging.service'; import { environment } from '../environments/environment'; import { AsyncPipe } from '../../node_modules/@angular/common'; +import { SalesPdComponent } from './sales-pd/sales-pd.component'; +import { PdTrigerService } from './personal-discussion/pd-service/pd-triger.service'; export function HttpLoaderFactory(http: HttpClient) { @@ -73,7 +75,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { AppComponent, AdminLayoutComponent, AuthLayoutComponent, - NewPasswordDialog,ForgotPass,ChangePasswordDialog, RoleMenuItemsPipe, + NewPasswordDialog,ForgotPass,ChangePasswordDialog, RoleMenuItemsPipe, SalesPdComponent, ], imports: [ BrowserModule, @@ -118,6 +120,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { }, AwsService,AuthGuard, TranslateService, + PdTrigerService, // { // provide: PERFECT_SCROLLBAR_CONFIG, // useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG diff --git a/ng6-seed/src/app/app.routing.ts b/ng6-seed/src/app/app.routing.ts index 6d249f73c..50264b3fc 100755 --- a/ng6-seed/src/app/app.routing.ts +++ b/ng6-seed/src/app/app.routing.ts @@ -4,6 +4,7 @@ import { AdminLayoutComponent } from './layouts/admin/admin-layout.component'; import { AuthLayoutComponent } from './layouts/auth/auth-layout.component'; import { CognitoService} from './AwsService/cognito.service'; import { AuthGuard } from './_guard/auth.guard'; +import { SalesPdComponent } from './sales-pd/sales-pd.component'; export const AppRoutes: Routes = [{ path: '', redirectTo: 'home', @@ -30,6 +31,10 @@ export const AppRoutes: Routes = [{ path:'quality_check_discussion', loadChildren:'./quality-check/quality-check.module#QualityCheckModule' }, + { + path:'sales-pd-list', + component:SalesPdComponent + }, { path:'reports', loadChildren:'./reports/reports.module#ReportsModule' diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 4c3ca6724..be1ea2291 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -155,21 +155,23 @@ export class AddPdComponent implements OnInit, OnDestroy { this.lenderShortName = lender['short_name']; // console.log(this.lenderShortName); this._PDtriggerForm.controls.pd_branch_id.setValue(null); - - if(this.lenderShortName == 'CLIX'){ - let getProductAbbr = this.productAllList.map(dval => dval.product_abbr); - let ClixProductAbbr = ['BL','LAEP']; - let FilteredAbbr: any = []; - FilteredAbbr = ClixProductAbbr.map(x => { - let findIndex = getProductAbbr.indexOf(x); - return this.productAllList[findIndex]; - }); - this.productList = FilteredAbbr.length > 0 ? FilteredAbbr : this.productAllList; - } - else{ this.productList = this.productAllList; - } + + // if(this.lenderShortName == 'CLIX'){ + + // let getProductAbbr = this.productAllList.map(dval => dval.product_abbr); + // let ClixProductAbbr = ['BL','LAEP']; + // let FilteredAbbr: any = []; + // FilteredAbbr = ClixProductAbbr.map(x => { + // let findIndex = getProductAbbr.indexOf(x); + // return this.productAllList[findIndex]; + // }); + // this.productList = FilteredAbbr.length > 0 ? FilteredAbbr : this.productAllList; + // } + // else{ + // this.productList = this.productAllList; + // } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index f5bbb5300..d74ee369b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -170,21 +170,22 @@ export class EditPdMasterComponent implements OnInit { if(!option){ this._EditPDtriggerForm.controls.pd_branch_id.setValue(null); } - - if(this.lenderShortName == 'CLIX'){ - - let getProductAbbr = this.productAllList.map(dval => dval.product_abbr); - let ClixProductAbbr = ['BL','LAEP']; - let FilteredAbbr: any = []; - FilteredAbbr = ClixProductAbbr.map(x => { - let findIndex = getProductAbbr.indexOf(x); - return this.productAllList[findIndex]; - }); - this.productList = FilteredAbbr.length > 0 ? FilteredAbbr : this.productAllList; - } - else{ this.productList = this.productAllList; - } + + // if(this.lenderShortName == 'CLIX'){ + + // let getProductAbbr = this.productAllList.map(dval => dval.product_abbr); + // let ClixProductAbbr = ['BL','LAEP']; + // let FilteredAbbr: any = []; + // FilteredAbbr = ClixProductAbbr.map(x => { + // let findIndex = getProductAbbr.indexOf(x); + // return this.productAllList[findIndex]; + // }); + // this.productList = FilteredAbbr.length > 0 ? FilteredAbbr : this.productAllList; + // } + // else{ + // this.productList = this.productAllList; + // } @@ -399,7 +400,7 @@ if(!option){ // console.log(1); this.customerSegmentList = this.customerSegmentAllList.filter(s => (s.customer_segment).includes('Self')); if(this.lenderShortName == 'CLIX' && flag==2 ){ this._EditPDtriggerForm.controls['fk_customer_segment'].setValue('5'); } - this._EditPDtriggerForm.controls['fk_subproduct_id'].setValue(this.subProductList[0].subproduct_id); + // this._EditPDtriggerForm.controls['fk_subproduct_id'].setValue(this.subProductList[0].subproduct_id); this.subProductList=[]; this.isSubproductShown = false; break; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index b40791c31..20d43ab9e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -168,7 +168,7 @@ KYC Required - diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 0e8699499..8de13e322 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -184,6 +184,13 @@ export class PdTrigerService { ) } + getSalesPd(): Observable { + return this._http.get(this.apiUrl + "listSalesPD/any") + .pipe( + catchError(this.handleError('operation', [])) + ) + } + // get edit row pd details // This function also called in Final Remarks Form // Make sure FinalRemarksForm does not effect. whenever you done any changes onit means diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd.component.html new file mode 100644 index 000000000..832af6ef3 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.html @@ -0,0 +1,143 @@ + +
+
+ + + +
+
+ + + Sales PD + + + + + + + filter_list + + Advance Filter + + + + + + + +
+ + + + + {{details.sales_pd_id}} + + + + + + Not Available +
+ + {{details.applicant_name}} +
+ {{details.applicant_id}} + + + + + {{details.short_name}} + + + + + {{details.abbr}} + + + + + + Not Available +
+ + {{details.officer_name}} + + + + + + {{details.createdon | date: 'dd/MM/yyyy'}} + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.scss b/ng6-seed/src/app/sales-pd/sales-pd.component.scss new file mode 100644 index 000000000..51db57442 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.scss @@ -0,0 +1,20 @@ +.ic-change:hover { + transform: scale(1.1); + color: green; +} +.cell{ + display:inline !important; + text-align: center !important; +} +.cellhide{ + display: none !important; +} +.center{ + text-align:center; +} +.fontsize{ + font-size:14px; +} +.toolbar-space { + flex: 0.01 0 auto; +} diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.spec.ts b/ng6-seed/src/app/sales-pd/sales-pd.component.spec.ts new file mode 100644 index 000000000..60fd919b6 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SalesPdComponent } from './sales-pd.component'; + +describe('SalesPdComponent', () => { + let component: SalesPdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SalesPdComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SalesPdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd.component.ts new file mode 100644 index 000000000..8699d8e42 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.ts @@ -0,0 +1,77 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; +import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service'; + +@Component({ + selector: 'app-sales-pd', + templateUrl: './sales-pd.component.html', + styleUrls: ['./sales-pd.component.scss'] +}) +export class SalesPdComponent implements OnInit { + + public dataLengthTab4: number; + public dataSourceTab4 = new MatTableDataSource(); + + displayedColumns = ['SalesPdId','Applicant Name','Short Name','Abbr','Officer Name','Create On','Action']; + + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + + // data source variable details + salesPdData:any[] = []; + + errorMessage:any[]=[]; + recordStatus: boolean; + + // pagination variable details + length = 5; + pageIndex = 0; + pageSize = 10; + pageEvent: PageEvent; + todaydate:Date = new Date(); + + constructor(private _pdSales: PdTrigerService) { } + + ngOnInit() { + this.loadSalesPDDetails() + } + + + + loadSalesPDDetails() { + this._pdSales.getSalesPd() + .subscribe( + data => { + if (data.status == 200) { + this.salesPdData = data.records; + this.dataLengthTab4 = data.records.length; + this.dataSourceTab4.data = this.salesPdData; + } + else{ + this.salesPdData=[]; + this.dataLengthTab4= null; + this.recordStatus=true; + } + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + alert(error.html_format); + }); + + + } + pageChange(e) { + console.log(e); + } + ngAfterViewInit() { + this.dataSourceTab4.paginator = this.paginator; + this.dataSourceTab4.sort = this.sort; + } + + applyFilter(filterValue: string) { + this.dataSourceTab4.filter = filterValue.trim().toLowerCase(); + } + +} diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index 7e504706f..96d0ce804 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -482,8 +482,8 @@ callrole(flag,type,usersData){ resetAdminPassword(){ - - this.AWS.adminSetpassword(this.users.localUserId.aws_name).subscribe(res=>{ + // console.log(this.types); + this.AWS.adminSetpassword(this.users.localUserId.aws_name,this.types[0].name).subscribe(res=>{ if(res == 'success'){ // this.notifier.notify('success','Please Fill all the Fields') diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts index 3838f8a2d..4dbb1f212 100755 --- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -59,6 +59,12 @@ const HORIZONTALMENUITEMS = [ type:'link', icon:'done_all', }, + { + state:'sales-pd-list', + name:'Sales PD', + type:'link', + icon:'work', + }, { state:'reports', name:'Reports', diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 1aabe360c..72843ff5c 100755 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -100,6 +100,12 @@ const MENUITEMS : Menu[] = [ type:'link', icon:'done_all', }, + { + state:'sales-pd-list', + name:'Sales PD', + type:'link', + icon:'work', + }, { state:'reports', name:'Reports',