Changes and Issues Fixes : ps

This commit is contained in:
saravanakumarkandasami 2019-05-18 19:58:58 +05:30
parent 1fb367faf3
commit 1091ba7871
31 changed files with 112 additions and 51 deletions

View File

@ -1 +1 @@
{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 706\n// module chunks = 0"],"sourceRoot":""}
{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 707\n// module chunks = 0"],"sourceRoot":""}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
#Thu May 16 20:11:06 IST 2019
#Sat May 18 10:35:27 IST 2019
base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
path.0=classes.dex
renamed.0=classes.dex

View File

@ -1,5 +1,5 @@
#Internal package file, do not edit.
#Thu May 16 20:11:07 IST 2019
#Sat May 18 10:35:27 IST 2019
60.set=ASSET
52.set=ASSET
53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -113,6 +113,7 @@ import { PdQuestionBusinessGroupPage } from '../pages/pd-question/pd-question-bu
import { PdQuestionBusinessAssetsPage } from '../pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets'
import {PdQuestionBusinessBankingPage} from '../pages/pd-question/pd-question-business-group/pd-question-business-banking/pd-question-business-banking'
import { PdPipe } from '../pipes/pd/pd';
import { SearchRelationPipe } from '../pipes/search-relation/search-relation';
import { PdQuestionAssessedBusinessIncomePage } from '../pages/pd-question/pd-question-assessed-business-income/pd-question-assessed-business-income';
import { PdGeneralImagesPage } from '../pages/pd-general-images/pd-general-images';
import { PdQuestionSalaryInfoPage } from '../pages/pd-question/pd-question-salary-info/pd-question-salary-info';
@ -130,6 +131,7 @@ import {PdQuestionRentalDashPage} from '../pages/pd-question/pd-question-rental-
import {CacheModule} from 'ionic-cache'
import { CompleteListPage } from '../pages/complete-list/complete-list';
@NgModule({
declarations: [
MyApp,
@ -301,7 +303,7 @@ import { CompleteListPage } from '../pages/complete-list/complete-list';
AwsServiceProvider,
QuestionCategoryProvider,
CameraProvider,Camera,
PdPipe,LocationAccuracy,
PdPipe,SearchRelationPipe,LocationAccuracy,
LoadingProvider,Geolocation,
DatabaseProvider,
StorageProvider

View File

@ -221,7 +221,7 @@ checkOtpAccess:boolean = false;
{
this.checkOtpAccess=true;
}
console.log("address allocated",this.address_allocated_data);
console.log("address allocated",this.address_allocated_data);
console.log(this.other_applicant);
if(this.address_allocated_data != '' && this.address_allocated_data !=undefined){
let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm');
@ -643,6 +643,6 @@ else{
}
inWords(e){
return this.constant.convertNumberToWords(+e);
return this.constant.convertNumberToWords(+e)+' Only';
}
}

View File

@ -166,11 +166,11 @@
<div fxLayout="column" fxLayoutAlign="start stretch">
<label>Approximate Vintage of the Account</label>
<mat-form-field style="width: 100%">
<input type="number" matInput placeholder="Year" name="vintage" formControlName="vintage_year" (change)="checkWithExistBusinessYear(itemrow,$event.target.value,i)">
<input type="number" matInput placeholder="No of Years" name="vintage" formControlName="vintage_year" (change)="checkWithExistBusinessYear(itemrow,$event.target.value,i)">
<mat-hint style="font-size: 12px;color:red">{{yearErrorMessage[i]}}</mat-hint>
</mat-form-field>
<mat-form-field style="width: 100%">
<input type="number" matInput placeholder="Month" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(itemrow,$event.target.value,i)">
<input type="number" matInput placeholder="No of Months" name="vintage" formControlName="vintage_month" (change)="ConvertMonthintoYear(itemrow,$event.target.value,i)">
<mat-hint style="font-size: 12px;color:red">{{monthErrorMessage[i]}}</mat-hint>
</mat-form-field>
</div>

View File

@ -1364,8 +1364,6 @@
</mat-card-header>
<mat-card-content>
<mat-form-field style="width:100%;">
<input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales" min="0" max="100">
<!-- <mat-error *ngIf="businessForm.controls['export_sale_of_total_sales'].hasError('min') || businessForm.controls['export_sale_of_total_sales'].hasError('max') ">Please enter a value between 0 and 100</mat-error> -->
<input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales" min="0" max="100">
<mat-error *ngIf="businessForm.controls['export_sale_of_total_sales'].hasError('min') ">Please enter a value between 0 and 100</mat-error>
<mat-error *ngIf="businessForm.controls['export_sale_of_total_sales'].hasError('max') ">Please enter a value between 0 and 100</mat-error>

View File

@ -1715,12 +1715,15 @@ createPOSMachinesDetails(data){
submitDetails() {
if(this.businessForm.controls['export_sale_of_total_sales']){
if(this.businessForm.controls['export_sale_of_total_sales'].value > 100 || this.businessForm.controls['export_sale_of_total_sales'].value < 0){
this.toast.pdTriggerappmessage("Please enter a value between 0 and 100");
return;
}
if(this.businessForm.controls['export_sale_of_total_sales'].invalid){
this.toast.pdTriggerappmessage("Please enter a value between 0 and 100 in export sale as a % total sales");
return;
}
// if(this.businessForm.controls['export_sale_of_total_sales']){
// if(this.businessForm.controls['export_sale_of_total_sales'].value > 100 || this.businessForm.controls['export_sale_of_total_sales'].value < 0){
// }
// }
if(this.EntityTypeFlag == true){
let control: any = <FormArray>this.businessForm.controls['partners'];

View File

@ -148,9 +148,9 @@
</div>
<div *ngIf="i>0">
<mat-form-field>
<input matInput placeholder="Profit Variation from Previous Year in %" autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" placeholder="Profit Variation from Previous Year in %" formControlName="financial_variation" (keypress)="keyPress($event)" readonly>
<input matInput placeholder="Profit Variation from Previous Year in %" autocomplete="off" [ngClass]="details.get('financial_variation').value > 0 ? 'greenhighlight' : 'highlight'" placeholder="Profit Variation from Previous Year in %" formControlName="financial_variation" (keypress)="keyPress($event)" readonly>
</mat-form-field>
<p class="info" *ngIf="i != 0 && details.get('financial_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}">
<p class="info" *ngIf="i != 0 && details.get('financial_variation').value != '' ">
<span *ngIf="details.get('financial_variation').value == 0">
No difference in Profit in FY <i> {{details.get('financial_year').value}} </i> over Profit in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i>
</span>
@ -164,10 +164,10 @@
<!-- <mat-label>Variation of Profit % over sales</mat-label>
&nbsp;&nbsp;- -->
<mat-form-field>
<input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}"
<input matInput autocomplete="off" [ngClass]="details.get('financial_profit_to_sale_variation').value > 0 ? 'greenhighlight' : 'highlight'" placeholder="Profit Variation from Previous Year in %"
placeholder="Variation of Profit/Loss to Sales % from Previous Year" formControlName="financial_profit_to_sale_variation" (keypress)="keyPress($event)" readonly>
</mat-form-field>
<p class="info" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}">
<p class="info" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' " >
<span *ngIf="details.get('financial_profit_to_sale_variation').value == 0">
No difference in Profit/Loss to sales % in FY <i> {{details.get('financial_year').value}} </i> over Profit/Loss to sales % in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i>
</span>

View File

@ -77,12 +77,14 @@ export class PdQuestionFinancialInfoPage {
this.initFinancialForm()
this.qustCat.getTypeofActivityForSuppliedInfoForm(this.pdDetails.pd_id, this.company_id).subscribe(data => {
if (data.dataStatus) {
this.temparray.push(data.records);
if(this.temparray.length == 1){
if (data.dataStatus) {
if(data.records.type_of_activity.length == 1){
let bussiness_service_datas = data.records.type_of_activity.filter(data => { if (data.type_of_activity_id == 5) { return data } }).map(data => [...data.prodcuts]);
this.ServiceDataAvailability = bussiness_service_datas.length>0 ? true : false;
}
else{
this.ServiceDataAvailability = false;
}
}
})
// console.log("ld",this.financialForm.controls['estimated_value'])
@ -735,13 +737,19 @@ changeWorkingCapitalFacilities(event: any) {
if(annual_sale != ''){
let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin);
console.log('a',a);
let b = parseFloat(a.toFixed(3)) / (temp_prev_profit_margin != 0 ? Math.abs(parseFloat(temp_prev_profit_margin.toFixed(2))) : Math.abs(parseFloat(temp_prev_loss_margin.toFixed(2))));
console.log('b',b);
let c = b * 100;
console.log('c',c);
let current_margin : number =(profit_margin != '' ? parseFloat(profit_margin.toFixed(2)) :
loss_margin != '' ? parseFloat(loss_margin.toFixed(2)) : 0.00 )
let pre_margin : number = (temp_prev_profit_margin != 0 ? parseFloat(temp_prev_profit_margin.toFixed(2)) :
temp_prev_loss_margin != 0 ? parseFloat(temp_prev_loss_margin.toFixed(2)) : 0.00 );
let absoulte_value_of_pre_margin : number = (temp_prev_profit_margin != 0 ? Math.abs(parseFloat(temp_prev_profit_margin.toFixed(2))) : temp_prev_loss_margin != 0 ? Math.abs(parseFloat(temp_prev_loss_margin.toFixed(2))) : 0.00 );
let a: number = current_margin - pre_margin;
let b: number = parseFloat(a.toFixed(2)) / absoulte_value_of_pre_margin;
let c: number = b * 100;
// let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin);
// let b = parseFloat(a.toFixed(3)) / (temp_prev_profit_margin != 0 ? Math.abs(parseFloat(temp_prev_profit_margin.toFixed(2))) : Math.abs(parseFloat(temp_prev_loss_margin.toFixed(2))));
// let c = b * 100;
let final_percent = c != Infinity ? !(Number.isNaN(c)) ? c != -Infinity ? c.toFixed(2) : 0 : 0 : 0 ;

View File

@ -402,21 +402,29 @@
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%">
<mat-select formControlName="relationship" placeholder="Relation">
<mat-select formControlName="relationship" placeholder="Relation" (selectionChange)="updatePersonalRelation(i)">
<mat-option>Select</mat-option>
<mat-option [value]="member.relationship_id" *ngFor="let member of relationShipList">{{member.name + '
Of' | titlecase}}</mat-option>
<mat-option value="0"> Not Applicable </mat-option>
</mat-select>
</mat-form-field>
<!-- | searchRelation : { currentApplicantID:generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id, existRelationList:generalForm.controls.persons_with_relationships.value}" -->
<!-- {{generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id}} {{ generalForm.controls.persons_with_relationships.value }} -->
<mat-form-field style="width:100%" *ngIf="relation.controls['relationship'].value != 0">
<mat-select placeholder="RelationTo" formControlName="relation_to">
<mat-select placeholder="RelationTo" formControlName="relation_to" >
<mat-option>Select</mat-option>
<mat-option *ngFor="let appc of individualsList" [disabled]="rel.applicant_name == relation.controls['applicant_name'].value"
[value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
<mat-option value="0"> Not Applicable </mat-option>
</mat-select>
<!-- <mat-select placeholder="RelationTo" formControlName="relation_to">
<mat-option>Select</mat-option>
<mat-option [value]="rel.pd_co_applicant_id" *ngFor="let rel of individualsList ">{{rel.applicant_name
<mat-option [value]="rel.pd_co_applicant_id" *ngFor="let rel of individualsList " [disabled]="rel.applicant_name == relation.controls['applicant_name'].value">{{rel.applicant_name
| titlecase}}</mat-option>
<mat-option value="0"> Not Applicable </mat-option>
</mat-select>
</mat-select> -->
</mat-form-field>
</mat-card-content>
</div>

View File

@ -6,7 +6,7 @@ import { ToastProvider } from '../../../providers/common-provider/toast';
import { FormGroup, FormBuilder,FormArray,Validator, Validators } from '@angular/forms';
import { PdQuestionGeneralOtherApplicantPage } from './pd-question-general-other-applicant/pd-question-general-other-applicant';
import { DatePipe} from '@angular/common';
import {PdPipe} from './../../../pipes/pd/pd';
import { SearchRelationPipe } from '../../../pipes/search-relation/search-relation';
import { removeSummaryDuplicates } from '@angular/compiler';
import { DataSource } from '@angular/cdk/table';
import { MatSelect } from '@angular/material';
@ -26,7 +26,7 @@ import {ConstantsProvider} from '../../../providers/constants/constants'
@Component({
selector: 'page-pd-question-general-info',
templateUrl: 'pd-question-general-info.html',
providers:[PdPipe],
providers:[SearchRelationPipe],
})
export class PdQuestionGeneralInfoPage {
pipe=new DatePipe('en-US');
@ -162,7 +162,7 @@ export class PdQuestionGeneralInfoPage {
ionViewDidLoad() {
// this.pd_applicants_details.pop();
console.log("%cionViewDidLoad, PdQuestionGeneralInfoPage","font-size:300%;color:purple;font-weight:bold;font-family:Mongoose;");
console.info("%cionViewDidLoad, PdQuestionGeneralInfoPage","font-size:100%;color:purple;font-weight:bold;font-family:Mongoose;");
this.getGeneralForm()
this.getPDImages();
@ -249,7 +249,7 @@ export class PdQuestionGeneralInfoPage {
applicant_title_name:[val.applicant_title_name],
applicant_name:[val.applicant_name],
is_person_met:val.is_person_met,
is_person_met_pic :val.is_person_met_pic,
is_person_met_pic :val.is_person_met_pic != null ? val.is_person_met_pic : '',
is_person_met_id_proof : val.is_person_met_id_proof,
is_applicant:val.is_applicant,
age:[val.age],
@ -278,7 +278,7 @@ export class PdQuestionGeneralInfoPage {
applicant_title_name:[val.applicant_title_name],
applicant_name:[val.applicant_name],
is_person_met:val.is_person_met,
is_person_met_pic:val.is_person_met_pic,
is_person_met_pic:val.is_person_met_pic != null ? val.is_person_met_pic : '',
is_person_met_id_proof:val.is_person_met_id_proof,
is_applicant:val.is_applicant,
age:[val.age],
@ -423,7 +423,7 @@ export class PdQuestionGeneralInfoPage {
applicant_name:[data.applicant_name,Validators.required],
is_person_met:data.is_person_met,
is_person_met_pic : data.is_person_met_pic,
is_person_met_pic : data.is_person_met_pic != null ? data.is_person_met_pic : '' ,
is_person_met_id_proof : data.is_person_met_id_proof,
is_applicant:data.is_applicant,
age:[data.age],
@ -475,13 +475,17 @@ export class PdQuestionGeneralInfoPage {
}
}
initPersonRelationship(value):void{
console.log('From Genral Form - value are',value)
const control=<FormArray>this.generalForm.controls['persons_with_relationships'];
if(value=='')
{
console.log('fulldata',this.fulldata);
console.log('control.length+1',control.length+1);
console.log('full data',this.fulldata[control.length]);
let formData:FormGroup=this.fb.group({
pd_co_applicant_id:[''],
applicant_name:[''],
applicant_name:[this.fulldata[control.length].applicant_name],
relationship:[''],
relation_to:[''],
individuals_order_id:[control.length+1],
@ -624,7 +628,7 @@ dataobj:any;
applicant_title_name:val.applicant_title_name,
applicant_name:val.applicant_name,
is_person_met:val.is_person_met,
is_person_met_pic : val.is_person_met_pic,
is_person_met_pic : val.is_person_met_pic != null ? val.is_person_met_pic : '',
is_person_met_id_proof: val.is_person_met_id_proof,
is_applicant:val.is_applicant,
age:val.age,
@ -724,7 +728,7 @@ dataobj:any;
this.toast.pdTriggerappmessage("Please Fill all Mandatory field Marked with '*'");
}
else{
this.initlistv(this.generalForm.value.individuals,'ins')
this.initlistv(this.generalForm.value.individuals,'ins');
this.initPersonRelationship('');
}
}
@ -907,6 +911,12 @@ dataobj:any;
}
// update personal relation
updatePersonalRelation(indexVal) {
let control: any = <FormArray>this.generalForm.controls['persons_with_relationships'];
control.controls[indexVal].value.relationship == 0 ? control.controls[indexVal].controls['relation_to'].setValue('') : control.controls[indexVal].controls['relation_to'].setValue(control.controls[indexVal].value.relation_to);
}
createApplicantRelation(elementValue: any) {
return this.fb.group({

View File

@ -1,11 +1,14 @@
import { NgModule } from '@angular/core';
import { PdPipe } from './pd/pd';
import { RupeeCurrencyFormatPipe } from './rupee-currency-format/rupee-currency-format';
import { SearchRelationPipe } from './search-relation/search-relation';
@NgModule({
declarations: [PdPipe,
],
imports: [],
exports: [PdPipe,
]
})
export class PipesModule {}

View File

@ -0,0 +1,29 @@
import { Pipe, PipeTransform } from '@angular/core';
/**
* Generated class for the SearchRelationPipe pipe.
*
* See https://angular.io/api/core/Pipe for more info on Angular Pipes.
*/
@Pipe({
name: 'searchRelation',
})
export class SearchRelationPipe implements PipeTransform {
/**
* Takes a value and makes it lowercase.
*/
transform(value: any, searchItem:any): any {
let findExistIndex = searchItem.existRelationList.filter(sVal=>sVal.relation_to==searchItem.currentApplicantID);
if(findExistIndex.length>0){
let check = value.filter(function(fVal){
return !findExistIndex.some(function(sVal){
return fVal.pd_co_applicant_id==searchItem.currentApplicantID || fVal.pd_co_applicant_id == sVal.pd_co_applicant_id;
});
})
return check;
}
else {
return value.filter(fVal=>fVal.pd_co_applicant_id!=searchItem.currentApplicantID);
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.