Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge : kms

Browse Source
This commit is contained in:
gandhimathi 2018-10-30 17:35:42 +05:30
parent ffc21fd516
commit f325720eb5
9 changed files with 2038 additions and 2002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3616
ng6-seed/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

189
ng6-seed/src/app/dashboard/dashboard.component.html
View File

@ -1,97 +1,96 @@
<div class="pad-wrap"> <div class="pad-wrap">
<!--<div fxLayout="row wrap"> <!--<div fxLayout="row wrap">
<div fxFlex.gt-sm="100" fxFlex.gt-xs="100" fxFlex="100"> <div fxFlex.gt-sm="100" fxFlex.gt-xs="100" fxFlex="100">
<mat-card> <mat-card>
<mat-card-title>Today's Status</mat-card-title> <mat-card-title>Today's Status</mat-card-title>
<mat-card-subtitle></mat-card-subtitle> <mat-card-subtitle></mat-card-subtitle>
<hr> <hr>
<mat-card-content> <mat-card-content>
<div class="w-100 h-300px"> <div class="w-100 h-300px">
<ngx-charts-bar-horizontal-stacked [scheme]="colorScheme" [results]="multi" [gradient]="gradient" [xAxis]="showXAxis" [yAxis]="showYAxis" [legend]="showLegend" [showXAxisLabel]="showXAxisLabel" [showYAxisLabel]="showYAxisLabel" [xAxisLabel]="yAxisLabel" [yAxisLabel]="xAxisLabel" width="832" height="200"> <ngx-charts-bar-horizontal-stacked [scheme]="colorScheme" [results]="multi" [gradient]="gradient" [xAxis]="showXAxis" [yAxis]="showYAxis" [legend]="showLegend" [showXAxisLabel]="showXAxisLabel" [showYAxisLabel]="showYAxisLabel" [xAxisLabel]="yAxisLabel" [yAxisLabel]="xAxisLabel" width="832" height="200">
</ngx-charts-bar-horizontal-stacked> </ngx-charts-bar-horizontal-stacked>
</div> </div>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>
</div> --> </div> -->
<div fxLayout="row"> <div fxLayout="row">
<div fxFlex="77%"> <div fxFlex="77%">
<mat-card> <mat-card>
<mat-card-title>Today's Details</mat-card-title> <mat-card-title>Today's Details</mat-card-title>
<mat-card-subtitle></mat-card-subtitle>
<hr> <mat-card-content>
<mat-card-content> <div class="w-100 h-300px">
<div class="w-100 h-300px"> <span>Full</span>
<span>Full</span> <ngx-charts-advanced-pie-chart [view]="view" [scheme]="colorScheme" [results]="full" [gradient]="gradient" >
<ngx-charts-advanced-pie-chart [view]="view" [scheme]="colorScheme" [results]="full" [gradient]="gradient" > </ngx-charts-advanced-pie-chart>
</ngx-charts-advanced-pie-chart> </div>
</div>
<div class="w-100 h-300px">
<span>Semi</span>
<ngx-charts-advanced-pie-chart [view]="view" [scheme]="colorScheme" [results]="smart" [gradient]="gradient" >
</ngx-charts-advanced-pie-chart>
</div>
<div class="w-100 h-300px">
<span>Tele</span>
<ngx-charts-advanced-pie-chart [view]="view" [scheme]="colorScheme" [results]="tele" [gradient]="gradient" >
</ngx-charts-advanced-pie-chart>
</div>
</mat-card-content>
</mat-card>
</div>
<div fxFlex="23%" >
<mat-card>
<mat-tab-group >
<mat-tab>
<ng-template mat-tab-label>Lenderwise</ng-template>
<mat-card-content>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="lenderpd">
<mat-list-item>
<h3 mat-line> {{item.lendername}} / {{item.billingaddr}} </h3>
<p mat-line> Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card-content>
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>CityWise</ng-template>
<mat-card-content>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="citywisepd">
<mat-list-item>
<h3 mat-line> {{item.cityname}} </h3>
<p mat-line> Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}</p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card-content>
</mat-tab>
<mat-tab>
<ng-template mat-tab-label><span fxFlex="80">Alert</span> <span fxFlex="20"><mat-icon color="primary"> warning</mat-icon></span></ng-template>
<mat-card-content>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="message">
<mat-list-item>
<!--<img mat-list-avatar src="{{item.photo}}" alt="">-->
<h3 mat-line> {{item.applicantname}} </h3>
<p mat-line> {{item.applicantid}}</p>
<p mat-line> {{item.lendername}} - {{item.status}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card-content>
</mat-tab>
</mat-tab-group>
</mat-card>
</div>
</div>
</div> <div class="w-100 h-300px">
<span>Smart</span>
<ngx-charts-advanced-pie-chart [view]="view" [scheme]="colorScheme" [results]="smart" [gradient]="gradient" >
</ngx-charts-advanced-pie-chart>
</div>
<div class="w-100 h-300px">
<span>Tele</span>
<ngx-charts-advanced-pie-chart [view]="view" [scheme]="colorScheme" [results]="tele" [gradient]="gradient" >
</ngx-charts-advanced-pie-chart>
</div>
</mat-card-content>
</mat-card>
</div>
<div fxFlex="23%" fxLayout="row wrap">
<div fxFlex="100">
<mat-card>
<mat-card-title><span fxFlex="80">Alert</span> <span fxFlex="20"><mat-icon> warning</mat-icon></span></mat-card-title>
<mat-card-content>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="message">
<mat-list-item>
<!--<img mat-list-avatar src="{{item.photo}}" alt="">-->
<h3 mat-line> {{item.applicantname}} </h3>
<p mat-line> {{item.applicantid}}</p>
<p mat-line> {{item.lendername}} - {{item.status}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card-content>
</mat-card>
</div>
<div fxFlex="100">
<mat-card>
<mat-card-title>Lenderwise</mat-card-title>
<mat-card-content>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="lenderpd">
<mat-list-item>
<h3 mat-line> {{item.lendername}} / {{item.billingaddr}} </h3>
<p mat-line> Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}} </p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card-content>
</mat-card>
</div>
<div fxFlex="100">
<mat-card>
<mat-card-title>CityWise</mat-card-title>
<mat-card-content>
<mat-list>
<ng-template let-item let-last="last" ngFor [ngForOf]="citywisepd">
<mat-list-item>
<h3 mat-line> {{item.cityname}} </h3>
<p mat-line> Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}</p>
</mat-list-item>
</ng-template>
</mat-list>
</mat-card-content>
</mat-card>
</div>
</div>
</div>
</div>

