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

panding changes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-01-29 21:43:19 +05:30
parent 2d54caefe6
commit f47ec6b33b
11 changed files with 158 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ng6-seed/sineedge_prod_270119.zip Normal file
View File

Binary file not shown.

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
View File

@ -413,7 +413,6 @@ export class AddPdComponent implements OnInit, OnDestroy {
// common function for both draft and process pd // common function for both draft and process pd
submitPdDetails(formValue: any, status:string) { submitPdDetails(formValue: any, status:string) {
if(this._PDtriggerForm.invalid) { if(this._PDtriggerForm.invalid) {
this.validateAllFormFields(this._PDtriggerForm); this.validateAllFormFields(this._PDtriggerForm);
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
@ -458,7 +457,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
"addressline1":formValue.addressline1, "addressline1":formValue.addressline1,
"fk_city":formValue.fk_city, "fk_city":formValue.fk_city,
"fk_state":formValue.fk_state, "fk_state":formValue.fk_state,
"pincode":formValue.pincode , "pincode":formValue.pincode,
"other_pincode":formValue.other_pincode , "other_pincode":formValue.other_pincode ,
"remarks":formValue.remarks, "remarks":formValue.remarks,
"pd_status": status, "pd_status": status,
@ -509,6 +508,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
if(pd_applicant_details.length>0){ if(pd_applicant_details.length>0){
pd_form.append("pd_applicant_details",JSON.stringify(pd_applicant_details)) pd_form.append("pd_applicant_details",JSON.stringify(pd_applicant_details))
} }
pd_form.append("pd_document_titles",JSON.stringify(AllFilesObj)) pd_form.append("pd_document_titles",JSON.stringify(AllFilesObj))
if(formValue.addtional_requirements.length > 0){ if(formValue.addtional_requirements.length > 0){
pd_form.append("addtional_requirements",JSON.stringify(formValue.addtional_requirements)) pd_form.append("addtional_requirements",JSON.stringify(formValue.addtional_requirements))

12
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
View File

@ -55,10 +55,16 @@ export class EditPdApplicantComponent implements OnInit {
} }
loadApplicantFormData() { loadApplicantFormData() {
console.log('loadApplicantFormData',this.mainApplicantData[0].landline); let stdcode;
let landline;
if(this.mainApplicantData[0].landline != null){
let stdcodesearch = this.mainApplicantData[0].landline.search("-"); let stdcodesearch = this.mainApplicantData[0].landline.search("-");
let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch) ; stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch) ;
let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8) ; landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8) ;
}else{
stdcode = '';
landline = '';
}
this._EditApplicantForm = this._fb.group({ this._EditApplicantForm = this._fb.group({
fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id], fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id],

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
View File

@ -149,6 +149,9 @@ export class EditPdMasterComponent implements OnInit {
} }
this.getCityList(this.data.records.fk_state); this.getCityList(this.data.records.fk_state);
// let getpincodeid = this.data.records.pincode != '' ? this.data.records.pincode != null ? (this.pincodeList.filter(data => data.pincode == this.data.records.pincode).pincode_id)
// : this.data.records.pincode
// : this.data.records.pincode;
this._EditPDtriggerForm = this._fb.group({ this._EditPDtriggerForm = this._fb.group({
pd_id: [this.data.records.pd_id], pd_id: [this.data.records.pd_id],
@ -171,6 +174,11 @@ export class EditPdMasterComponent implements OnInit {
other_pincode:[this.data.records.other_pincode], other_pincode:[this.data.records.other_pincode],
remarks: [this.data.records.remarks], remarks: [this.data.records.remarks],
}); });
console.log('this.pincodeList.filter(data => data.pincode == formValue.pincode).pincode_id',this.pincodeList.filter(data => data.pincode == this.data.records.pincode).pincode_id);
console.log('this.pincodeList.filter(data => data.pincode == formValue.pincode)',this.pincodeList.filter(data => data.pincode == this.data.records.pincode));
console.log('this',this.pincodeList);
console.log(this.data.records.pincode);
this._EditPDtriggerForm.controls.pincode.setValue(1);
} }
get pdMain() { return this._EditPDtriggerForm.controls; } get pdMain() { return this._EditPDtriggerForm.controls; }

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
View File

@ -133,9 +133,8 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.address.setValue(data.records.address); this.addressForm.controls.address.setValue(data.records.address);
this.addressForm.controls.pd_location.setValue(data.records.pd_location); this.addressForm.controls.pd_location.setValue(data.records.pd_location);
this.addressForm.controls.address_type.setValue(data.records.address_type); this.addressForm.controls.address_type.setValue(data.records.address_type);
let selectedAddressType = this.addressData.filter(element =>element.address_type_id == data.records.address_type); let selectedAddressType = this.addressData.filter(element =>element.address_type_id == data.records.address_type)[0];
this.selectedAddressType(selectedAddressType); this.selectedAddressType(selectedAddressType.address_type);
if(data.records.address_type == 1) { if(data.records.address_type == 1) {
this.addressForm.controls.address_type_others.setValue(data.records.address_type_others); this.addressForm.controls.address_type_others.setValue(data.records.address_type_others);
this.selectedAddressType(data.records.address_type_others); this.selectedAddressType(data.records.address_type_others);

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
View File

@ -38,7 +38,7 @@ export class BusinessInfoGroupComponent implements OnInit {
getCompanyListForBusiness(): void{ getCompanyListForBusiness(): void{
this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
if(data.dataStatus){ if(data.dataStatus){
this.existCompanyList = data.records.filter(val =>val.is_active && val.is_company_applicant===true); this.existCompanyList = data.records.filter(val =>val.is_active == 1);
this.waitLoading = true; this.waitLoading = true;
} }
else { else {

55
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
View File

@ -100,6 +100,16 @@
<mat-table [dataSource]="relationSource" *ngIf="businessForm.controls.persons_with_relationships['controls'].length>0" formArrayName="persons_with_relationships"> <mat-table [dataSource]="relationSource" *ngIf="businessForm.controls.persons_with_relationships['controls'].length>0" formArrayName="persons_with_relationships">
<ng-container matColumnDef="title">
<mat-header-cell *matHeaderCellDef> Title </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-form-field style="width: 90%;">
<mat-select formControlName="family_member_salutation">
<mat-option [value]="title.title_id" *ngFor="let title of titleData">{{title.name}}</mat-option>
</mat-select>
</mat-form-field>
</mat-cell>
</ng-container>
<ng-container matColumnDef="family_member_name"> <ng-container matColumnDef="family_member_name">
<mat-header-cell *matHeaderCellDef> Name </mat-header-cell> <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
@ -115,7 +125,7 @@
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-form-field style="width: 90%;"> <mat-form-field style="width: 90%;">
<mat-select formControlName="other_family_relationship_id"> <mat-select formControlName="other_family_relationship_id">
<mat-option [value]="member.relationship_id" *ngFor="let member of relationData">{{member.name | titlecase}}</mat-option> <mat-option [value]="member.relationship_id" *ngFor="let member of relationData">{{member.name + ' of' | titlecase}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</mat-cell> </mat-cell>
@ -193,7 +203,7 @@
<mat-card-title>Manufacturing Details</mat-card-title> <mat-card-title>Manufacturing Details</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content formArrayName="manufacturing_activity_details"> <mat-card-content formArrayName="manufacturing_activity_details">
<mat-card *ngFor="let manufacturing of businessForm.controls.manufacturing_activity_details['controls']; let m=index" [formGroupName]="m"> <mat-card *ngFor="let manufacturing of businessForm.controls.manufacturing_activity_details['controls']; let m=index;let mlast = last" [formGroupName]="m">
<mat-card-content> <mat-card-content>
<mat-form-field style="width: 35%;"> <mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Main Product" formControlName="main_products" required> <input matInput type="text" placeholder="Main Product" formControlName="main_products" required>
@ -402,9 +412,14 @@
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<mat-form-field style="width: 92%"> <mat-form-field style="width: 92%">
<mat-label>Description of {{manufacturing.value.main_products}}</mat-label> <mat-label>Description of {{manufacturing.value.main_products}} manufacturing process</mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea> <textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field> </mat-form-field>
<div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Manufacturing Details" matTooltipPosition="above" (click)="deleteManufacturing(m)" *ngIf="!mlast">
<mat-icon>delete</mat-icon>
</button>
</div>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
@ -421,7 +436,7 @@
<mat-card-title>Retail Trading Details</mat-card-title> <mat-card-title>Retail Trading Details</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content formArrayName="retail_trading_activity_details"> <mat-card-content formArrayName="retail_trading_activity_details">
<mat-card *ngFor="let retail of businessForm.controls.retail_trading_activity_details['controls']; let r=index" [formGroupName]="r"> <mat-card *ngFor="let retail of businessForm.controls.retail_trading_activity_details['controls']; let r=index;let rlast = last" [formGroupName]="r">
<mat-card-content> <mat-card-content>
<mat-form-field style="width: 35%;"> <mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Main Product" formControlName="main_products" required> <input matInput type="text" placeholder="Main Product" formControlName="main_products" required>
@ -633,9 +648,14 @@
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<mat-form-field style="width: 92%"> <mat-form-field style="width: 92%">
<mat-label>Description of {{retail.value.main_products}}</mat-label> <mat-label>Description of {{retail.value.main_products}} Retailing process</mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea> <textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field> </mat-form-field>
<div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Retail Details" matTooltipPosition="above" (click)="deleteRetail(c)" *ngIf="!rlast">
<mat-icon>delete</mat-icon>
</button>
</div>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
@ -652,7 +672,7 @@
<mat-card-title>Wholesale Trade Details</mat-card-title> <mat-card-title>Wholesale Trade Details</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content formArrayName="wholesale_trading_activity_details"> <mat-card-content formArrayName="wholesale_trading_activity_details">
<mat-card *ngFor="let wholesale of businessForm.controls.wholesale_trading_activity_details['controls']; let w=index" [formGroupName]="w"> <mat-card *ngFor="let wholesale of businessForm.controls.wholesale_trading_activity_details['controls']; let w=index;let wlast = last" [formGroupName]="w">
<mat-card-content> <mat-card-content>
<mat-form-field style="width: 35%;"> <mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Main Product" formControlName="main_products" required> <input matInput type="text" placeholder="Main Product" formControlName="main_products" required>
@ -862,9 +882,14 @@
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<mat-form-field style="width: 92%"> <mat-form-field style="width: 92%">
<mat-label>Description of {{wholesale.value.main_products}}</mat-label> <mat-label>Description of {{wholesale.value.main_products}} Wholesale process </mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea> <textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field> </mat-form-field>
<div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Wholesale Details" matTooltipPosition="above" (click)="deleteWholesale(w)" *ngIf="!wlast">
<mat-icon>delete</mat-icon>
</button>
</div>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
@ -881,7 +906,7 @@
<mat-card-title>Service Provider Details</mat-card-title> <mat-card-title>Service Provider Details</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content formArrayName="service_provider_activity_details"> <mat-card-content formArrayName="service_provider_activity_details">
<mat-card *ngFor="let serviceprovider of businessForm.controls.service_provider_activity_details['controls']; let sp=index" [formGroupName]="sp"> <mat-card *ngFor="let serviceprovider of businessForm.controls.service_provider_activity_details['controls']; let sp=index;let splast = last" [formGroupName]="sp">
<mat-card-content> <mat-card-content>
<mat-form-field style="width: 35%;"> <mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Services Provided" formControlName="main_products" required> <input matInput type="text" placeholder="Services Provided" formControlName="main_products" required>
@ -1087,9 +1112,14 @@
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<mat-form-field style="width: 92%"> <mat-form-field style="width: 92%">
<mat-label>Description of {{serviceprovider.value.main_products}}</mat-label> <mat-label>Description of {{serviceprovider.value.main_products}} Service Process</mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea> <textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field> </mat-form-field>
<div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Service Provider Details" matTooltipPosition="above" (click)="deleteServiceprovider(sp)" *ngIf="!splast">
<mat-icon>delete</mat-icon>
</button>
</div>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
@ -1106,12 +1136,17 @@
<mat-card-title>Other Details</mat-card-title> <mat-card-title>Other Details</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content formArrayName="others_activity_details"> <mat-card-content formArrayName="others_activity_details">
<mat-card *ngFor="let others of businessForm.controls.others_activity_details['controls']; let o=index" [formGroupName]="o"> <mat-card *ngFor="let others of businessForm.controls.others_activity_details['controls']; let o=index;let olast = last" [formGroupName]="o">
<mat-card-content> <mat-card-content>
<mat-form-field style="width:92%;"> <mat-form-field style="width:92%;">
<textarea matInput placeholder="Other Details" formControlName="others_details" required></textarea> <textarea matInput placeholder="Other Details" formControlName="others_details" required></textarea>
</mat-form-field> </mat-form-field>
</mat-card-content> </mat-card-content>
<div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Details" matTooltipPosition="above" (click)="deleteOthersActivity(o)" *ngIf="!olast">
<mat-icon>delete</mat-icon>
</button>
</div>
</mat-card> </mat-card>

45
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
View File

@ -37,6 +37,7 @@ export class BusinessInfoComponent implements OnInit {
form_id: number; form_id: number;
pageTitle: string ="About Business"; pageTitle: string ="About Business";
relationData: any = []; relationData: any = [];
titleData: any = [];
companyRelationShipList: any =[]; companyRelationShipList: any =[];
//industryData: any = []; //industryData: any = [];
activityData: any = []; activityData: any = [];
@ -60,7 +61,7 @@ export class BusinessInfoComponent implements OnInit {
maxDate:any; maxDate:any;
// InvestedAmountInWords:any; // InvestedAmountInWords:any;
public relationSource= new MatTableDataSource(); public relationSource= new MatTableDataSource();
displayedColumns = ['family_member_name','relation','relation_to','relationship_with_company','started_business']; displayedColumns = ['title','family_member_name','relation','relation_to','relationship_with_company','started_business'];
generalExistEntityType:string; generalExistEntityType:string;
generalExistEntityType_other:string; generalExistEntityType_other:string;
generalExistBusinessYear:Number; generalExistBusinessYear:Number;
@ -1039,6 +1040,17 @@ export class BusinessInfoComponent implements OnInit {
}) })
}); });
} }
// get title master
getTitle() {
let master_name = 'TITLES';
this._pd.getAllMasterDatas(master_name).subscribe(data => {
data.records.forEach(val => {
if (val.isactive == 1) {
this.titleData.push(val);
}
})
});
}
getCompanyRelation() { getCompanyRelation() {
let master_name = 'COMPANYRELATIONSHIPS'; let master_name = 'COMPANYRELATIONSHIPS';
@ -1122,6 +1134,7 @@ export class BusinessInfoComponent implements OnInit {
createPersonRelationhip(details: any):FormGroup { createPersonRelationhip(details: any):FormGroup {
return this.fb.group({ return this.fb.group({
other_family_relationship_id: [details.other_family_relationship_id,Validators.required], other_family_relationship_id: [details.other_family_relationship_id,Validators.required],
family_member_salutation:[details.family_member_salutation],
family_member_name: [details.family_member_name,Validators.required], family_member_name: [details.family_member_name,Validators.required],
relationship_with_company_id: [details.relationship_with_company_id,Validators.required], relationship_with_company_id: [details.relationship_with_company_id,Validators.required],
relation_to_id: [details.relation_to_id,Validators.required], relation_to_id: [details.relation_to_id,Validators.required],
@ -1166,28 +1179,56 @@ export class BusinessInfoComponent implements OnInit {
addMoreManufacturing() { addMoreManufacturing() {
let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details']; let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details'];
manufacturingControl.push(this.createActivity()); manufacturingControl.push(this.createActivity());
}
deleteManufacturing(findex){
let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details'];
manufacturingControl.removeAt(findex);
} }
// add more retail details // add more retail details
addMoreRetail() { addMoreRetail() {
let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details']; let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details'];
retailControl.push(this.createActivity()); retailControl.push(this.createActivity());
} }
deleteRetail(index) {
let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details'];
retailControl.removeAt(index);
}
// add more retail details // add more retail details
addMoreWholesale() { addMoreWholesale() {
let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details']; let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
wholesaleControl.push(this.createActivity()); wholesaleControl.push(this.createActivity());
} }
deleteWholesale(index) {
let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
wholesaleControl.removeAt(index);
}
// add more service provider details // add more service provider details
addMoreServiceprovider() { addMoreServiceprovider() {
let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details']; let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details'];
serviceControl.push(this.createServiceActivity()); serviceControl.push(this.createServiceActivity());
} }
deleteServiceprovider(index) {
let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details'];
serviceControl.removeAt(index);
}
// add more others details // add more others details
addMoreOthersActivity() { addMoreOthersActivity() {
let othersControl = <FormArray>this.businessForm.controls['others_activity_details']; let othersControl = <FormArray>this.businessForm.controls['others_activity_details'];
othersControl.push(this.createOthersActivity()); othersControl.push(this.createOthersActivity());
} }
deleteOthersActivity(index) {
let othersControl = <FormArray>this.businessForm.controls['others_activity_details'];
othersControl.removeAt(index);
}
// update partner group other form control // update partner group other form control
changePartnerGroup(value,key) { changePartnerGroup(value,key) {
let control: any = this.businessForm.get('partners') as FormArray; let control: any = this.businessForm.get('partners') as FormArray;
@ -1362,7 +1403,7 @@ export class BusinessInfoComponent implements OnInit {
otherFamilyMemberDialogue() { otherFamilyMemberDialogue() {
let relationControl = <FormArray>this.businessForm.controls['persons_with_relationships']; let relationControl = <FormArray>this.businessForm.controls['persons_with_relationships'];
let other_family_member: any= {'other_family_relationship_id':'','other_family_relationship_name':'','family_member_name':'','relationship_with_company_id':'','relationship_with_company':'','started_business':'','currently_active_status':''}; let other_family_member: any= {'other_family_relationship_id':'','other_family_relationship_name':'','family_member_salutation':'','family_member_name':'','relationship_with_company_id':'','relationship_with_company':'','started_business':'','currently_active_status':''};
relationControl.push(this.createPersonRelationhip(other_family_member)); relationControl.push(this.createPersonRelationhip(other_family_member));
} }

20
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
View File

@ -205,7 +205,7 @@
<!-- <span style="width:10%;padding-left:2%"><p>Average</p></span> --> <!-- <span style="width:10%;padding-left:2%"><p>Average</p></span> -->
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Sales Average" formControlName="estimate_sales_average"> <input matInput autocomplete="off" placeholder="Considered Sales Average" formControlName="estimate_sales_average">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_sales_average').value != ''"></mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_sales_average').value != ''">{{"&#8377;"}} {{AV_SalesInwords[i]}} Only</mat-hint>
<!-- //{{"&#8377;"}} {{AV_SalesInwords[i]}} Only --> <!-- //{{"&#8377;"}} {{AV_SalesInwords[i]}} Only -->
</mat-form-field> </mat-form-field>
</div> </div>
@ -238,7 +238,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Margin Profit %" formControlName="estimate_profit_margin_percent" type="number"> <input matInput autocomplete="off" placeholder="Considered Margin Profit %" formControlName="estimate_profit_margin_percent" type="number">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''">{{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ( {{AV_marginProfitAmtInwords[i]}} Only ) </mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div style="width:100%"> <div style="width:100%">
@ -250,8 +250,8 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Profit Amount" formControlName="estimate_net_profit" type="number"> <input matInput autocomplete="off" placeholder="Considered Profit Amount" formControlName="estimate_net_profit" type="number">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_profit').value != ''">( {{details.get('estimate_net_profit_percent').value }} % )</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_profit').value != ''">{{"&#8377;"}} {{AV_netProfitAmtInwords[i]}} Only ( {{details.get('estimate_net_profit_percent').value }} % )</mat-hint>
<!-- //{{"&#8377;"}} {{AV_netProfitAmtInwords[i]}} Only --> <!-- // -->
</mat-form-field> </mat-form-field>
</div> </div>
</span> </span>
@ -260,15 +260,15 @@
<span *ngIf="details.get('estimate_profit_or_loss').value == 2 "> <span *ngIf="details.get('estimate_profit_or_loss').value == 2 ">
<div style="width:100%"> <div style="width:100%">
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Loss From" formControlName="estimate_loss_range_from" type="number" (change)="calculateLossProfit( i, details);"> <input matInput autocomplete="off" placeholder="Net Loss From" formControlName="estimate_loss_range_from" type="number" (change)="calculateMarginLoss( i, details);">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Loss To" formControlName="estimate_loss_range_to" type="number" (change)="calculateLossProfit( i, details);"> <input matInput autocomplete="off" placeholder="Net Loss To" formControlName="estimate_loss_range_to" type="number" (change)="calculateMarginLoss( i, details);">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Margin Loss %" formControlName="estimate_loss_margin_percent" type="number"> <input matInput autocomplete="off" placeholder="Considered Margin Loss %" formControlName="estimate_loss_margin_percent" type="number">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{details.get('estimate_Loss_margin').value}} </mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{AV_marginLossAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_loss_margin').value}} ) </mat-hint>
<!-- //( {{AV_marginLossAmtInwords[i]}} Only ) --> <!-- // -->
</mat-form-field> </mat-form-field>
</div> </div>
<div style="width:100%"> <div style="width:100%">
@ -280,8 +280,8 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Loss Amount" formControlName="estimate_net_loss" type="number"> <input matInput autocomplete="off" placeholder="Considered Loss Amount" formControlName="estimate_net_loss" type="number">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_loss').value != ''"> ( {{details.get('estimate_net_loss_percent').value }} % )</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_loss').value != ''">{{"&#8377;"}} {{AV_netLossAmtInwords[i]}} Only ( {{details.get('estimate_net_loss_percent').value }} % )</mat-hint>
<!-- //{{"&#8377;"}} {{AV_netLossAmtInwords[i]}} Only --> <!-- // -->
</mat-form-field> </mat-form-field>
</div> </div>

24
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
View File

@ -152,11 +152,11 @@ export class FinancialInfoComponent implements OnInit {
// this.AV_annualSalesInwords[index] = this._pd.convertNumberToWords(val.estimate_annual_sale); // this.AV_annualSalesInwords[index] = this._pd.convertNumberToWords(val.estimate_annual_sale);
// this.AV_netProfitAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_profit); // this.AV_netProfitAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_profit);
// this.AV_netLossAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_loss); // this.AV_netLossAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_loss);
this.AV_SalesInwords = this._pd.convertNumberToWords(+val.estimate_sales_average); this.AV_SalesInwords[index] = this._pd.convertNumberToWords(Math.round(val.estimate_sales_average));
this.AV_marginProfitAmtInwords = this._pd.convertNumberToWords(+val.estimate_profit_margin); this.AV_marginProfitAmtInwords[index] = this._pd.convertNumberToWords(Math.round(val.estimate_profit_margin));
this.AV_netProfitAmtInwords = this._pd.convertNumberToWords(+val.estimate_net_profit); this.AV_netProfitAmtInwords[index] = this._pd.convertNumberToWords(Math.round(val.estimate_net_profit));
this.AV_marginLossAmtInwords = this._pd.convertNumberToWords(+val.estimate_loss_margin); this.AV_marginLossAmtInwords[index] = this._pd.convertNumberToWords(Math.round(val.estimate_loss_margin));
this.AV_netLossAmtInwords = this._pd.convertNumberToWords(+val.estimate_net_loss); this.AV_netLossAmtInwords[index] = this._pd.convertNumberToWords(Math.round(val.estimate_net_loss));
estimated_val.push(this.createValue('')); estimated_val.push(this.createValue(''));
}); });
retriveData.estimated_value = result_val; retriveData.estimated_value = result_val;
@ -853,13 +853,13 @@ export class FinancialInfoComponent implements OnInit {
if(lower > higer){ if(lower > higer){
details.controls.estimate_sales_average.setValue(higer.toFixed(2)); details.controls.estimate_sales_average.setValue(higer.toFixed(2));
this.AV_SalesInwords[i] = this._pd.convertNumberToWords(higer); this.AV_SalesInwords[i] = this._pd.convertNumberToWords(Math.round(higer));
} }
else{ else{
details.controls.estimate_sales_average.setValue(lower.toFixed(2)); details.controls.estimate_sales_average.setValue(lower.toFixed(2));
this.AV_SalesInwords[i] = this._pd.convertNumberToWords(lower); this.AV_SalesInwords[i] = this._pd.convertNumberToWords(Math.round(lower));
} }
} }
@ -882,7 +882,7 @@ export class FinancialInfoComponent implements OnInit {
let Profit_Average = (profit_percent*sales_average)/100; let Profit_Average = (profit_percent*sales_average)/100;
details.controls.estimate_profit_margin.setValue(Math.round(Profit_Average)); details.controls.estimate_profit_margin.setValue(Math.round(Profit_Average));
details.controls.estimate_profit_margin_percent.setValue(profit_percent); details.controls.estimate_profit_margin_percent.setValue(profit_percent.toFixed(2));
this.AV_marginProfitAmtInwords[i] = this._pd.convertNumberToWords(Math.round(Profit_Average)); this.AV_marginProfitAmtInwords[i] = this._pd.convertNumberToWords(Math.round(Profit_Average));
@ -905,7 +905,7 @@ export class FinancialInfoComponent implements OnInit {
let Profit_percent = (profit_amount/sales_average)*100; let Profit_percent = (profit_amount/sales_average)*100;
details.controls.estimate_net_profit.setValue(Math.round(profit_amount)); details.controls.estimate_net_profit.setValue(Math.round(profit_amount));
details.controls.estimate_net_profit_percent.setValue(Profit_percent); details.controls.estimate_net_profit_percent.setValue(Profit_percent.toFixed(2));
this.AV_netProfitAmtInwords[i] = this._pd.convertNumberToWords(Math.round(profit_amount)); this.AV_netProfitAmtInwords[i] = this._pd.convertNumberToWords(Math.round(profit_amount));
@ -938,7 +938,7 @@ export class FinancialInfoComponent implements OnInit {
let loss_Average = (loss_percent*sales_average)/100; let loss_Average = (loss_percent*sales_average)/100;
details.controls.estimate_loss_margin.setValue(Math.round(loss_Average)); details.controls.estimate_loss_margin.setValue(Math.round(loss_Average));
details.controls.estimate_loss_margin_percent.setValue(loss_percent); details.controls.estimate_loss_margin_percent.setValue(loss_percent.toFixed(2));
this.AV_marginLossAmtInwords[i] = this._pd.convertNumberToWords(Math.round(loss_Average)); this.AV_marginLossAmtInwords[i] = this._pd.convertNumberToWords(Math.round(loss_Average));
@ -960,8 +960,8 @@ export class FinancialInfoComponent implements OnInit {
let loss_amount = (estimate_net_loss_to + estimate_net_loss_from)/2; let loss_amount = (estimate_net_loss_to + estimate_net_loss_from)/2;
let loss_percent = (loss_amount/sales_average)*100; let loss_percent = (loss_amount/sales_average)*100;
details.controls.estimate_net_profit.setValue(Math.round(loss_amount)); details.controls.estimate_net_loss.setValue(Math.round(loss_amount));
details.controls.estimate_net_profit_percent.setValue(loss_percent); details.controls.estimate_net_loss_percent.setValue(loss_percent.toFixed(2));
this.AV_netLossAmtInwords[i] = this._pd.convertNumberToWords(Math.round(loss_amount)); this.AV_netLossAmtInwords[i] = this._pd.convertNumberToWords(Math.round(loss_amount));

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

@ -20,7 +20,7 @@
<span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span> <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span>
<span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span> <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span>
</button>&nbsp;&nbsp; </button>&nbsp;&nbsp;
<button *ngIf="currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Draft" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button> <button *ngIf="currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button>
<!-- <button *ngIf="currentPDStatus==pdStatusCheck.DRAFT && mandatoryFieldsValidations.length==0" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master.pd_id)"><mat-icon>flash_on</mat-icon></button> --> <!-- <button *ngIf="currentPDStatus==pdStatusCheck.DRAFT && mandatoryFieldsValidations.length==0" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master.pd_id)"><mat-icon>flash_on</mat-icon></button> -->
<br> <br>
<small *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.pd_allocated_to | titlecase}}</small> <small *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.pd_allocated_to | titlecase}}</small>