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

mentioned are issued : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-26 17:26:42 +05:30
parent 8f0949bd4a
commit ff3732cb4d
22 changed files with 427 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
"fk_pd_type":formValue.fk_pd_type,
"fk_customer_segment":formValue.fk_customer_segment,
"loan_amount":formValue.loan_amount,
"addressline1":formValue.addressline1,
"addressline1":formValue.addressline1.toUpperCase(),
"fk_city":formValue.fk_city,
"fk_state":formValue.fk_state,
"pincode":formValue.pincode,
@ -525,6 +525,8 @@ export class AddPdComponent implements OnInit, OnDestroy {
pd_form.append("addtional_requirements",JSON.stringify(formValue.addtional_requirements))
}
// console.log('pd_form',pd_form);
// console.log('pd_details',pd_details);
this._pd.addPdDetails(pd_form).subscribe(result => {
if (result.status == 200) {
this.disableAfterSubmit = false;

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

@ -115,8 +115,9 @@
</mat-form-field>
<mat-form-field style="width: 96%">
<textarea matInput placeholder="Address at which PD is to be done" formControlName="addressline1" oninput="this.value = this.value.toUpperCase()"></textarea>
<textarea matInput placeholder="Address at which PD is to be done" formControlName="addressline1" style="text-transform: uppercase"></textarea>
<!-- <mat-error *ngIf="pdMain.addressline1.hasError('required')">Address1 required.</mat-error> -->
<!-- oninput="this.value = this.value.toUpperCase()" -->
</mat-form-field>
<mat-form-field style="width: 29%;">

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

@ -168,7 +168,7 @@ export class EditPdMasterComponent implements OnInit {
fk_pd_type: [this.data.records.fk_pd_type],
fk_customer_segment: [this.data.records.fk_customer_segment],
loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.pattern('^[0-9]*$')])],
  addressline1: [this.data.records.addressline1],
  addressline1: [this.data.records.addressline1.toUpperCase()],
fk_city: [this.data.records.fk_city],
fk_state: [this.data.records.fk_state],
  pincode : [this.data.records.pincode_id],
@ -334,7 +334,7 @@ export class EditPdMasterComponent implements OnInit {
"fk_pd_type": my_array.fk_pd_type,
"fk_customer_segment": my_array.fk_customer_segment,
"loan_amount": my_array.loan_amount,
  "addressline1": my_array.addressline1,
  "addressline1": my_array.addressline1.toUpperCase(),
"fk_city": my_array.fk_city,
"fk_state": my_array.fk_state,
  "pincode": my_array.pincode,

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

@ -135,7 +135,7 @@
</mat-form-field>
<mat-form-field style="width: 46%;">
<mat-select placeholder="Unit of Mearsurement" formControlName="uom">
<mat-select placeholder="Unit of Measurement" formControlName="uom">
<mat-option>Select</mat-option>
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select>

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

@ -58,7 +58,6 @@
<mat-form-field style="width: 95%;">
<mat-select [placeholder]="placeholderName" formControlName="business_is_pd_visited">
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>

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

@ -1208,14 +1208,34 @@
<mat-option value="no">No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:84%;" *ngIf="businessForm.controls['applicant_use_pos_machines']">
<mat-select placeholder="Does the Applicant Use POS Machines in His Business / Profession" formControlName="applicant_use_pos_machines">
<mat-form-field style="width:84%;" *ngIf="businessForm.controls['applicant_use_pos_machines']">
<mat-select placeholder="Does the Applicant Use POS Machines in His Business / Profession" formControlName="applicant_use_pos_machines" (selectionChange)="changePOSMachinesAvailablity($event.value,1)">
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
</mat-select>
</mat-form-field>
<span *ngIf="businessForm.controls['applicant_use_pos_machines'].value == 'yes'">
<mat-form-field style="width:84%;">
<input matInput placeholder="Number of POS machines?" formControlName="no_of_pos_machines" type="number" (change)="toGetPOSMachinesDetails($event.target.value,1)">
</mat-form-field>
<span *ngIf="businessForm.controls['pos_machines_details']">
<div formArrayName="pos_machines_details">
<div *ngFor="let posdtl of businessForm.controls.pos_machines_details['controls']; let i=index"
[formGroupName]="i">
<mat-form-field style="width:50%;">
<mat-select placeholder="Name of the Financial Institution whose POS machines are installed" formControlName="pos_machines_financial_institution_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let b of bankList" [value]="b.bt_lender_list_id">{{ b.lender_name }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:30%;">
<input matInput placeholder="TID Number of the POS machine?" formControlName="tid_no_of_pos_machine">
</mat-form-field>
</div>
</div>
</span>
</span>
</mat-card-content>
</mat-card>
<mat-card>
@ -1227,7 +1247,7 @@
<mat-select placeholder="Is The Business Seasonal"
formControlName="seasonality" required>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No Major Changes In Sales </mat-option>
<mat-option value="no major changes in sales">No Major Changes In Sales </mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 60%" *ngIf="businessForm.controls['seasonality'].value == 'yes'">

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

@ -48,6 +48,7 @@ export class BusinessInfoComponent implements OnInit {
activityData: any = [];
stateList: any = [];
countryDataList : any = [];
bankList = [];
relativeNames: any;
applicants: any;
@ -86,6 +87,9 @@ export class BusinessInfoComponent implements OnInit {
WholeSalesChecked: boolean;
ServiceChecked: boolean;
temp_noofposmachine : any;
temp_additiondetailofposmachine : any = [];
constructor(notifier: NotifierService,
private fb: FormBuilder,
private route: ActivatedRoute,
@ -141,6 +145,7 @@ export class BusinessInfoComponent implements OnInit {
this.getCompanyRelation();
this.getTitle();
this.getAllPersons();
this.getBank();
// const Desgn = <FormArray>this.businessForm.controls['designation'];
// const Partnr = <FormArray>this.businessForm.controls['partners'];
// const otherDoc = <FormArray>this.businessForm.controls['documents'];
@ -162,6 +167,7 @@ export class BusinessInfoComponent implements OnInit {
const wholesaleControl: any = <FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
const serviceProviderControl: any = <FormArray>this.businessForm.controls['service_provider_activity_details'];
const othersControl: any = <FormArray>this.businessForm.controls['others_activity_details'];
if (data.status == 200) {
let DocArray: any;
// let DesgnArray = Object.keys(data.records.designation).map(function (key) {
@ -356,6 +362,9 @@ export class BusinessInfoComponent implements OnInit {
selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')): this.businessForm.removeControl('no_of_pos_machines');
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details');
selectedRetail.forEach((element,index)=>{
this.CheckExport(element.area_of_sale,'RActivity',index);
retailControl.push(this.createActivity());
@ -418,6 +427,9 @@ export class BusinessInfoComponent implements OnInit {
selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')): this.businessForm.removeControl('no_of_pos_machines');
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details');
selectedWholesale.forEach((element,index)=>{
this.CheckExport(element.area_of_sale,'WActivity',index);
wholesaleControl.push(this.createActivity());
@ -482,6 +494,9 @@ export class BusinessInfoComponent implements OnInit {
selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert');
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')): this.businessForm.removeControl('no_of_pos_machines');
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details');
selectedService.forEach((element,index)=>{
this.CheckExport(element.area_of_sale,'SPActivity',index);
serviceProviderControl.push(this.createServiceActivity());
@ -556,10 +571,15 @@ export class BusinessInfoComponent implements OnInit {
}
else {
businessVal.others_activity_details=[];
}
this.businessForm.setValue(businessVal);
if(businessVal.applicant_use_pos_machines == 'yes'){
this.businessForm.controls.no_of_pos_machines.setValue(businessVal.no_of_pos_machines);
const posControl: any = <FormArray>this.businessForm.controls['pos_machines_details'];
for(let i = 1; i<= businessVal.no_of_pos_machines; i++ ){
posControl.push(this.createPOSMachinesDetails(businessVal.pos_machines_details));
}
}
this.businessForm.setValue(businessVal);
} else {
//Desgn.push(this.createDesignation());
Partnr.push(this.createPartners());
@ -722,6 +742,10 @@ export class BusinessInfoComponent implements OnInit {
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets');
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines');
if(this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0){
this.changePOSMachinesAvailablity(this.businessForm.value.applicant_use_pos_machines,2);
}
if(this.ManufacturingChecked && this.RetailedChecked && this.WholeSalesChecked && this.ServiceChecked){
this.ExportFlag = false;
}
@ -1089,6 +1113,14 @@ export class BusinessInfoComponent implements OnInit {
})
});
}
getBank(){
this._pd.getAllMasterDatas('BTLENDERLIST').subscribe(
data => {
this.bankList = data.records.filter(data => data.isactive == 1 && data.lender_type == 1);
})
}
// get title master
getTitle() {
let master_name = 'TITLES';
@ -1159,9 +1191,7 @@ export class BusinessInfoComponent implements OnInit {
// if(this.businessForm.controls.partners['controls'].length > 1)
// {
// console.log('asd');
// }
// {}
if(this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship'){
this.EntityTypeFlag = true;
@ -1201,7 +1231,6 @@ export class BusinessInfoComponent implements OnInit {
data.records.forEach(val => {
if (val.isactive == 1) {
this.countryDataList.push(val);
// console.log(this.countryDataList);
}
})
});
@ -1836,5 +1865,55 @@ CheckExport(value,stringFlag,index){
}
}
changePOSMachinesAvailablity(e,flag){
e == 'yes'
? this.businessForm.addControl('no_of_pos_machines', new FormControl(''))
: this.businessForm.removeControl('no_of_pos_machines');
if(flag == 2){
e == 'yes'
? this.businessForm.controls.no_of_pos_machines.setValue(this.temp_noofposmachine)
: this.businessForm.removeControl('no_of_pos_machines');
}
}
toGetPOSMachinesDetails(e,flag){
if(flag == 1){ this.businessForm.addControl('pos_machines_details', this.fb.array([])); }
const control = <FormArray>this.businessForm.controls['pos_machines_details'];
while (control.length !== 0) {
control.removeAt(0);
}
if(e > 0 ){
if(flag == 1){
for(let i = 1 ; i<= e ; i++ ){
control.push(this.createPOSMachinesDetails(null));
}
}
else if(flag == 2){
for(let i = 1 ; i<= e ; i++ ){
control.push(this.createPOSMachinesDetails(this.temp_additiondetailofposmachine));
}
}
}
}
createPOSMachinesDetails(data){
if(data == null){
return this.fb.group({
pos_machines_financial_institution_name: [''],
tid_no_of_pos_machine: [''],
});
}
else if(data != null) {
return this.fb.group({
pos_machines_financial_institution_name: [data.pos_machines_financial_institution_name],
tid_no_of_pos_machine: [data.tid_no_of_pos_machine],
});
}
}
}

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

@ -22,6 +22,7 @@
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%">
<mat-select placeholder="Manufacturing Product Name" formControlName="manufacturing_product_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_manufacturingProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
@ -36,6 +37,7 @@
<div fxLayout="row nowrap">
<mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let tl of titleList" [value]="tl.title_id">
{{tl.name}}
</mat-option>
@ -77,12 +79,14 @@
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="manufacturing_payment_type" (selectionChange)="checkCard($event.value,1,l);">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Payment Mode" formControlName="manufacturing_payment_mode">
<mat-option>Select</mat-option>
<mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment received through Banking channels.</mat-option>
</mat-select>
@ -135,6 +139,7 @@
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%">
<mat-select placeholder="Trading Product Name" formControlName="trade_product_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_tradingProducts" [value]="pm.name">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
@ -148,6 +153,7 @@
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let tl of titleList" [value]="tl.title_id">
{{tl.name}}
</mat-option>
@ -190,12 +196,14 @@
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="trade_product_payment_type" (selectionChange)="checkCard($event.value,2,l);">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Payment Mode" formControlName="trade_product_payment_mode">
<mat-option>Select</mat-option>
<mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment received through Banking channels.</mat-option>
</mat-select>
@ -249,6 +257,7 @@
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%">
<mat-select placeholder="Select the Service Provided" formControlName="service_provider_product_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_suplierProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
@ -262,6 +271,7 @@
</mat-form-field>-->
<mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let tl of titleList" [value]="tl.title_id">
{{tl.name}}
</mat-option>
@ -303,12 +313,14 @@
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="service_provider_product_payment_type" (selectionChange)="checkCard($event.value,3,l);">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Payment Mode" formControlName="service_provider_product_payment_mode">
<mat-option>Select</mat-option>
<mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment received through Banking channels.</mat-option>
</mat-select>

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
View File

@ -26,6 +26,7 @@
<mat-form-field style="width:60% !important;">
<mat-select (selectionChange)="selectedLoanChanges($event.value)" placeholder="Do you have any other existing loan"
formControlName="existing_loan" >
<mat-option>Select</mat-option>
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
@ -44,6 +45,7 @@
<mat-card-content class="matcard">
<mat-form-field style="width:45%;">
<mat-select placeholder="Loan Type" formControlName="loan_type" (selectionChange)="setRequiredValidation($event.value,details,1)">
<mat-option>Select</mat-option>
<mat-option value="{{types.existing_loan_type_id}}" *ngFor="let types of loanTypeData">{{types.loan_type_name}}</mat-option>
</mat-select>
<!-- <input matInput autocomplete="off" placeholder="Loan Type" formControlName="loan_type" > -->
@ -57,6 +59,7 @@
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select placeholder="Lender" formControlName="lender" (selectionChange)="setRequiredValidation($event.value,details,2)">
<mat-option>Select</mat-option>
<mat-option *ngFor="let btLen of lenderData" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
</mat-select>
</mat-form-field>
@ -84,7 +87,8 @@
<mat-form-field style="width:45%;">
<mat-select placeholder="Instalment Frequency" (selectionChange)="selectedfrequency($event.value,i);setRequiredValidation($event.value,details,4);"
formControlName="frequency" >
formControlName="frequency" >
<mat-option>Select</mat-option>
<mat-option *ngFor="let freq of frequencyData" value="{{freq.frequency_id}}">{{freq.name}}</mat-option>
</mat-select>
</mat-form-field>

75
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
View File

@ -166,7 +166,6 @@ export class CurrentLoanComponent implements OnInit {
let AssetData = data.record;
if(AssetData.business_assets.length>0){
AssetData.business_assets.map(element => {
@ -203,15 +202,25 @@ export class CurrentLoanComponent implements OnInit {
if(val.mode == 1){
let data;
let owner
val.details.forEach((v,index) => {
data = v.any_other_assets;
});
if(val.form_type == 'Data From Business Assets'){
owner = val.owner_name.map((e => {
return e.name.split(',')
}));
}
else {
owner = val.owner_name;
}
let description = data != '' ? ' ( '+ data +' )' : '';
labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description;
labelarray[index] = ' : '+owner +' - '+ val.mode_name + description;
}
if(val.mode == 2){
let data;
let owner;
val.details.forEach((v,index) => {
data = v.property_type;
if(v.property_type != 1){
@ -227,41 +236,81 @@ export class CurrentLoanComponent implements OnInit {
}else{
data=v.other_property_type;
}
if(val.form_type == 'Data From Business Assets'){
owner = val.owner_name.map((e => {
return e.name.split(',')
}));
}
else {
owner = val.owner_name;
}
});
let description = data != '' ? ' ( '+ data +' )' : '';
labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description;
labelarray[index] = ' : '+owner +' - '+ val.mode_name + description;
}
if(val.mode == 3){
let data;
let data;let owner;
val.details.forEach((v,index) => {
data = v.manufacturer_model_vehicle;
});
if(val.form_type == 'Data From Business Assets'){
owner = val.owner_name.map((e => {
return e.name.split(',')
}));
}
else {
owner = val.owner_name;
}
let description = data != '' ? ' ( '+ data +' )' : '';
labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description;
labelarray[index] = ' : '+owner +' - '+ val.mode_name + description;
}
if(val.mode == 4){
let data;
let data;let owner;
val.details.forEach((v,index) => {
data = v.equipment_manufacturing_description;
});
if(val.form_type == 'Data From Business Assets'){
owner = val.owner_name.map((e => {
return e.name.split(',')
}));
}
else {
owner = val.owner_name;
}
let description = data != '' ? ' ( '+ data +' )' : '';
labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description;
labelarray[index] = ' : '+owner +' - '+ val.mode_name + description;
}
if(val.mode == 6){
labelarray[index] = ' : '+val.owner_name+' - '+ val.mode_name;
let owner
if(val.form_type == 'Data From Business Assets'){
owner = val.owner_name.map((e => {
return e.name.split(',')
}));
}
else {
owner = val.owner_name;
}
labelarray[index] = ' : '+owner+' - '+ val.mode_name;
}
if(val.mode == 7){
let data;
let data;let owner;
val.details.forEach((v,index) => {
data = v.investments_type != 1
? this.investmentTypeData.filter(data => data.id == v.investments_type)[0].name
: v.other_investments_type ;
});
if(val.form_type == 'Data From Business Assets'){
owner = val.owner_name.map((e => {
return e.name.split(',')
}));
}
else {
owner = val.owner_name;
}
let description = data != '' ? '( '+ data +' )' : '';
labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description;
labelarray[index] = ' : '+owner +' - '+ val.mode_name + description;
}
});
const control = <FormArray>this.currentLoanForm.controls['loan_details'];
@ -444,7 +493,6 @@ export class CurrentLoanComponent implements OnInit {
if (records.existing_loan == 'Yes') {
records.loan_details = this.currentLoanForm.controls['loan_details'].value;
}
// console.log('data', records);
this._pd.saveForm(records).subscribe(data => {
if(data.status == 200) {
this.notifier.notify('success', 'Saved Successfully.');
@ -517,9 +565,6 @@ export class CurrentLoanComponent implements OnInit {
}
}
setRequiredValidation(value,item,flag) {
console.log('value',value);
console.log('item',item);
console.log('flag',flag);
if(flag == 1){
value==1

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

@ -35,6 +35,7 @@
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
<mat-select placeholder="Was the employer met?"
formControlName="was_met" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
@ -50,6 +51,7 @@
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
<mat-select placeholder="Salary amount confirmed ?"
formControlName="confirm_salary" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
@ -60,6 +62,7 @@
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
<mat-select placeholder="Attendance register seen ?"
formControlName="attendance_seen" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
@ -67,6 +70,7 @@
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
<mat-select placeholder="Salary register seen ?"
formControlName="sal_reg_seen" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
@ -98,6 +102,7 @@
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-select placeholder="Bonus Frequency" formControlName="bonus_frequency">
<mat-option>Select</mat-option>
<mat-option *ngFor="let fd of frequency_data" [value]="fd.frequency_id">{{ fd.name }}</mat-option>
</mat-select>
</mat-form-field>
@ -105,6 +110,7 @@
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-select placeholder="Type of Bonus"
formControlName="bonus_type">
<mat-option>Select</mat-option>
<mat-option value="fixed">Fixed</mat-option>
<mat-option value="variable depending on performance">Variable depending on performance</mat-option>
<mat-option value="others">Others</mat-option>
@ -116,6 +122,7 @@
<mat-form-field style="width: 33%">
<mat-select placeholder="Any Delays"
formControlName="any_delays">
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>

270
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
View File

@ -1,264 +1,3 @@
<!--<form class="address" [formGroup]="familyForm">
<h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;">
{{pageTitle}}
</div>
<div fxFlex="30" align="end" style="padding: 10px !important;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right"
mat-dialog-close><mat-icon>close</mat-icon></button>
</div>
</h2>
<mat-dialog-content>
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>
<div fxLayout="row wrap">
<div fxFlex="100">
<mat-card>
<mat-card-content>
<div>
<mat-form-field>
<mat-select placeholder="Select a person" formControlName="selected_person" required>
<mat-option value="{{person.pd_co_applicant_id}}" *ngFor="let person of selectPerson">
{{person.applicant_name}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div>
<h5>Residence Details</h5>
<mat-form-field>
<input matInput placeholder="Place" formControlName="residence_place" required>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="City" formControlName="residence_city" required>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="State" formControlName="residence_state" required>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Pin" formControlName="residence_pin" required>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Number of yrs" formControlName="residence_No_of_years" type="number" required>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Ownership" formControlName="residence_ownership" required>
<mat-option value="{{ownerShip.id}}" *ngFor="let ownerShip of ownerShipData">
{{ownerShip.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="familyForm.get('residence_ownership').value == 4">
<input matInput placeholder="Please specify" formControlName="ownershipOther">
</mat-form-field>
<mat-form-field *ngIf="familyForm.get('residence_ownership').value == 3">
<input matInput placeholder="Rent Amount" formControlName="rent">
</mat-form-field>
</div>
<div>
<mat-form-field>
<input matInput placeholder="Number of Family Members" formControlName="total_number_of_family_members" (focusout)="getNumberOfFamilyMemberDetails()"
type="number" max='20' min='1'>
</mat-form-field>
</div>
<div>
<div formArrayName="family_members_details">
<div *ngFor="let item of familyForm.controls.family_members_details['controls']; let i=index" [formGroupName]="i">
<mat-card>
<div>
<mat-form-field>
<input matInput placeholder="Name" formControlName="family_member_name" required>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Relationship" formControlName="family_member_relationship" required>
<mat-option value="{{relation.relationship_id}}" *ngFor="let relation of relationData">
{{relation.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Age" formControlName="family_member_age" required>
</mat-form-field>
</div>
<div>
<mat-form-field>
<mat-select placeholder="Earning Status" formControlName="family_member_earning_status" required>
<mat-option value="{{earnings.id}}" *ngFor="let earnings of earningStatus">
{{earnings.type}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div *ngIf="item.get('family_member_earning_status').value == 1">
<mat-form-field>
<mat-select placeholder="Segment" formControlName="earning_segment" required>
<mat-option value="{{segment.customer_segment_id}}" *ngFor="let segment of customerSegData">
{{segment.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Income Per Month" formControlName="earning_gross_income_per_month" required>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Name of the Employer/Business" formControlName="earning_name_of_the_employer_or_business" required>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="No. of years in Employer/Business" formControlName="earning_number_of_years_in_employment_or_business"
required>
</mat-form-field>
</div>
<div *ngIf="item.get('family_member_earning_status').value == 2">
<mat-form-field>
<mat-select placeholder="Occupation" formControlName="non_earning_occupation" required>
<mat-option value="{{occupation.occupation_non_earning_member_id}}" *ngFor="let occupation of occupationData">
{{occupation.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==9">
<input matInput placeholder="Specify Others" formControlName="non_earning_if_others" required>
</mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==3">
<input matInput placeholder="Retired From" formControlName="non_earning_if_retired_from" type="date" required>
</mat-form-field>
</div>
</mat-card>
</div>
</div>
</div>
</mat-card-content>
</mat-card>
</div>
</div>
</ng-template>
</mat-tab>
<mat-tab label="Docs">
<ng-template matTabContent>
<div ngxViewer>
<div fxLayout="row wrap" style="padding:20px;">
<div fxFlex="100">
<div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=1" alt="Image 1"></div>
</div>
</div>
</div>
<div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=2" alt="Image 2"></div>
</div>
</div>
</div>
<div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list">
<div class="top"><img src="https://picsum.photos/2000/1500/?random=3" alt="Image 3"></div>
</div>
</div>
</div>
<div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=2" alt="Image 2"></div>
</div>
</div>
</div>
<div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list">
<div class="top"><img src="https://picsum.photos/2000/1500/?random=3" alt="Image 3"></div>
</div>
</div>
</div>
<div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=1" alt="Image 1"></div>
</div>
</div>
</div>
</div>
<div fxFlex="row">
<div fxFlex="100" class="m-gap p-gap">
<div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
</div>
<div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a>
</div>
</div>
</div>
</div>
</div>
</div>
</ng-template>
</mat-tab>
</mat-tab-group>
</mat-dialog-content>
<mat-dialog-actions>
<div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="family_details_form_remark"></textarea>
</mat-form-field>
</div>
<div fxFlex="40" align="end">
<button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="submitFamily()"><mat-icon>save</mat-icon></button>
</div>
</mat-dialog-actions>
</form>
<notifier-container></notifier-container>-->
<h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
@ -283,6 +22,7 @@
<div>
<mat-form-field style="width:45%;">
<mat-select placeholder="Select a person" formControlName="selected_person" (selectionChange)="selectedPerson($event.value,ix)" required>
<mat-option>Select</mat-option>
<mat-option value="{{person.pd_co_applicant_id}}" *ngFor="let person of selectPerson">
{{person.applicant_name}}
</mat-option>
@ -294,6 +34,7 @@
<h5>Residence Details of {{FamilyMemberAsLabel[ix]}}</h5>
<mat-form-field style="width:45%;">
<mat-select matInput placeholder="State" formControlName="residence_state" required (selectionChange)="getCity($event.value,ix)" >
<mat-option>Select</mat-option>
<mat-option value="{{s.state_id}}" *ngFor="let s of stateData">
{{s.name}}
</mat-option>
@ -301,6 +42,7 @@
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select matInput placeholder="City" formControlName="residence_city" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let c of cityData[ix]" [value]="c.city_id" >
{{c.city_name}}
</mat-option>
@ -311,6 +53,7 @@
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select matInput placeholder="Pin" formControlName="residence_pin" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let p of pincodeData[ix]" [value]="p.pincode_id">
{{p.pincode}}
</mat-option>
@ -336,6 +79,7 @@
<mat-form-field>
<mat-select placeholder="Ownership" formControlName="residence_ownership" required>
<mat-option>Select</mat-option>
<mat-option value="{{ownerShip.id}}" *ngFor="let ownerShip of ownerShipData">
{{ownerShip.name}}
</mat-option>
@ -369,6 +113,7 @@
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Relationship" formControlName="family_member_relationship" required>
<mat-option>Select</mat-option>
<mat-option value="{{relation.relationship_id}}" *ngFor="let relation of relationData">
{{relation.name}}
</mat-option>
@ -381,6 +126,7 @@
<div>
<mat-form-field>
<mat-select placeholder="Earning Status" formControlName="family_member_earning_status" required>
<mat-option>Select</mat-option>
<mat-option value="{{earnings.id}}" *ngFor="let earnings of earningStatus">
{{earnings.type}}
</mat-option>
@ -390,6 +136,7 @@
<div *ngIf="item.get('family_member_earning_status').value == 1">
<mat-form-field style="width:45%;">
<mat-select placeholder="Segment" formControlName="earning_segment" required>
<mat-option>Select</mat-option>
<mat-option value="{{earn.earning_member_status_id}}" *ngFor="let earn of earningData">
{{earn.earning_member_status}}
</mat-option>
@ -413,6 +160,7 @@
<div *ngIf="item.get('family_member_earning_status').value == 2">
<mat-form-field>
<mat-select placeholder="Occupation" formControlName="non_earning_occupation" required>
<mat-option>Select</mat-option>
<mat-option value="{{occupation.occupation_non_earning_member_id}}" *ngFor="let occupation of occupationData">
{{occupation.name}}
</mat-option>

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

@ -266,7 +266,7 @@
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_profit_to').value != ''">{{"&#8377;"}} {{AV_netProfitAmtToInwords[i]}} Only </mat-hint>
</mat-form-field>
<mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Net Profit" formControlName="estimate_net_profit_percent" readonly>
<input matInput autocomplete="off" placeholder="Considered Net Profit % " formControlName="estimate_net_profit_percent" readonly>
</mat-form-field>
<mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Profit Amount" formControlName="estimate_net_profit" type="number" readonly>
@ -276,11 +276,12 @@
</div>
<!-- </span> -->
<div *ngIf="details.get('estimate_net_profit').value != ''">
<mat-card-subtitle> Working Capital Details </mat-card-subtitle>
<mat-form-field style="width:50%">
<input matInput autocomplete="off" placeholder="what is the average no of days taken to receive the money?" formControlName="estimate_receive_the_money_in_days" type="number">
<input matInput autocomplete="off" placeholder="In case of Credit Sales, what is the average no of days taken to receive the money?" formControlName="estimate_receive_the_money_in_days" type="number">
</mat-form-field>
<mat-form-field style="width:50%">
<input matInput autocomplete="off" placeholder="what is the average no of days taken to pay the money?" formControlName="estimate_pay_the_money_in_days" type="number">
<input matInput autocomplete="off" placeholder="In case of Credit Purchase, what is the average no of days taken to pay the money?" formControlName="estimate_pay_the_money_in_days" type="number">
</mat-form-field>
<mat-form-field style="width:50%">
<input matInput autocomplete="off" placeholder="What is the average no of days for which stock lies unsold during the year?" formControlName="estimate_unsold_stock_lies_in_days" type="number">
@ -324,7 +325,7 @@
<input matInput autocomplete="off" placeholder="Net Loss % To" formControlName="estimate_loss_range_to" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);">
</mat-form-field>
<mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_loss_margin_percent" type="number" readonly>
<input matInput autocomplete="off" placeholder="Net Loss % Considered" formControlName="estimate_loss_margin_percent" type="number" readonly>
<!-- <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> -->
<!-- // -->
</mat-form-field>
@ -343,7 +344,7 @@
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"&#8377;"}} {{AV_netLossAmtToInwords[i]}} Only </mat-hint>
</mat-form-field>
<mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Net Loss" formControlName="estimate_net_loss_percent" readonly>
<input matInput autocomplete="off" placeholder="Considered Net Loss %" formControlName="estimate_net_loss_percent" readonly>
</mat-form-field>
<mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Loss Amount" formControlName="estimate_net_loss" type="number" readonly>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
View File

@ -30,7 +30,8 @@
{{loanAmtInWords}} Only</mat-hint>
</mat-form-field>
<mat-form-field style="width: 28%">
<input matInput placeholder="Loan Tenure applied for?" formControlName="loan_tenure" (keypress)="keyPress($event)"
<mat-label>Loan Tenure applied for?</mat-label>
<input matInput placeholder="No of months" formControlName="loan_tenure" (keypress)="keyPress($event)"
autocomplete="off">
</mat-form-field>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
View File

@ -36,6 +36,7 @@
<mat-form-field style="width: 40%">
<!-- Do You Know the Applicant -->
<mat-select placeholder=" Do you know about the applicants or their business?" formControlName="do_know">
<mat-option>Select</mat-option>
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
@ -84,6 +85,7 @@
<div fxFlex="60">
<mat-form-field style="width: 95%" *ngIf="neighbourhood.controls.do_know.value!='' && !isDisplay2[n] ; else OtherCondition;">
<mat-select placeholder="Who is the owner of the organisation?" formControlName="organisation_owner">
<mat-option>Select</mat-option>
<mat-option *ngFor="let list of applicants" [value]="list.pd_co_applicant_id">{{list.applicant_name}}</mat-option>
</mat-select>
</mat-form-field>
@ -119,6 +121,7 @@
<div *ngIf="_neighbourhoodForm.controls.check_type.value==0">
<mat-form-field style="width: 40%">
<mat-select placeholder="Status of the check as per PD officer?" formControlName="neighbourhood_status">
<mat-option>Select</mat-option>
<mat-option value="Positive">Positive</mat-option>
<mat-option value="Negative">Negative</mat-option>
</mat-select>

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

@ -235,6 +235,51 @@ export class NeighbourHoodComponent implements OnInit {
//save heighbourhood forms
saveNeighbourhood(formData:any){
let resultMessage:string='';
// const referencecheckControl = <FormGroup>this._neighbourhoodForm.controls['referencecheck_list'];
// const referencecheckControl = this._neighbourhoodForm.get('referencecheck_list') as FormControl;
const neighbourhoodControl : FormGroup = this._neighbourhoodForm.controls['neighbourhood_list'] as FormGroup;
if(formData.check_type==0){
console.log('neighbourhoodControl',neighbourhoodControl);
// neighbourhoodControl.contdols['neighbourhood_name'].setValidators([Validators.required]);
// neighbourhoodControl.controls['neighbourhood_name'].updateValueAndValidity();
// neighbourhoodControl.controls['do_know'].setValidators([Validators.required]);
// neighbourhoodControl.controls['do_know'].updateValueAndValidity();
return;
}
// if(formData.check_type==1){
// referencecheckControl.controls['reference_name'].setValidators([Validators.required]);
// referencecheckControl.controls['reference_name'].updateValueAndValidity();
// referencecheckControl.controls['location'].setValidators([Validators.required]);
// referencecheckControl.controls['location'].updateValueAndValidity();
// referencecheckControl.controls['mobile'].setValidators([Validators.required]);
// referencecheckControl.controls['mobile'].updateValueAndValidity();
// referencecheckControl.controls['relationship_with'].setValidators([Validators.required]);
// referencecheckControl.controls['relationship_with'].updateValueAndValidity();
// referencecheckControl.controls['year_relation_applicant'].setValidators([Validators.required]);
// referencecheckControl.controls['year_relation_applicant'].updateValueAndValidity();
// referencecheckControl.controls['business_volume_amount'].setValidators([Validators.required]);
// referencecheckControl.controls['business_volume_amount'].updateValueAndValidity();
// referencecheckControl.controls['business_volume_unit'].setValidators([Validators.required]);
// referencecheckControl.controls['business_volume_unit'].updateValueAndValidity();
// referencecheckControl.controls['reference_final_remarks'].setValidators([Validators.required]);
// referencecheckControl.controls['reference_final_remarks'].updateValueAndValidity();
// }
if (this._neighbourhoodForm.invalid) {
this.validateAllFormFields(this._neighbourhoodForm);
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
View File

@ -24,6 +24,7 @@
<mat-form-field style="width:45% !important;">
<mat-select (selectionChange)="selectedLoanChanges($event)" placeholder="Other Income"
formControlName="other_income">
<mat-option>Select</mat-option>
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
@ -40,6 +41,7 @@
<mat-form-field style="width:45%">
<mat-select placeholder="Source"
formControlName="source">
<mat-option>Select</mat-option>
<mat-option value="{{src.id}}" *ngFor="let src of sourceData">{{src.name}}</mat-option>
<!-- <mat-option value="rental_income">Rental Income</mat-option>
<mat-option value="interest_income">Interest Income</mat-option>
@ -57,6 +59,7 @@
<mat-form-field style="width:45%">
<mat-select placeholder="Income earned by"
formControlName="income_earned_by">
<mat-option>Select</mat-option>
<mat-option value="{{person.applicant_id}}" *ngFor="let person of incomeEarnedBy">
{{person.applicant_name}}
</mat-option>
@ -75,6 +78,7 @@
<mat-form-field style="width:45%">
<mat-select placeholder="Frequency" formControlName="frequency">
<mat-option>Select</mat-option>
<mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
</mat-select>
</mat-form-field>

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

@ -26,6 +26,7 @@
<mat-form-field style="width:35%;">
<mat-select placeholder="Property Owner" formControlName="property_own">
<mat-option>Select</mat-option>
<mat-option value="applicant">Applicant</mat-option>
<mat-option value="co_applicant">co-applicant</mat-option>
<mat-option value="parental">Parental</mat-option>
@ -33,8 +34,9 @@
</mat-form-field>
<mat-form-field style="width:35%;">
<mat-select placeholder="Nature of the let out property" formControlName="nature_property">
<mat-option>Select</mat-option>
<mat-option value="residentail/commercial">Residential/commercial</mat-option>
<mat-option value="other">other</mat-option>
<mat-option value="other">Other</mat-option>
</mat-select>
</mat-form-field>
@ -78,6 +80,7 @@
<mat-form-field>
<mat-select placeholder="Is Rent Agreement Available"
formControlName="is_rent">
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
@ -105,6 +108,7 @@
<mat-form-field>
<mat-select placeholder="Photo of agreement taken ?"
formControlName="photo_areegment">
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
@ -186,6 +190,7 @@
<mat-form-field style="width:35%;">
<mat-select placeholder="Photogaraphs of the Property"
formControlName="property_photographs">
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>

112
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
View File

@ -21,11 +21,11 @@
<!-- <mat-card-header>
<mat-card-title class="highlight"> Manufacturing Details </mat-card-title>
</mat-card-header> -->
<h5 class="highlight" style="margin: 12px;">Manufacturing Stock Details</h5>
<div formArrayName="manufacturing_details">
<div *ngFor="let md of stockForms.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i">
<div formArrayName="manufacturing_raw_materials">
<span formArrayName="manufacturing_raw_materials">
<div *ngFor="let mrm of md.controls.manufacturing_raw_materials['controls']; let a=index; let last=last" [formGroupName]="a">
<h5 class="highlight" style="margin: 12px;">Manufacturing Stock Details</h5>
<mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Raw Material #{{a+1}} </i> </mat-label>
<mat-card-content class="matcard">
@ -34,7 +34,8 @@
</mat-form-field>
<mat-form-field style="width:30%">
<!-- <mat-select placeholder="is the Stock is Observed ?" formControlName="stock_observed" > -->
<mat-select placeholder="Stock" formControlName="stock_observed" >
<mat-select placeholder="Stock" formControlName="stock_observed">
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option>
</mat-select>
@ -44,8 +45,9 @@
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="raw_quantity" (keypress)="keyPress($event)">
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Unit of Mearsurement"
formControlName="raw_uom" >
<mat-select placeholder="Unit of Measurement"
formControlName="raw_uom">
<mat-option>Select</mat-option>
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select>
</mat-form-field>
@ -59,17 +61,6 @@
<!-- <mat-form-field style="width:76%">
<input matInput autocomplete="off" placeholder="Value of raw materials as per latest financial Statements" formControlName="rawmaterial_value" (keypress)="keyPress($event)">
</mat-form-field> -->
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations" formControlName="is_sufficiant_raw" (selectionChange)="checkComments($event.value,1,a)">
<mat-option value="yes" >Yes</mat-option>
<mat-option value="no" >No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="mrmCommentFlag[a]" appearance="outline" style="width: 90%">
<!-- *ngIf="mrm.get('is_sufficiant_raw').value == 'no'" -->
<mat-label> <i>Please comment on the stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="rawmaterial_remarks"></textarea>
</mat-form-field>
</span>
</mat-card-content>
<mat-card-actions>
@ -89,7 +80,20 @@
</mat-card-actions>
</mat-card>
</div>
</div>
</span>
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations" formControlName="is_sufficiant_raw">
<mat-option>Select</mat-option>
<mat-option value="yes" >Yes</mat-option>
<mat-option value="no" >No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="outline" style="width: 90%" *ngIf="md.get('is_sufficiant_raw').value == 'no'">
<mat-label> <i>Please comment on the stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="rawmaterial_remarks"></textarea>
</mat-form-field>
<div formArrayName="manufacturing_finished_goods">
<div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index;let last=last" [formGroupName]="b">
@ -101,7 +105,8 @@
</mat-form-field>
<mat-form-field style="width:30%">
<!-- <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed" > -->
<mat-select placeholder="Stock" formControlName="goods_observed" >
<mat-select placeholder="Stock" formControlName="goods_observed">
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option>
</mat-select>
@ -111,8 +116,9 @@
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Unit of Mearsurement"
<mat-select placeholder="Unit of Measurement"
formControlName="goods_uom" >
<mat-option>Select</mat-option>
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select>
</mat-form-field>
@ -123,20 +129,6 @@
<input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event.target.value,2,b)" >
<mat-hint align="start" style="font-size:70%" *ngIf="mfg.get('goods_value').value != ''">{{"&#8377;"}} {{M_goodsValueInWords[b]}} Only</mat-hint>
</mat-form-field>
<!-- <mat-form-field style="width:76%">
<input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)">
</mat-form-field> -->
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Finished Goods Observed sufficient considering the size of operations?" formControlName="is_sufficiant_goods" (selectionChange)="checkComments($event.value,2,b)">
<mat-option value="yes" >Yes</mat-option>
<mat-option value="no" >No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="mfgCommentFlag[b]" appearance="outline" style="width: 90%">
<!-- *ngIf="mfg.get('is_sufficiant_goods').value == 'no'" -->
<mat-label class="highlight"> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
</mat-form-field>
</span>
<!-- <button type="button" mat-raised-button mat-icon-button (click)="addGoods(1)"
@ -179,15 +171,11 @@
<mat-card-title class="highlight"><p>Retail Details</p></mat-card-title>
</mat-card-header> -->
<h5 class="highlight" style="margin: 12px;">Retail Trading Details</h5>
<div formArrayName="retail_details">
<div *ngFor="let rd of stockForms.controls.retail_details['controls']; let j=index" [formGroupName]="j">
<div formArrayName="retail_traded_goods">
<div *ngFor="let item of rd.controls.retail_traded_goods['controls']; let e=index;let last =last" [formGroupName]="e">
<h5 class="highlight" style="margin: 12px;">Retail Trading Details</h5>
<mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Traded Goods #{{e+1}} </i> </mat-label>
<mat-card-content class="matcard">
@ -195,7 +183,8 @@
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="traded_goods_observed" >
<mat-select placeholder="Stock" formControlName="traded_goods_observed">
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option>
</mat-select>
@ -205,8 +194,9 @@
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)">
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Unit of Mearsurement"
<mat-select placeholder="Unit of Measurement"
formControlName="traded_goods_uom" >
<mat-option>Select</mat-option>
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select>
</mat-form-field>
@ -217,9 +207,10 @@
<input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event.target.value,3,e)" >
<mat-hint align="start" style="font-size:70%" *ngIf="item.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{R_tradedGoodsValueInWords[e]}} Only</mat-hint>
</mat-form-field>
</span>
<!-- <mat-form-field style="width:76%">
<input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)">
</mat-form-field> -->
</mat-form-field>
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Traded goods observed ?" formControlName="is_sufficiant_traded_goods" (selectionChange)="checkComments($event.value,3,e)">
@ -228,12 +219,10 @@
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="rtrdCommentFlag[e]" appearance="outline" style="width: 90%">
<!-- *ngIf="item.get('is_sufficiant_traded_goods').value == 'no'" -->
<!-- *ngIf="item.get('is_sufficiant_traded_goods').value == 'no'"
<mat-label> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
</mat-form-field>
</span>
</mat-form-field>-->
<!-- <button type="button" mat-raised-button mat-icon-button (click)=""
matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" *ngIf="e==0">
<mat-icon>add</mat-icon>
@ -272,12 +261,12 @@
<mat-card-title class="highlight"><p>Trading Details</p></mat-card-title>
</mat-card-header> -->
<h5 class="highlight" style="margin: 12px;">Wholesale Trading Details</h5>
<div formArrayName="trade_details">
<div *ngFor="let td of stockForms.controls.trade_details['controls']; let k=index" [formGroupName]="k">
<div formArrayName="trading_traded_goods">
<div *ngFor="let tradetg of td.controls.trading_traded_goods['controls']; let g=index;let last = last" [formGroupName]="g">
<h5 class="highlight" style="margin: 12px;">Wholesale Trading Details</h5>
<mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Traded Goods #{{g+1}} </i> </mat-label>
<mat-card-content class="matcard">
@ -286,6 +275,7 @@
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="traded_goods_observed" >
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No stock observed</mat-option>
</mat-select>
@ -295,8 +285,9 @@
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)">
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Unit of Mearsurement"
<mat-select placeholder="Unit of Measurement"
formControlName="traded_goods_uom" >
<mat-option>Select</mat-option>
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select>
</mat-form-field>
@ -310,18 +301,18 @@
<!-- <mat-form-field style="width:76%">
<input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)">
</mat-form-field> -->
<mat-form-field style="width:90%">
<!-- <input matInput autocomplete="off" placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods" > -->
<!-- <mat-form-field style="width:90%">
<input matInput autocomplete="off" placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods" >
<mat-select placeholder="Is the stock of Traded goods observed ?" formControlName="is_sufficiant_traded_goods" (selectionChange)="checkComments($event.value,4,g)">
<mat-option value="yes" >Yes</mat-option>
<mat-option value="no" >No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="wtrdCommentFlag[g]" appearance="outline" style="width: 90%">
<!-- //*ngIf="tradetg.get('is_sufficiant_traded_goods').value == 'no'" -->
<!-- //*ngIf="tradetg.get('is_sufficiant_traded_goods').value == 'no'"
<mat-label> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
</mat-form-field>
</mat-form-field>-->
</span>
<!-- <button type="button" mat-raised-button mat-icon-button (click)=""
@ -356,6 +347,21 @@
</mat-card>
<div *ngIf="finishedAndTradedGoodsCommentCard">
<br>
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations" formControlName="is_sufficiant_finished_and_traded_goods">
<mat-option>Select</mat-option>
<mat-option value="yes" >Yes</mat-option>
<mat-option value="no" >No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="outline" style="width: 90%" *ngIf="this.stockForms.controls.is_sufficiant_finished_and_traded_goods.value == 'no'">
<mat-label> <i>Please comment on the stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="finished_and_traded_goods_remarks"></textarea>
</mat-form-field>
</div>
<mat-card *ngIf="serviceProviderForm">
<!-- <mat-card-header>
<p>Service Provider</p>
@ -363,6 +369,8 @@
<h5 class="highlight" style="margin: 12px;">Service Provider</h5>
<div style="text-align: center; margin: 12px;">Service Provider Details Not applicable here !!</div>
</mat-card>
</div>
</div>

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

@ -54,7 +54,8 @@ export class StockComponent implements OnInit {
// tradeConcernAccess: Boolean = false;
// serviceAccess: Boolean = false;
mrmCommentFlag:any=[];
mrmCommentFlag: boolean = false;
finishedAndTradedGoodsCommentCard : boolean;
mfgCommentFlag:any=[];
rtrdCommentFlag:any=[];
wtrdCommentFlag:any=[];
@ -141,6 +142,13 @@ export class StockComponent implements OnInit {
let api = Object.keys(record.from_business).map(function (key) {
return record.from_business[key];
});
let type2 = record.from_business.filter(data => data.type_of_activity_id == 2);
let type2length = type2[0].products ? type2[0].products.length : 0;
let type3 = record.from_business.filter(data => data.type_of_activity_id == 3);
let type3length = type3[0].products ? type2[0].products.length : 0;
let type4 = record.from_business.filter(data => data.type_of_activity_id == 4);
let type4length = type4[0].products ? type2[0].products.length : 0;
let rm_api = record.from_supplier;
let params: any = {};
@ -157,21 +165,29 @@ export class StockComponent implements OnInit {
company_id: [this.company_id],
stock_remarks: [dataForm.stock_remarks],
manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
retail_details : this.fb.array([this.retailFormCreation(api)]),
trade_details: this.fb.array([this.tradingFormCreation(api)]),
retail_details : this.fb.array([this.retailFormCreation(type3length)]),
trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
is_sufficiant_finished_and_traded_goods:[dataForm.is_sufficiant_finished_and_traded_goods],
finished_and_traded_goods_remarks:[dataForm.finished_and_traded_goods_remarks]
});
if(api.length > 0){
api.forEach(val => {
if (val.type_of_activity_id == 2) {
if(val.products){
if(dataForm.manufacturing_details[0].manufacturing_finished_goods ){this.finishedAndTradedGoodsCommentCard = true;}
let manufacturing_temparr = [];
manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials;
this.stockForms.controls['manufacturing_details']['controls'][0].controls['is_sufficiant_raw'].setValue(dataForm.manufacturing_details[0].is_sufficiant_raw),
// this.checkComments(dataForm.manufacturing_details[0].is_sufficiant_raw.value,1,'');
this.stockForms.controls['manufacturing_details']['controls'][0].controls['rawmaterial_remarks'].setValue(dataForm.manufacturing_details[0].rawmaterial_remarks);
manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods;
this.initManufacturingDetails(manufacturing_temparr);
}
}
if (val.type_of_activity_id == 3) {
if(val.products){
this.finishedAndTradedGoodsCommentCard = true;
let retail_temparr = [];
retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
this.initRetailDetails(retail_temparr);
@ -179,6 +195,7 @@ export class StockComponent implements OnInit {
}
if (val.type_of_activity_id == 4) {
if(val.products){
this.finishedAndTradedGoodsCommentCard = true;
let trading_temparr = [];
trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
this.initTradingDetails(trading_temparr);
@ -194,35 +211,44 @@ export class StockComponent implements OnInit {
}
}
else{
this.stockForms = this.fb.group({
pdid: [this.pdid],
formid: [this.form_id],
company_id: [this.company_id],
stock_remarks: [''],
manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
retail_details : this.fb.array([this.retailFormCreation(record.from_business)]),
trade_details: this.fb.array([this.tradingFormCreation(record.from_business)]),
retail_details : this.fb.array([this.retailFormCreation(type3length)]),
trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
is_sufficiant_finished_and_traded_goods:[''],
finished_and_traded_goods_remarks:['']
});
if(api.length > 0){
api.forEach(val => {
if (val.type_of_activity_id == 2) {
if(val.products){
if(val.products){this.finishedAndTradedGoodsCommentCard = true;}
this.suppliers_raw_materials = rm_api;
this.suppliers_finished_goods = val.products;
this.initManufacturingDetails(null);
this.stockForms.controls['manufacturing_details']['controls'][0].controls['is_sufficiant_raw'].setValue(dataForm.manufacturing_details[0].is_sufficiant_raw.value || null),
this.stockForms.controls['manufacturing_details']['controls'][0].controls['rawmaterial_remarks'].setValue(dataForm.manufacturing_details[0].rawmaterial_remarks || null);
}
}
if (val.type_of_activity_id == 3) {
if(val.products){
this.finishedAndTradedGoodsCommentCard = true;
this.suppliers_retail_trade_details = val.products;
this.initRetailDetails(null);
this.initRetailDetails(null);
}
}
if (val.type_of_activity_id == 4) {
if(val.products){
this.finishedAndTradedGoodsCommentCard = true;
this.suppliers_wholesale_trade_details =val.products;
this.initTradingDetails(null);
this.initTradingDetails(null);
}
}
if (val.type_of_activity_id == 5) {
@ -245,26 +271,33 @@ export class StockComponent implements OnInit {
company_id: [this.company_id],
stock_remarks: [''],
manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
retail_details : this.fb.array([this.retailFormCreation(record.from_business)]),
trade_details: this.fb.array([this.tradingFormCreation(record.from_business)]),
retail_details : this.fb.array([this.retailFormCreation(type3length)]),
trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
is_sufficiant_finished_and_traded_goods:[''],
finished_and_traded_goods_remarks:['']
});
if(api.length > 0){
api.forEach(val => {
if (val.type_of_activity_id == 2) {
if(val.products){
if(val.products){this.finishedAndTradedGoodsCommentCard = true;}
this.suppliers_finished_goods = val.products;
this.suppliers_raw_materials = rm_api;
this.initManufacturingDetails(null);
this.stockForms.controls['manufacturing_details']['controls'][0].controls['is_sufficiant_raw'].setValue(null);
this.stockForms.controls['manufacturing_details']['controls'][0].controls['rawmaterial_remarks'].setValue(null);
}
}
if (val.type_of_activity_id == 3) {
if(val.products){
this.suppliers_retail_trade_details= val.products;
this.suppliers_retail_trade_details= val.products;
this.finishedAndTradedGoodsCommentCard = true;
this.initRetailDetails(null);
}
}
if (val.type_of_activity_id == 4) {
if(val.products){
this.finishedAndTradedGoodsCommentCard = true;
this.suppliers_wholesale_trade_details = val.products;
this.initTradingDetails(null);
}
@ -287,23 +320,28 @@ export class StockComponent implements OnInit {
let arr = record.from_business.filter(data => data.type_of_activity_id == 2);
let rm_arr = record.from_supplier;
if (arr.length > 0) {
// let rm_arr = 0;
this.manufacturingForm = true;
return this.fb.group({
manufacturing_raw_materials: this.fb.array([]),
manufacturing_finished_goods: this.fb.array([]),
})
} else {
if(arr.length > 0){
return this.fb.group({
manufacturing_raw_materials: this.fb.array([]),
is_sufficiant_raw: [],
rawmaterial_remarks:[],
manufacturing_finished_goods: this.fb.array([]),
})
}
else {
return;
}
}
}
retailForm: Boolean = false;
retailFormCreation(val) {
let arr = val.filter(data => data.type_of_activity_id == 3);
if (arr.length > 0) {
// console.log(val);
// let arr = val.filter(data => data.type_of_activity_id == 3);
if (val > 0) {
this.retailForm = true;
return this.fb.group({
retail_traded_goods: this.fb.array([])
@ -316,8 +354,8 @@ retailFormCreation(val) {
tradingForm: Boolean = false;
tradingFormCreation(val) {
let arr = val.filter(data => data.type_of_activity_id == 4);
if (arr.length > 0) {
// let arr = val.filter(data => data.type_of_activity_id == 4);
if (val > 0) {
this.tradingForm = true;
return this.fb.group({
trading_traded_goods: this.fb.array([])
@ -343,9 +381,7 @@ tradingFormCreation(val) {
'raw_quantity': '',
'raw_uom': '',
'other_uom': '',
'raw_value': '',
'is_sufficiant_raw': '',
'rawmaterial_remarks':''};
'raw_value': ''};
rawMaterial.push(this.createRawmaterial(Ref_RawMaterials));
});
}
@ -362,8 +398,7 @@ tradingFormCreation(val) {
'goods_uom': '',
'goods_other_uom': '',
'goods_value': '',
'is_sufficiant_goods': '',
'finishedgoods_remarks':''};
};
finishedGoods.push(this.createGoods(Ref_Finished_Goods));
// finishedGoods.push(this.createGoods(null));
});
@ -380,7 +415,7 @@ tradingFormCreation(val) {
if(val.raw_value){
this.inWords(val.raw_value,1,index);
}
this.checkComments(val.is_sufficiant_raw,1,index);
// this.checkComments(val.is_sufficiant_raw,1,index);
rawMaterial.push(this.createRawmaterial(val));
});
}
@ -394,7 +429,7 @@ tradingFormCreation(val) {
if(val.goods_value){
this.inWords(val.goods_value,2,index);
}
this.checkComments(val.is_sufficiant_goods,2,index);
finishedGoods.push(this.createGoods(val));
});
@ -417,8 +452,6 @@ tradingFormCreation(val) {
other_uom : [''],
raw_value: [''],
// rawmaterial_value: [''],
is_sufficiant_raw: [''],
rawmaterial_remarks:['']
})
} else {
@ -431,8 +464,6 @@ tradingFormCreation(val) {
other_uom : [records.other_uom],
raw_value: [records.raw_value],
// rawmaterial_value: [records.rawmaterial_value],
is_sufficiant_raw: [records.is_sufficiant_raw],
rawmaterial_remarks:[records.rawmaterial_remarks]
})
}
}
@ -453,9 +484,7 @@ tradingFormCreation(val) {
'traded_goods_quantity': '',
'traded_goods_uom': '',
'traded_goods_other_uom': '',
'estimated_traded_goods_value': '',
'is_sufficiant_traded_goods': '',
'traded_goods_remarks':''};
'estimated_traded_goods_value': ''}
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
});
}
@ -471,7 +500,7 @@ tradingFormCreation(val) {
if(val.estimated_traded_goods_value){
this.inWords(val.estimated_traded_goods_value,3,index);
}
this.checkComments(val.is_sufficiant_traded_goods,3,index);
tradedGoods.push(this.createTradedGoods(val));
});
@ -504,8 +533,7 @@ tradingFormCreation(val) {
goods_other_uom: [''],
goods_value: [''],
// finished_goods_value: [''],
is_sufficiant_goods: [''],
finishedgoods_remarks:['']
});
}
else {
@ -517,8 +545,7 @@ tradingFormCreation(val) {
goods_other_uom: [records.goods_other_uom],
goods_value: [records.goods_value],
// finished_goods_value: [records.finished_goods_value],
is_sufficiant_goods: [records.is_sufficiant_goods],
finishedgoods_remarks:[records.finishedgoods_remarks]
})
}
}
@ -533,8 +560,6 @@ tradingFormCreation(val) {
// traded_goods_other_uom: [''],
// estimated_traded_goods_value: [''],
// // traded_goods_value: [''],
// is_sufficiant_traded_goods: [''],
// traded_goods_remarks:['']
// });
// }
@ -552,9 +577,8 @@ tradingFormCreation(val) {
'traded_goods_quantity': '',
'traded_goods_uom': '',
'traded_goods_other_uom': '',
'estimated_traded_goods_value': '',
'is_sufficiant_traded_goods': '',
'traded_goods_remarks':''};
'estimated_traded_goods_value': ''}
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
});
}
@ -571,7 +595,6 @@ tradingFormCreation(val) {
if(val.estimated_traded_goods_value){
this.inWords(val.estimated_traded_goods_value,4,index);
}
this.checkComments(val.is_sufficiant_traded_goods,4,index);
tradedGoods.push(this.createTradedGoods(val));
});
}
@ -593,8 +616,6 @@ tradingFormCreation(val) {
traded_goods_other_uom: [''],
estimated_traded_goods_value: [''],
// traded_goods_value: [''],
is_sufficiant_traded_goods: [''],
traded_goods_remarks:['']
});
}
else {
@ -606,8 +627,7 @@ tradingFormCreation(val) {
traded_goods_other_uom: [records.traded_goods_other_uom],
estimated_traded_goods_value: [records.estimated_traded_goods_value],
// traded_goods_value: [records.traded_goods_value],
is_sufficiant_traded_goods: [records.is_sufficiant_traded_goods],
traded_goods_remarks:[records.traded_goods_remarks]
})
}
}
@ -783,10 +803,10 @@ tradingFormCreation(val) {
checkComments(e,flag,index){
if(flag == 1 && e=='no'){
this.mrmCommentFlag[index] = true;
this.mrmCommentFlag = true;
}
else if(flag == 1 && e!='no'){
this.mrmCommentFlag[index] = false;
this.mrmCommentFlag = false;
}
if(flag == 2 && e=='no'){
this.mfgCommentFlag[index] = true;

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

@ -31,6 +31,7 @@
<div fxLayout="row nowrap">
<mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let tl of titleList" [value]="tl.title_id">
{{tl.name}}
</mat-option>
@ -74,12 +75,14 @@
</mat-select>
</mat-form-field> -->
<mat-select placeholder="Payment Terms" formControlName="manufacturing_payment_type" (selectionChange)="selectedPaymentTerms(items,$event.value,1);checkCard($event.value,1,l);">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Payment Mode" formControlName="manufacturing_payment_mode">
<mat-option>Select</mat-option>
<mat-option value="Payment made in Cash.">Payment made in Cash.</mat-option>
<mat-option value="Payment made through Banking channels.">Payment made through Banking channels.</mat-option>
</mat-select>
@ -145,6 +148,7 @@
<div fxLayout="row nowrap">
<mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let tl of titleList" [value]="tl.title_id">
{{tl.name}}
</mat-option>
@ -187,11 +191,13 @@
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="trade_product_payment_type" (selectionChange)="selectedPaymentTerms(items,$event.value,2);checkCard($event.value,2,l);">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Payment Mode" formControlName="trade_product_payment_mode">
<mat-option>Select</mat-option>
<mat-option value="Payment made in Cash.">Payment made in Cash.</mat-option>
<mat-option value="Payment made through Banking channels.">Payment made through Banking channels.</mat-option>
</mat-select>

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

@ -248,11 +248,11 @@
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>QC Remarks</ng-template>
<div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED'" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
<ng-template mat-tab-label>QC Feedback</ng-template>
<div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED';else nodata" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
fxFlex.lg="100" fxFlex.xl="100">
<div style="color:red !important;">
<h6>QC Remarks</h6>
<h6>QC Feedback</h6>
</div>
<div>
<div style="display: inline-flex">
@ -269,6 +269,11 @@
{{ pdMasterData[0]?.qc_feedback}}
</div>
</div>
<ng-template #nodata>
<mat-card-content>
<p>No Feedback</p>
</mat-card-content>
</ng-template>
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>PD History</ng-template>