6
ng6-seed/src/app/dashboard/dashboard.component.scss
View File

@ -2,6 +2,12 @@ $red: #f5515f;
$blue: #05abe0; $blue: #05abe0;
$grey: #343434; $grey: #343434;
$p: 12px; $p: 12px;
mat-card-title{
background-color:#f44336 !important;
color:#fff;
padding-bottom: 1rem;
margin-bottom: 0px;
}
.profile { .profile {
position: relative; position: relative;
width: 100%; width: 100%;

78
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
View File

@ -3,7 +3,7 @@
<div class="mb-2" > <div class="mb-2" >
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header"> <div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="75"> <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="75">
<h4>{{master.lender_full_name}} - {{master.lender_applicant_id}}</h4> <h4>{{master.lender_full_name}} <span *ngIf="master.lender_applicant_id"> - </span> {{master.lender_applicant_id}}</h4>
{{master.pd_date_of_initiation}} {{master.pd_date_of_initiation}}
</div> </div>
<div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1" fxFlex="25" style="text-align:right;" > <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1" fxFlex="25" style="text-align:right;" >
@ -36,10 +36,10 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<p *ngIf="master.product_name">{{master.product_name}} / {{master.subproduct_name}}</p> <p *ngIf="master.product_name">{{master.product_name}}<span *ngIf="master.subproduct_name"> / </span> {{master.subproduct_name}}</p>
<p *ngIf="master.pd_type_name"><span>{{master.pd_type_name}}</span> / <span *ngIf="master.loan_amount" class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{master.loan_amount}}</span></p> <p *ngIf="master.pd_type_name"><span>{{master.pd_type_name}}</span> <span *ngIf="master.loan_amount" class="hover-icon"> / <i class="fa-1x fa fa-rupee">&nbsp;</i>{{master.loan_amount}}</span></p>
<p><span>{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}</span></p> <p><span>{{master.addressline1}}<span *ngIf="master.addressline2"> , </span>{{master.addressline2}} <span *ngIf="master.addressline3"> , </span>{{master.addressline3}}</span></p>
<p><span>{{master.pd_status}} - {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}</span></p> <p><span>{{master.pd_status}} <span *ngIf="master.updatedon"> - </span>{{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}</span></p>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -64,52 +64,36 @@
<i class="fa-1x fa fa-phone"></i> <i class="fa-1x fa fa-phone"></i>
&nbsp;{{applicant.mobile_no}} </span> <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant</span> &nbsp;{{applicant.mobile_no}} </span> <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant</span>
<ng-template #codetails>&nbsp;&nbsp;&nbsp;<span>{{applicant.relation_name}}</span></ng-template> <ng-template #codetails>&nbsp;&nbsp;&nbsp;<span>{{applicant.relation_name}}</span></ng-template>
</p> </p>
</mat-list-item>
</mat-list-item>
</mat-list> </mat-list>
</mat-card-content> </mat-card-content>
<ng-template #noApplicant><mat-card-content><p>No Applicant</p></mat-card-content></ng-template>
<ng-template #noApplicant><mat-card-content><p>No Applicant</p></mat-card-content></ng-template> </mat-card>
</mat-card>
</div> </div>
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
<!-- pd documents card --> <!-- pd documents card -->
<mat-card class="minheight"> <mat-expansion-panel *ngIf="pdDocumentsData.length>0; else nodocument">
<!-- <div class="cardEdit"> <mat-expansion-panel-header>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button> <mat-panel-title class="text-xs-left">
</div> --> <h6 class="mt-0">Documents</h6>
<mat-card-header> </mat-panel-title>
<mat-card-title>Documents</mat-card-title> </mat-expansion-panel-header>
<!-- <mat-card-subtitle><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</mat-card-subtitle> --> <mat-list *ngFor="let documents of pdDocumentsData">
</mat-card-header> <mat-list-item>
<mat-card-content *ngIf="pdDocumentsData.length>0; else nodocument"> <p><span><i class="fa-1x fa fa-file"></i> {{documents.pd_document_title}} </span></p>
<mat-list *ngFor="let documents of pdDocumentsData"> <!---- <span class="mb-2 text-center hover-icon"> &nbsp;{{documents.pd_document_name}} </span> -->
<mat-list-item> </mat-list-item>
<p><span> </mat-list>
{{documents.pd_document_title}} </span> &nbsp;&nbsp;&nbsp;<span class="mb-2 text-center hover-icon"> </mat-expansion-panel>
<i class="fa-1x fa fa-file"></i> <ng-template #nodocument>
&nbsp;{{documents.pd_document_name}} </span> <mat-card>
</p> <mat-card-content><p>No Document</p></mat-card-content>
</mat-list-item> </mat-card>
</ng-template>
</mat-list> </div>
</mat-card-content> <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
<ng-template #nodocument><mat-card-content><p>No Document</p></mat-card-content></ng-template>
</mat-card>
</div>
<div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<!--pd logs card --> <!--pd logs card -->
<mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory"> <mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -120,7 +104,7 @@
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-list class="m-gap p-gap" *ngFor="let masterHistory of masterPdLogsData"> <mat-list class="m-gap p-gap" *ngFor="let masterHistory of masterPdLogsData">
<mat-list-item> <mat-list-item>
<p>{{masterHistory}}</p> <span>{{masterHistory}}</span>
</mat-list-item> </mat-list-item>

46
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
View File

@ -83,33 +83,25 @@
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap"> <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
<!-- pd documents card --> <!-- pd documents card -->
<mat-card class="minheight"> <mat-expansion-panel *ngIf="pdDocumentsData.length>0; else nodocument">
<!-- <div class="cardEdit"> <mat-expansion-panel-header>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button> <mat-panel-title class="text-xs-left">
</div> --> <h6 class="mt-0"> Documents</h6>
<mat-card-header> </mat-panel-title>
<mat-card-title>Documents</mat-card-title>
<!-- <mat-card-subtitle><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</mat-card-subtitle> --> </mat-expansion-panel-header>
</mat-card-header> <mat-list *ngFor="let documents of pdDocumentsData">
<mat-card-content *ngIf="pdDocumentsData.length>0; else nodocument"> <mat-list-item>
<mat-list *ngFor="let documents of pdDocumentsData"> <p><span>
<mat-list-item> <i class="fa-1x fa fa-file"></i> {{documents.pd_document_title}} </span>
<p><span> <!----<span class="mb-2 text-center hover-icon"> {{documents.pd_document_name}} </span> -->
{{documents.pd_document_title}} </span> &nbsp;&nbsp;&nbsp;<span class="mb-2 text-center hover-icon"> </p>
<i class="fa-1x fa fa-file"></i> </mat-list-item>
&nbsp;{{documents.pd_document_name}} </span> </mat-list>
</p> </mat-expansion-panel>
</mat-list-item> <ng-template #nodocument><mat-card><mat-card-content><p>No Document</p></mat-card-content> </mat-card></ng-template>
</mat-list>
</mat-card-content>
<ng-template #nodocument><mat-card-content><p>No Document</p></mat-card-content></ng-template>
</mat-card>
</div> </div>
<div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100"> <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
<!--pd logs card --> <!--pd logs card -->
<mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory"> <mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -120,7 +112,7 @@
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-list class="m-gap p-gap" *ngFor="let masterHistory of masterPdLogsData"> <mat-list class="m-gap p-gap" *ngFor="let masterHistory of masterPdLogsData">
<mat-list-item> <mat-list-item>
<p>{{masterHistory}}</p> <span>{{masterHistory}}</span>
</mat-list-item> </mat-list-item>

7
ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html
View File

@ -5,7 +5,7 @@
<h2 mat-dialog-title style="width: 50%;">Add New PD Team</h2> <h2 mat-dialog-title style="width: 50%;">Add New PD Team</h2>
<div style="width: 20%;"></div> <div style="width: 20%;"></div>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()" [color]="color"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()" type="button"><mat-icon>close</mat-icon></button>
</div> </div>
</div> </div>
@ -19,7 +19,8 @@
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="Lender" required formControlName="fk_lender"> <mat-select placeholder="Lender" required formControlName="fk_lender">
<mat-option *ngFor="let ld of lenderdatas" [value]="ld.entity_id" >{{ ld.short_name }} {{ ld.full_name }} </mat-option> <!-- <mat-option *ngFor="let ld of lenderdatas" [value]="ld.entity_id" >{{ ld.short_name }} {{ ld.full_name }} </mat-option> -->
<mat-option *ngFor="let ld of lenderdatas" [value]="ld.entity_id" (onSelectionChange)="onChangeEntityId($event)" >{{ ld.short_name }} {{ ld.full_name }} </mat-option>
</mat-select> </mat-select>
<!-- <mat-error *ngIf="f.fk_lender.hasError('required')" class="mat-text-warn">You must Select Lender Name.</mat-error> --> <!-- <mat-error *ngIf="f.fk_lender.hasError('required')" class="mat-text-warn">You must Select Lender Name.</mat-error> -->
<mat-error *ngIf="!_pdTeamForm.controls['fk_lender'].valid && _pdTeamForm.controls['fk_lender'].touched" class="mat-text-warn">Lender Name Requried.</mat-error> <mat-error *ngIf="!_pdTeamForm.controls['fk_lender'].valid && _pdTeamForm.controls['fk_lender'].touched" class="mat-text-warn">Lender Name Requried.</mat-error>
@ -30,7 +31,7 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="City" required formControlName="fk_city" multiple> <mat-select placeholder="City" required formControlName="fk_city" multiple>
<mat-option *ngFor="let cd of citydatas" [value]="cd.city_id" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option> <mat-option *ngFor="let cd of citydatas" [value]="cd?.city_id" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd?.name }} </mat-option>
</mat-select> </mat-select>
<!-- <mat-error *ngIf="f.fk_city.hasError('required')" class="mat-text-warn">You must Select Cities.</mat-error> --> <!-- <mat-error *ngIf="f.fk_city.hasError('required')" class="mat-text-warn">You must Select Cities.</mat-error> -->
<mat-error *ngIf="!_pdTeamForm.controls['fk_city'].valid && _pdTeamForm.controls['fk_city'].touched" class="mat-text-warn">City Name Requried.</mat-error> <mat-error *ngIf="!_pdTeamForm.controls['fk_city'].valid && _pdTeamForm.controls['fk_city'].touched" class="mat-text-warn">City Name Requried.</mat-error>

