+
+
@@ -1623,15 +1626,21 @@
Shop and Est Act Cert Required
-
+
-->
+
+
+
+
+ 
+
- Shop and Est Act Cert Image
Shop and Est Act Cert Image
+ +
+
@@ -1641,14 +1650,22 @@
GST Regn Cert Required
- 
+
+
-
-
+
+
+
-
-
- GST Regn Cert Image
-GST Regn Cert Image
+ + +
+
+
@@ -1658,14 +1675,21 @@
Export / Import cert Required
-
+
+
+
+ 
+
+
- Export / Import cert Image
+ +
+
Yes
@@ -1674,15 +1698,22 @@
Factory Cert Required
-
+
+
+
+ 
+
+
- Factory cert Image
+ +
+
+
@@ -1692,15 +1723,22 @@
Cert of Practice Required
-
+
+
+
+ 
+
+
- Cert of Practice Image
+ +
+
Yes
@@ -1709,15 +1747,22 @@
PF Regn Required
-
+
+
+
+ 
+
+
- PF Regn Image
+ +
+
Yes
@@ -1726,12 +1771,20 @@
ESIC Regn Required
-
-
-
-
-
@@ -216,4 +200,20 @@
+
+
+
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
index 5206aee7e..ad4fa489e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
@@ -41,7 +41,7 @@ export class FinancialInfoComponent implements OnInit {
form_id: number;
company_id: string;
CustSegAbbr : any;
-
+ ServiceDataAvailability: boolean = false;
public financialForm: FormGroup;
private notifier: NotifierService;
@@ -124,6 +124,23 @@ export class FinancialInfoComponent implements OnInit {
ngOnInit() {
this.initstockForm();
+ this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid, this.company_id).subscribe(data => {
+ if (data.dataStatus) {
+ if(data.records.type_of_activity.length == 1){
+ let bussiness_service_datas = data.records.type_of_activity.filter(data => { if (data.type_of_activity_id == 5) { return data } }).map(data => [...data.prodcuts]);
+ this.ServiceDataAvailability = bussiness_service_datas.length>0 ? true : false;
+ if(this.ServiceDataAvailability == true){
+ this.financialForm.controls['unsold_stock_lies_in_days'].setValue('NA');
+ }
+ else if(this.ServiceDataAvailability == false){
+ this.financialForm.controls['unsold_stock_lies_in_days'].setValue('');
+ }
+ }
+ else{
+ this.ServiceDataAvailability = false;
+ }
+ }
+ })
const workingCptlControl = this.financialForm.controls['select_working_capital_facilities_availed'];
let params: any = {};
@@ -255,6 +272,10 @@ export class FinancialInfoComponent implements OnInit {
retriveData.company_id = this.company_id;
retriveData.fk_createdby = this.pdid;
this.financialForm.setValue(retriveData);
+ if(this.ServiceDataAvailability == false && retriveData.unsold_stock_lies_in_days == 'NA'){
+ console.log('Data Required');
+ this.financialForm.controls['unsold_stock_lies_in_days'].setValue('');
+ }
// this.financialForm.patchValue(retriveData);
} else {
let avData = this.av.map(item => ({ name: item.name, id: item.id }))
@@ -302,6 +323,7 @@ export class FinancialInfoComponent implements OnInit {
this.documentsAndFilesList = [];
}
});
+
}
workingCptl(details: any): FormGroup {
@@ -1214,9 +1236,14 @@ export class FinancialInfoComponent implements OnInit {
if(annual_sale != ''){
-
- let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin);
- let b = a / (temp_prev_profit_margin != 0 ? Math.abs(temp_prev_profit_margin) : Math.abs(temp_prev_loss_margin));
+ let current_margin : number =(profit_margin != '' ? parseFloat(profit_margin.toFixed(2)) : loss_margin != '' ? parseFloat(loss_margin.toFixed(2)) : 0.00 );
+ let pre_margin : number = (temp_prev_profit_margin != 0 ? parseFloat(temp_prev_profit_margin.toFixed(2)) : temp_prev_loss_margin != 0 ? parseFloat(temp_prev_loss_margin.toFixed(2)) : 0.00 );
+ let absoulte_value_of_pre_margin : number = (temp_prev_profit_margin != 0 ? Math.abs(parseFloat(temp_prev_profit_margin.toFixed(2))) : temp_prev_loss_margin != 0 ? Math.abs(parseFloat(temp_prev_loss_margin.toFixed(2))) : 0.00 );
+
+ let a: number = current_margin - pre_margin;
+ let b: number = parseFloat(a.toFixed(2)) / absoulte_value_of_pre_margin;
+ // let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin);
+ // let b = a / (temp_prev_profit_margin != 0 ? Math.abs(temp_prev_profit_margin) : Math.abs(temp_prev_loss_margin));
let c = b * 100;
let final_percent = c != Infinity ? !(Number.isNaN(c)) ? c != -Infinity ? c.toFixed(2) : 0 : 0 : 0 ;
@@ -1909,6 +1936,19 @@ export class FinancialInfoComponent implements OnInit {
console.log('this.financialForm.value',this.financialForm.value);
let records = this.financialForm.value;
records.select_working_capital_facilities_availed = records.select_working_capital_facilities_availed.filter(value => value.exist_status == 1);
+ records.select_working_capital_facilities_availed = records.select_working_capital_facilities_availed.filter(value => value.exist_status == 1);
+ console.log(records.is_there_working_capital_available);
+ if(records.is_there_working_capital_available == "no"){
+ records.select_working_capital_facilities_availed = [];
+ if(records.bank_guarantee) delete records.bank_guarantee ;
+ if(records.cash_credit_limit) delete records.cash_credit_limit;
+ if(records.factoring) delete records.factoring;
+ if(records.forfaiting) delete records.forfaiting;
+ if(records.letter_of_credit) delete records.letter_of_credit;
+ if(records.od_limit) delete records.od_limit;
+ if(records.other_reason_for_working_capital_facilities_availed) delete records.other_reason_for_working_capital_facilities_availed ;
+ if(records.reason_for_working_capital_facilities_availed) delete records.reason_for_working_capital_facilities_availed ;
+ }
console.log('records',records);
this._pd.saveForm(records).subscribe(data => {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
index 38a905a1d..bd8878a13 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
@@ -351,7 +351,7 @@ export class SupplierInfoComponent implements OnInit {
manufacturing_raw_material_name: [records.manufacturing_raw_material_name || null],
manufacturing_supplier_name: [records.manufacturing_supplier_name || null],
person_title_name: [records.person_title_name || null],
- person_designation: [records.person_title_name || null],
+ person_designation: [records.person_designation || null],
other_person_designation: [records.other_person_designation || null],
manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null],
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null, Validators.compose([Validators.minLength(10), Validators.maxLength(10)])],
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 250dec2c2..a65207aa9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -69,7 +69,7 @@
-
+
+
Lender Contact Details
+
+
+
+ 
+
+
ESIC Regn Image
+ + +
{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
@@ -10,13 +11,12 @@
-@@ -10,13 +11,12 @@
-
-
+
+
+ Other Remarks
+
+
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
index 436139187..9c67bd3ca 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
@@ -71,6 +71,12 @@
{{master.loan_amount | numberToWords}} Only
+
+ {{master.loan_amount | numberToWords}} Only
+
+