@@ -179,36 +193,39 @@
-
- Retail Details
-
+
+ Retail Details
-
+
@@ -290,35 +313,38 @@
-
- Trading Details
-
+
+ Trading Details
@@ -401,9 +433,10 @@
-
+
+ Service Provider
Service Provider Details Not applicable here !!
@@ -515,7 +548,7 @@
- Remarks
+ Remarks
@@ -527,7 +560,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
index 27caaf50a..f7e0b7e79 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
@@ -16,7 +16,9 @@
// background: #62B013;
// color: white;
// }
-
+.highlight {
+ color: red;
+ }
.paragraph_change {
color: #fff !important;
background-color: #e00201 !important;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index e6660afc0..cbd3a7e76 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -22,21 +22,31 @@ export class StockComponent implements OnInit {
pageTitle: string ="Stock Details";
pdid: number;
form_id: number;
+ company_id: string;
public stockForms: FormGroup;
private notifier: NotifierService;
public uomData : any = [];
rawmaterial : any;
- M_rawValueInWords : any;
-
- M_goodsValueInWords : any;
- R_goodsValueInWords : any;
- T_goodsValueInWords : any;
+ M_rawValueInWords : any = [];
+ M_financialRawValueInWords : any = [];
- M_tradedGoodsValueInWords : any;
- R_tradedGoodsValueInWords : any;
- T_tradedGoodsValueInWords : any;
+ M_goodsValueInWords : any = [];
+ R_goodsValueInWords : any = [];
+ T_goodsValueInWords : any = [];
+
+ M_financialGoodsValueInWords : any = [];
+ R_financialGoodsValueInWords : any = [];
+ T_financialGoodsValueInWords : any = [];
+
+ M_tradedGoodsValueInWords : any = [];
+ R_tradedGoodsValueInWords : any = [];
+ T_tradedGoodsValueInWords : any = [];
+
+ M_financialTradedGoodsValueInWords : any = [];
+ R_financialTradedGoodsValueInWords : any = [];
+ T_financialTradedGoodsValueInWords : any = [];
rawMaterialAccess: boolean;
finishedGoodsAccess: boolean;
@@ -44,12 +54,14 @@ export class StockComponent implements OnInit {
public submitted = false;
noRecordsFound: Boolean = false;
serviceProviderForm: Boolean = false;
+ suppliers_raw_materials : any = [];
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
private router: Router,
private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.form_id = 11;
+ this.company_id = this.pd_all_details.company_id
this.notifier = notifier;
}
public viewerOptions: any = {
@@ -82,7 +94,7 @@ export class StockComponent implements OnInit {
// })
//this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(
- this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(data => {
+ this._pd.stockFormAccess({pd_id:this.pdid,company_id:this.company_id}).subscribe(data => {
if(data.dataStatus == true){
let datas = data.records;
@@ -109,21 +121,18 @@ export class StockComponent implements OnInit {
}
public initstockForms(record){
- console.log(record);
let params: any = {};
params.pd_id = this.pdid;
params.pd_form_id = this.form_id;
-
+ params.company_id = this.company_id;
this._pd.retriveForm(params).subscribe(value => {
if (value.status == 200) {
- let dataForm = value.records;
-
-
+ let dataForm = value.records;
if(dataForm !== undefined) {
- console.log(dataForm);
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)]),
@@ -131,8 +140,25 @@ export class StockComponent implements OnInit {
});
let arr = record.filter(data => data.type_of_activity_id == 1);
- console.log(133,arr.length);
if(arr.length > 0) {
+ this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+ console.log('136',value);
+ if(value.status == 200){
+ this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+ let manufacturing_temparr = [];
+ manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials;
+ manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods;
+ manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods;
+ this.initManufacturingDetails(manufacturing_temparr);
+ }
+ else{
+ let manufacturing_temparr = [];
+ manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials;
+ manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods;
+ manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods;
+ this.initManufacturingDetails(manufacturing_temparr);
+ }
+ });
// console.log(1,dataForm);
// console.log(164,dataForm.manufacturing_details);
// console.log(2,dataForm.retail_details);
@@ -169,14 +195,7 @@ export class StockComponent implements OnInit {
// console.log(163,dataForm.manufacturing_details.manufacturing_raw_materials);
// console.log(164,dataForm.manufacturing_details[0]);
// console.log(164,dataForm.manufacturing_details[0].manufacturing_raw_materials);
-
- let manufacturing_temparr = [];
-
- manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials;
- manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods;
- manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods;
- this.initManufacturingDetails(manufacturing_temparr);
//this.initManufacturingDetails(dataForm);
}
@@ -257,6 +276,7 @@ export class StockComponent implements OnInit {
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)]),
@@ -264,7 +284,16 @@ export class StockComponent implements OnInit {
});
let arr = record.filter(data => data.type_of_activity_id == 1);
if(arr.length > 0) {
- this.initManufacturingDetails(null);
+ this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+ if(value.status == 200){
+ this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+ this.initManufacturingDetails(null);
+ }
+ else{
+ this.initManufacturingDetails(null);
+ }
+ });
+ // this.initManufacturingDetails(null);
}
let arr1 = record.filter(data => data.type_of_activity_id == 2);
if(arr1.length > 0) {
@@ -292,7 +321,16 @@ export class StockComponent implements OnInit {
});
let arr = record.filter(data => data.type_of_activity_id == 1);
if(arr.length > 0) {
- this.initManufacturingDetails(null);
+ this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+ if(value.status == 200){
+ this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+ this.initManufacturingDetails(null);
+ }
+ else{
+ this.initManufacturingDetails(null);
+ }
+ });
+
}
let arr1 = record.filter(data => data.type_of_activity_id == 2);
if(arr1.length > 0) {
@@ -311,7 +349,7 @@ export class StockComponent implements OnInit {
})
// this.stockForms = this.fb.group({
- // stock_remarks: ['', Validators.compose([Validators.required])],
+ // stock_remarks: [''],
// raw_materials: this.fb.array([]),
// finished_goods: this.fb.array([]),
// traded_goods: this.fb.array([])
@@ -320,11 +358,8 @@ export class StockComponent implements OnInit {
manufacturingForm: Boolean = false;
manufacturingFormCreation(record) {
- console.log(record);
let arr = record.filter(data => data.type_of_activity_id == 1);
- console.log(arr);
if (arr.length > 0) {
- console.log(arr.length);
this.manufacturingForm = true;
return this.fb.group({
manufacturing_raw_materials: this.fb.array([]),
@@ -378,14 +413,27 @@ tradingFormCreation(val) {
const rawMaterial = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials'];
const finishedGoods = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods'];
const tradedGoods = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods'];
- const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials'];
-
+ const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials'];
if(datas === null){
- // console.log(299,'if');
+ if(this.suppliers_raw_materials.length > 0){
+ for (let val of this.suppliers_raw_materials) {
+ let Ref_RawMaterials : any = {'raw_name': val.manufacturing_raw_material_name,
+ 'stock_observed':'',
+ 'raw_quantity': '',
+ 'raw_uom': '',
+ 'other_uom': '',
+ 'raw_value': '',
+ 'rawmaterial_value': '',
+ 'is_sufficiant_raw': '',
+ 'rawmaterial_remarks':''};
+ rawMaterial.push(this.createRawmaterial(Ref_RawMaterials));
+ }
+ }
+ else{
rawMaterial.push(this.createRawmaterial(null));
+ }
finishedGoods.push(this.createGoods(null));
tradedGoods.push(this.createTradedGoods(null));
-
} else {
// console.log(305,'else')
// console.log(377,datas);
@@ -395,6 +443,7 @@ tradingFormCreation(val) {
// console.log(val);
if(val.raw_value){
this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value);
+ this.M_financialRawValueInWords = this._pd.convertNumberToWords(val.rawmaterial_value);
}
rawMaterial.push(this.createRawmaterial(val));
}
@@ -407,6 +456,7 @@ tradingFormCreation(val) {
// console.log(val);
if(val.goods_value){
this.M_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+ this.M_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value);
}
finishedGoods.push(this.createGoods(val));
@@ -420,6 +470,7 @@ tradingFormCreation(val) {
// console.log(val);
if(val.estimated_traded_goods_value){
this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+ this.M_financialTradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value);
}
tradedGoods.push(this.createTradedGoods(val));
@@ -432,21 +483,6 @@ tradingFormCreation(val) {
}
}
- createRawmaterial2() {
- return this.fb.group({
- raw_name: ['', Validators.compose([Validators.required])],
- stock_observed:['', Validators.compose([Validators.required])],
- raw_quantity: [''],
- raw_uom: [''],
- other_uom : [''],
- raw_value: [''],
- rawmaterial_value: [''],
- is_sufficiant_raw: [''],
- rawmaterial_remarks:['']
- });
- }
-
-
createRawmaterial(records) {
// console.log(330,'function in');
if(records === null) {
@@ -497,6 +533,7 @@ tradingFormCreation(val) {
if(val.goods_value){
this.R_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+ this.R_financialGoodsValueInWords =this._pd.convertNumberToWords(val.finished_goods_value);
}
finishedGoods.push(this.createGoods(val));
@@ -512,6 +549,7 @@ tradingFormCreation(val) {
// console.log(val);
if(val.estimated_traded_goods_value){
this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+ this.R_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value);
}
tradedGoods.push(this.createTradedGoods(val));
@@ -525,8 +563,8 @@ tradingFormCreation(val) {
createGoods2() {
return this.fb.group({
- goods_name: ['', Validators.compose([Validators.required])],
- goods_observed: ['', Validators.compose([Validators.required])],
+ goods_name: [''],
+ goods_observed: [''],
goods_quantity: [''],
goods_value: [''],
finished_goods_value: [''],
@@ -563,8 +601,8 @@ tradingFormCreation(val) {
createTradedGoods2() {
return this.fb.group({
- traded_goods_name: ['', Validators.compose([Validators.required])],
- traded_goods_observed: ['', Validators.compose([Validators.required])],
+ traded_goods_name: [''],
+ traded_goods_observed: [''],
traded_goods_quantity: [''],
estimated_traded_goods_value: [''],
traded_goods_value: [''],
@@ -596,6 +634,7 @@ tradingFormCreation(val) {
// console.log(val);
if(val.goods_value){
this.T_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+ this.T_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value);
}
finishedGoods.push(this.createGoods(val));
@@ -610,6 +649,7 @@ tradingFormCreation(val) {
// console.log(val);
if(val.estimated_traded_goods_value){
this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+ this.T_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value);
}
tradedGoods.push(this.createTradedGoods(val));
}
@@ -833,29 +873,50 @@ tradingFormCreation(val) {
}
/** To Convert Amount into Words */
- inWords(e,flag:number){
+ inWords(e,flag:number,i){
switch(flag){
case 1 :
- this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.M_rawValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
case 2 :
- this.M_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.M_goodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
case 3 :
- this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.M_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
case 4 :
- this.R_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.R_goodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
case 5 :
- this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.R_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
case 6 :
- this.T_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.T_goodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
case 7 :
- this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.T_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 8 :
+ this.M_financialRawValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 9 :
+ this.M_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 10 :
+ this.M_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 11 :
+ this.R_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 12 :
+ this.R_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 13 :
+ this.T_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 14 :
+ this.T_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);
break;
default:
break;
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 4b328836f..62520e33b 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
@@ -37,7 +37,7 @@ export class SupplierInfoComponent implements OnInit {
//@Input() pdid: number;
pdid: string;
form_id: number;
-
+ company_id: string;
public _supplierQuesFrom: FormGroup;
public submitted = false;
@@ -51,6 +51,7 @@ export class SupplierInfoComponent implements OnInit {
@Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.form_id = 1;
+ this.company_id = this.pd_all_details.company_id
this.notifier = notifier;
}
public viewerOptions: any = {
@@ -76,7 +77,7 @@ export class SupplierInfoComponent implements OnInit {
noRecordsFound: Boolean = false;
errorMessage: any = '';
ngOnInit() {
- this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => {
+ this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid, this.company_id).subscribe(data => {
if(data.dataStatus){
// let datas = {
// "profession_name": "Others",
@@ -116,8 +117,12 @@ export class SupplierInfoComponent implements OnInit {
serviceProviderForm: Boolean = false;
initFormLoadDetails(record) {
+ let params: any = {};
+ params.pd_id = this.pdid;
+ params.pd_form_id = this.form_id;
+ params.company_id = this.company_id;
// alert(JSON.stringify(record));
- this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '1').subscribe(
+ this.pdTrigerService.retriveForm(params).subscribe(
data => {
if(data.dataStatus){
let dataForm = data.records;
@@ -125,6 +130,7 @@ export class SupplierInfoComponent implements OnInit {
this._supplierQuesFrom = this._formBuilder.group({
pdid: [this.pdid],
formid: ['1'],
+ company_id: [this.company_id],
manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]),
trade_details: this._formBuilder.array([this.tradingFormCreation(record)]),
supplier_info_form_remark: [dataForm.supplier_info_form_remark || null]
@@ -154,6 +160,7 @@ export class SupplierInfoComponent implements OnInit {
this._supplierQuesFrom = this._formBuilder.group({
pdid: [this.pdid],
formid: ['1'],
+ company_id: [this.company_id],
manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]),
trade_details: this._formBuilder.array([this.tradingFormCreation(record)]),
supplier_info_form_remark: [dataForm.supplier_info_form_remark || null]
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
index 17292f75b..5210ebc7e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
@@ -26,7 +26,7 @@
-->
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
index 70d19e4b3..4ae08c3ed 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
@@ -26,6 +26,7 @@ import {LoanDetailsComponent} from './forms/loan-details/loan-details.component'
import {GeneralInfoComponent} from './forms/general-info/general-info.component';
import {NeighbourHoodComponent} from './forms/neighbour-hood/neighbour-hood.component';
import {FinalRemarksComponent} from './forms/final-remarks/final-remarks.component';
+import { BusinessInfoGroupComponent } from './forms/business-info-group/business-info-group.component';
@Component({
selector: 'app-start-pd',
@@ -314,7 +315,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
});
}else
if(this.selectedFormsCategory.form_id==13){
- const dialogRef = this.dialog.open(BusinessInfoComponent, {
+ const dialogRef = this.dialog.open(BusinessInfoGroupComponent, {
data: this.pdFullDetails,
position: { right: '0'},
width:'80%',
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 6d119d0ed..444ea4dba 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
@@ -1,84 +1,149 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{master.city_name}} / {{master.state_name}}-{{master.pincode}}
-
-
-
-
+
+
+
+
+
+
+
+
{{master.lender_short_name}}
+
{{master.branch_name}}
+
+ {{master.lender_applicant_id}}
+ {{master.pd_date_of_initiation}}
+
+
+
+
+ {{master.pd_allocated_to | titlecase}}
+ {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}
+ {{master.centralofficer | titlecase}}
+
+ {{master.scheduled_on}}
+
-
-
-
-
- {{master.pd_contact_person}}
- {{master.pd_contact_mobileno}}
- (Lender Contact Details)
-
-
- {{master.product_name}} / {{master.subproduct_name}}
- {{master.pd_type_name}} / {{master.loan_amount}}
- {{master.addressline1}}
- Remarks : {{master.remarks}}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{master.product_name}} / {{master.subproduct_name}}
+
+
+
+
+
+
+
+
+
+ {{master.loan_amount}}
+
+
+
+
+
+
+
+
+
+ {{master.pd_type_name}}
+
+
+
+
+
+
+
+
+
+ {{master.addressline1}},
{{master.city_name}},
{{master.state_name}}-{{master.pincode}}
+
+
+
+
+
+
+
+
Lender Contact Details
+
+
+
+ {{master.pd_contact_person}}
+
+
+
+
+ {{master.pd_contact_mobileno}}
+
+
+
+
+
+
+
Remarks
+
+ {{master.remarks}}
+
+
+
+
+
+
+
+
PD Details
+
+
+ Applicants
@@ -90,19 +155,19 @@
-
+
{{applicant.applicant_name}}
-
+
{{applicant.mobile_no}}
-
+
+91{{applicant.landline}}
-
Main Applicant
- {{applicant.relation_name}}
+ ( Main Applicant )
+ ( {{applicant.relation_name}} )
@@ -111,19 +176,16 @@
No Applicant
-
-
-
-
-
-
+
+
+
+ Additional Requirements
+
-
-
+ No Additional Requirements
-
-
-
-
-
-
-
- Documents
-
-
-
+
+
+
+ Documents
+
+
No Document
-
-
-
-
-
-
-
-
- PD History
-
-
-
-
-
- {{master.time}}
- {{master.user}}
{{master.log}}
-
-
-
-
-
-
-
-
-
-
- No History
-
-
-
-
-
-
+
+
+
+
+ QC Notes
QC Notes
- {{ pdMasterData[0]?.qc_remarks}}
-
-
-
-
+ {{ pdMasterData[0]?.qc_remarks}}
+
+
+
+ QC Remarks
+
QC Remarks
@@ -220,13 +245,30 @@
{{ pdMasterData[0]?.qc_feedback}}
-
-
-
-
-
+
+
+
+ {{master.time}}
+ {{master.user}}
{{master.log}}
+
+
+
+
+
+
+
+ No History
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss
index bdf8de1d6..0c83a24b0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss
@@ -8,4 +8,26 @@
}
::ng-deep .body-container{
padding: 0rem !important;
-}
\ No newline at end of file
+}
+
+
+:host {
+ margin-left: -5px;
+ margin-right: -5px;
+ margin-top: -5px;
+ display: block;
+}
+.wrapper {
+ margin: 6px;
+}
+
+.content-data{
+ h2{
+ font-size: 1.5rem;
+ }
+}
+@media(max-width:767px){
+ .profile-center{
+ text-align: center;
+ }
+}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
index 90d398715..eefb41512 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
@@ -89,6 +89,7 @@ import { FinalRemarksComponent } from './list-pd/start-pd/forms/final-remarks/fi
import { BusinessOtherFamilyMemberComponent } from './list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component';
import { QcReviewComponent } from './list-pd/pd-report/qc-review/qc-review.component';
import { SharedModule } from "app/shared/shared.module";
+import { BusinessInfoGroupComponent } from './list-pd/start-pd/forms/business-info-group/business-info-group.component';
/**
* Custom angular notifier options
@@ -266,7 +267,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
// AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule,
// OwlNativeDateTimeModule,
// ],
- declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent],
+ declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent],
// exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
// providers: [PdTrigerService, GetGeometricLocationService],
@@ -304,13 +305,13 @@ const pdCustomNotifierOptions: NotifierOptions = {
OwlNativeDateTimeModule,
],
// declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent],
- exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent],
+ exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent],
providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}],
entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,
- ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent],
+ ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent],
})
export class ManagePdModule {
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index c7ced0d9d..42efd209c 100755
--- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -322,15 +322,14 @@ export class PdTrigerService {
swapOlderPDReportToLatest(pdId: any): Observable
{
pdId.fk_createdby = this._aws.getlocale();
- alert(JSON.stringify(pdId));
return this._http.post(this.apiUrl + "swapOlderPDReportToLatest", { "records": pdId })
.pipe(
catchError(this.handleError('operation', []))
)
}
- getTypeofActivityForSuppliedInfoForm(pd_id: any): Observable {
- return this._http.post(this.apiUrl + "getTypeOfActivetyFromBusinessForm", { "records": { "pd_id": pd_id } })
+ getTypeofActivityForSuppliedInfoForm(pd_id: any,company_id:any): Observable {
+ return this._http.post(this.apiUrl + "getTypeOfActivetyFromBusinessForm", { "records": { "pd_id": pd_id,"company_id":company_id } })
.pipe(
catchError(this.handleError('operation', []))
)