43
ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts
View File

@ -210,6 +210,33 @@ onChangeCustomerSegmentDatas($event){
// } // }
// } // }
onChangeEntityId($event){
//console.log($event);
let lenderId = $event.source.value;
this.CityValidation = [];
this.selectedCityDatas = [];
if(this._pdTeamForm.value['fk_city'] != null){
this.f.fk_city.setValue(null);
alert(this._pdTeamForm.value['fk_city']);
}
if($event.isUserInput != false){
//console.log(this.CityValidation,lenderId);
this._pdTeamService.getLenderData(lenderId).subscribe(
dataresult => {
if(dataresult.dataStatus == true) {
this.CityValidation = dataresult.records;
console.log(this.CityValidation);
}
}, error => this.errorMessage = <any> error);
}
}
onChangeCityDatas($event){ onChangeCityDatas($event){
var mycheck = 0 ; var mycheck = 0 ;
@ -219,14 +246,14 @@ onChangeCityDatas($event){
// console.log(cityName); // console.log(cityName);
// console.log($event.source.value); // console.log($event.source.value);
if($event.source._selected === true ){ if($event.source._selected == true ){
this._pdTeamService.getLenderData(lenderId).subscribe( // this._pdTeamService.getLenderData(lenderId).subscribe(
dataresult => { // dataresult => {
if(dataresult.dataStatus == true) { // if(dataresult.dataStatus == true) {
this.CityValidation = dataresult.records; // this.CityValidation = dataresult.records;
} // }
}, error => this.errorMessage = <any> error); // }, error => this.errorMessage = <any> error);
if(this.CityValidation != ''){ if(this.CityValidation != ''){
for(let data of this.CityValidation){ for(let data of this.CityValidation){
@ -242,7 +269,7 @@ onChangeCityDatas($event){
this.selectedCityDatas.push(cityName.name); this.selectedCityDatas.push(cityName.name);
} }
} }
else if($event.source._selected === false ){ else if($event.source._selected == false ){
$event.source._selected = false; $event.source._selected = false;
let index = this.selectedCityDatas.indexOf(cityName.name); let index = this.selectedCityDatas.indexOf(cityName.name);
this.selectedCityDatas.splice(index,1); this.selectedCityDatas.splice(index,1);

7
ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html
View File

@ -6,7 +6,7 @@
<div style="width: 20%;"></div> <div style="width: 20%;"></div>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> --> <!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" type="button" (click)="onNoClick()" [color]="color"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" type="button" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</div> </div>
</div> </div>
@ -19,8 +19,9 @@
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="Lender" required formControlName="fk_lender"> <mat-select placeholder="Lender" required formControlName="fk_lender" disabled="true">
<mat-option *ngFor="let ld of lenderdatas" [value]="ld.entity_id" >{{ ld.short_name }} {{ ld.full_name }} </mat-option> <!-- <mat-option *ngFor="let ld of lenderdatas" [value]="ld.entity_id" >{{ ld.short_name }} {{ ld.full_name }} </mat-option> -->
<mat-option *ngFor="let ld of lenderdatas" [value]="ld.entity_id" (onSelectionChange)="onChangeEntityId($event)" >{{ ld.short_name }} {{ ld.full_name }} </mat-option>
</mat-select> </mat-select>
<!-- <mat-error *ngIf="submitted && f.fk_lender.hasError('required')" class="mat-text-warn">You must Select Lender Name.</mat-error> --> <!-- <mat-error *ngIf="submitted && f.fk_lender.hasError('required')" class="mat-text-warn">You must Select Lender Name.</mat-error> -->
<mat-error *ngIf="!_pdTeamForm.controls['fk_lender'].valid && _pdTeamForm.controls['fk_lender'].touched" class="mat-text-warn">Lender Name Requried.</mat-error> <mat-error *ngIf="!_pdTeamForm.controls['fk_lender'].valid && _pdTeamForm.controls['fk_lender'].touched" class="mat-text-warn">Lender Name Requried.</mat-error>

48
ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts
View File

@ -25,6 +25,7 @@ export class PdTeamEditComponent implements OnInit {
private notifier: NotifierService; private notifier: NotifierService;
color = 'primary'; color = 'primary';
errorMessage:string; errorMessage:string;
lenderId:any;
//This "childMessage" to get the function or data from partent component //This "childMessage" to get the function or data from partent component
@Input() public childMessage: any; @Input() public childMessage: any;
@ -115,7 +116,15 @@ export class PdTeamEditComponent implements OnInit {
this.customerSegmentdatas = dataresult.records; this.customerSegmentdatas = dataresult.records;
this.customerSegmentdatas = this.customerSegmentdatas.filter(segment=>segment.isactive == 1 ); this.customerSegmentdatas = this.customerSegmentdatas.filter(segment=>segment.isactive == 1 );
} }
}, error => this.errorMessage = <any> error) }, error => this.errorMessage = <any> error);
this.lenderId = this._pdTeamForm.value['fk_lender'];
this._pdTeamService.getLenderData(this.lenderId).subscribe(
dataresult => {
if(dataresult.dataStatus == true){
this.CityValidation = dataresult.records;
}
}, error => this.errorMessage = <any> error);
} }
/** Pd Team Form Datas */ /** Pd Team Form Datas */
@ -266,6 +275,23 @@ export class PdTeamEditComponent implements OnInit {
// } // }
// } // }
onChangeEntityId($event){
//console.log($event);
let lenderId = $event.source.value;
this.CityValidation = [];
if($event.isUserInput != false){
//console.log(this.CityValidation,lenderId);
this._pdTeamService.getLenderData(lenderId).subscribe(
dataresult => {
if(dataresult.dataStatus == true) {
this.CityValidation = dataresult.records;
//console.log(this.CityValidation);
}
}, error => this.errorMessage = <any> error);
// console.log(this.CityValidation);
}
}
onChangeCityDatas($event){ onChangeCityDatas($event){
//console.log('inside the function Event'); //console.log('inside the function Event');
var mycheck = 0 ; var mycheck = 0 ;
@ -275,13 +301,13 @@ export class PdTeamEditComponent implements OnInit {
// console.log(cityName); // console.log(cityName);
// console.log($event.source.value); // console.log($event.source.value);
if($event.source._selected === true ){ if($event.source._selected == true ){
this._pdTeamService.getLenderData(lenderId).subscribe( // this._pdTeamService.getLenderData(lenderId).subscribe(
dataresult => { // dataresult => {
if(dataresult.dataStatus == true){ // if(dataresult.dataStatus == true){
this.CityValidation = dataresult.records; // this.CityValidation = dataresult.records;
} // }
}, error => this.errorMessage = <any> error); // }, error => this.errorMessage = <any> error);
if(this.CityValidation != ''){ if(this.CityValidation != ''){
for(let data of this.CityValidation){ for(let data of this.CityValidation){
@ -297,7 +323,7 @@ export class PdTeamEditComponent implements OnInit {
this.selectedCityDatas.push(cityName.name); this.selectedCityDatas.push(cityName.name);
} }
} }
else if($event.source._selected === false ){ else if($event.source._selected == false ){
console.log('Return False for city Selection Data'); console.log('Return False for city Selection Data');
let index = this.selectedCityDatas.indexOf(cityName.name); let index = this.selectedCityDatas.indexOf(cityName.name);
@ -310,10 +336,10 @@ export class PdTeamEditComponent implements OnInit {
dataresult => { dataresult => {
if (dataresult.dataStatus == true) { if (dataresult.dataStatus == true) {
data = dataresult.records; data = dataresult.records;
console.log('data',data); //console.log('data',data);
data = data.filter(pdteamcity=>pdteamcity.fk_city_id == $event.source.value); data = data.filter(pdteamcity=>pdteamcity.fk_city_id == $event.source.value);
data = data.filter(pdteamcity=>pdteamcity.fk_pdteam_id == this._pdTeamForm.value.pdteam_id)[0]; data = data.filter(pdteamcity=>pdteamcity.fk_pdteam_id == this._pdTeamForm.value.pdteam_id)[0];
console.log(data.pdteam_city_id); //console.log(data.pdteam_city_id);
this._pdTeamService.deletePDteamCity($event.source.value).subscribe(data=>{ this._pdTeamService.deletePDteamCity($event.source.value).subscribe(data=>{
if (dataresult.dataStatus == true) {//alert('Deleted'); if (dataresult.dataStatus == true) {//alert('Deleted');
let index = this.selectedCityDatas.indexOf(cityName.name); let index = this.selectedCityDatas.indexOf(cityName.name);