From f8d080927add33592dd544db0575d37bdfbc6002 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 8 Nov 2018 09:15:19 +0530 Subject: [PATCH 1/6] assets info pd Form added : kdk --- .../assets-info/assets-info.component.html | 235 +++++++ .../assets-info/assets-info.component.scss | 0 .../assets-info/assets-info.component.spec.ts | 25 + .../assets-info/assets-info.component.ts | 583 ++++++++++++++++++ .../supplier-info/supplier-info.component.ts | 7 +- .../list-pd/start-pd/start-pd.component.ts | 5 +- .../manage-pd/manage-pd.module.ts | 3 +- .../pd-service/pd-triger.service.ts | 4 +- 8 files changed, 854 insertions(+), 8 deletions(-) create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.spec.ts create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html new file mode 100644 index 000000000..a672be442 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -0,0 +1,235 @@ + + +
+
+
+
+ +
+
+
+ + + {{ asset.name }} + + +
+
+ +
+ +
+
+
+
+
+ + + {{ prop.name }} + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+ + + {{ ins_type.name }} + + +
+
+ + + +
+
+ + + {{ freqn.name }} + + +
+
+
+
+ + + +
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + {{ ins_type.name }} + + +
+
+ + + +
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+
+ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ EMI +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+
+ +
+ +
+
+
+ + +
+
+ \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.spec.ts new file mode 100644 index 000000000..53a17db27 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AssetsInfoComponent } from './assets-info.component'; + +describe('AssetsInfoComponent', () => { + let component: AssetsInfoComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AssetsInfoComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AssetsInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts new file mode 100644 index 000000000..81c00de7e --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -0,0 +1,583 @@ +/** Common Imports */ +import { + Component, + OnInit, + Inject, + Input +} from '@angular/core'; + +import { + FormBuilder, + FormGroup, + Validators, + FormArray, +} from '@angular/forms'; + +import { NotifierService } from 'angular-notifier'; + +import { + MatDialog, + MatDialogRef, + MAT_DIALOG_DATA +} from '@angular/material'; +/** Service */ +import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +@Component({ + selector: 'app-assets-info', + templateUrl: './assets-info.component.html', + styleUrls: ['./assets-info.component.scss'] +}) +export class AssetsInfoComponent implements OnInit { + + @Input() pdid: number; + + public _assetsQuesFrom: FormGroup; + public submitted = false; + + public m_assets_type = [ + { + 'id': "1", + 'name': "Property" + }, + { + 'id': "2", + 'name': "Four Wheeler" + }, + { + 'id': "3", + 'name': "Two Wheeler" + }, + { + 'id': "4", + 'name': "Jewellery" + }, + { + 'id': "5", + 'name': "Consumer Durable" + }, + { + 'id': "6", + 'name': "Insurance" + }, + { + 'id': "7", + 'name': "Investments" + }, + { + 'id': "8", + 'name': "Others" + } + ] + + public m_propertyType = [ + { + 'id': "1", + 'name': 'Residential' + }, + { + 'id': "2", + 'name': 'Commercial' + }, + { + 'id': "3", + 'name': 'Industrial' + }, + { + 'id': "4", + 'name': 'Land' + } + ]; + + public m_insuranceType = [{ + 'id': "1", + 'name': 'Life' + }, { + 'id': "2", + 'name': 'Health' + }] + + public m_investmentType = [{ + 'id': "1", + 'name': 'FD' + }, { + 'id': "2", + 'name': 'RD' + }, { + 'id': "3", + 'name': 'Mutual Funds' + }, { + 'id': "4", + 'name': 'PPF' + }, { + 'id': "5", + 'name': 'Shares' + }, { + 'id': "6", + 'name': 'Others' + }] + + public m_freqOfPurchase = [ + { + 'id': "1", + 'name': 'Daily' + }, + { + 'id': "2", + 'name': 'Weekly' + }, + { + 'id': "3", + 'name': 'Monthly' + }, + { + 'id': "4", + 'name': 'Every 3 months' + }, + { + 'id': "5", + 'name': 'Half yearly' + }, + { + 'id': "6", + 'name': 'Yearly' + }, + { + 'id': "7", + 'name': 'As and when required' + }, + { + 'id': "8", + 'name': 'Others' + } + ] + + constructor( + private _formBuilder: FormBuilder, + private pdTrigerService: PdTrigerService) { } + + ngOnInit() { + + this.getPdSupplierFormDetails(); + } + apiLoadFinish: boolean = false; + getPdSupplierFormDetails() { + this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '4').subscribe( + data => { + if (data) { + if (data.dataStatus) { + this.formLoadData(data.records1) + } else { + let data = + { +"records1":{ +"pdid":"60", +"formid":"4", +"assets_details":[ +{ +"assets_mode":"1", +"details":[ +{ +"property_type":"1" +} +], +"approximate_market_value":"12000", +"name_of_the_owner":"xyz", +"year_of_purchase":"2010", +"emi":0, +"emi_paid":"", +"elapsed_tenure":"", +"balance_tenure":"" +}, +{ +"assets_mode":"7", +"details":[ +{ +"investments_type":"1", +"amount_of_invest":"200000", +"bank_name":"mmm bank" +} +], +"approximate_market_value":"123333", +"name_of_the_owner":"msnc", +"year_of_purchase":"2013", +"emi":1, +"emi_paid":"fasdf", +"elapsed_tenure":"sdfasd", +"balance_tenure":"sdfasdf" +} +], +"fk_createdby":"1" +} +} + this.formLoadData(data.records1) + // this.formLoadData(null); + } + this.apiLoadFinish = true; + } else { + // this.noRecordFound = true; + } + } + ); + } + + formLoadData(val) { + if (val !== null) { + let value = val; + this._assetsQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['4'], + assets_details: this._formBuilder.array([ + // this.initDetails(), + ]) + }); + this.addAssetsDetailsWithData(value.assets_details); + } else { + this._assetsQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['4'], + assets_details: this._formBuilder.array([ + this.initDetails(), + ]) + }); + } + } + + // convenience getter for easy access to form fields + get f() { return this._assetsQuesFrom.controls; } + + get f_assets_details() { + return this._assetsQuesFrom.get('assets_details'); + } + + // Dynamic Form field creation Functionality : START ===> + initDetails() { + return this._formBuilder.group({ + assets_mode: ['', Validators.compose([Validators.required])], + details: this._formBuilder.array([]), + approximate_market_value: ['', Validators.compose([Validators.required])], + name_of_the_owner: ['', Validators.compose([Validators.required])], + year_of_purchase: ['', Validators.compose([Validators.required])], + emi: [''] , + emi_paid: [''], + elapsed_tenure:[''], + balance_tenure: [''] + }); + } + + + show: boolean; + selectedAssetsType(e: any, i: any): void { + let val = i; + const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + arr.controls.splice(0); + switch (e.value) { + case '1': { + let val = i; + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadProperty()); + break; + } + case '2': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.load_Two_Four_Weeler()); + break; + } + case '3': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.load_Two_Four_Weeler()); + break; + } + case '4': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadJwellDescription()); + break; + } + case '5': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadConsumerDurableDescription()); + break; + } + case '6': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadInsuranceDescription()); + break; + } + case '7': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadInvestDescription()); + break; + } + case '8': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.otherAssetsDescription()); + break; + } + default: { + break; + } + } + } + + + loadProperty() { + return this._formBuilder.group({ + property_type: ['', Validators.compose([Validators.required])] + }); + } + + loadJwellDescription() { + return this._formBuilder.group({ + jwell_description: ['', Validators.compose([Validators.required])] + }); + } + + loadConsumerDurableDescription() { + return this._formBuilder.group({ + consumer_durable_description: ['', Validators.compose([Validators.required])] + }); + } + + otherAssetsDescription() { + return this._formBuilder.group({ + any_other_assets: ['', Validators.compose([Validators.required])] + }); + } + + loadInsuranceDescription() { + return this._formBuilder.group({ + insurance_type: ['', Validators.compose([Validators.required])], + premium_paid: ['', Validators.compose([Validators.required])], + frequency_mode: ['', Validators.compose([Validators.required])], + sum_assured: ['', Validators.compose([Validators.required])], + members_coverd: ['', Validators.compose([Validators.required])] + }); + } + + loadInvestDescription() { + return this._formBuilder.group({ + investments_type: ['', Validators.compose([Validators.required])], + amount_of_invest: ['', Validators.compose([Validators.required])], + bank_name: ['', Validators.compose([Validators.required])] + }); + } + + load_Two_Four_Weeler() { + return this._formBuilder.group({ + manufacturer_model: ['', Validators.compose([Validators.required])] + }); + } + + + + loadPropertyWithData(data) { + return this._formBuilder.group({ + property_type: [data.property_type, Validators.compose([Validators.required])] + }); + } + + loadJwellDescriptionWithData(data) { + return this._formBuilder.group({ + jwell_description: [data.jwell_description, Validators.compose([Validators.required])] + }); + } + + loadConsumerDurableDescriptionWithData(data) { + return this._formBuilder.group({ + consumer_durable_description: [data.consumer_durable_description, Validators.compose([Validators.required])] + }); + } + + otherAssetsDescriptionWithData(data) { + return this._formBuilder.group({ + any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])] + }); + } + + loadInsuranceDescriptionWithData(data) { + return this._formBuilder.group({ + insurance_type: [data.insurance_type, Validators.compose([Validators.required])], + premium_paid: [data.premium_paid, Validators.compose([Validators.required])], + frequency_mode: [data.frequency_mode, Validators.compose([Validators.required])], + sum_assured: [data.sum_assured, Validators.compose([Validators.required])], + members_coverd: [data.members_coverd, Validators.compose([Validators.required])] + }); + } + + loadInvestDescriptionWithData(data) { + return this._formBuilder.group({ + investments_type: [data.investments_type, Validators.compose([Validators.required])], + amount_of_invest: [data.amount_of_invest, Validators.compose([Validators.required])], + bank_name: [data.bank_name, Validators.compose([Validators.required])] + }); + } + + load_Two_Four_WeelerWithData(data) { + return this._formBuilder.group({ + manufacturer_model: [data.manufacturer_model, Validators.compose([Validators.required])] + }); + } + + + initDetailsWithdata(data) { + return this._formBuilder.group({ + assets_mode: [data.assets_mode, Validators.compose([Validators.required])], + details: this._formBuilder.array([]), + approximate_market_value: [data.approximate_market_value, Validators.compose([Validators.required])], + name_of_the_owner: [data.name_of_the_owner, Validators.compose([Validators.required])], + year_of_purchase: [data.year_of_purchase, Validators.compose([Validators.required])], + emi: [data.year_of_purchase], + emi_paid: [data.emi_paid || ''], + elapsed_tenure:[data.elapsed_tenure || ''], + balance_tenure: [data.balance_tenure || ''] + }); + } +loadDetails: boolean; + addAssetsDetailsWithData(supp_data) { + var result = Object.keys(supp_data).map(function (key) { + return supp_data[key]; + }); + if (result.length > 0) { + for (let val of result) { + let vals = { + assets_mode: val.assets_mode, + approximate_market_value: val.approximate_market_value, + name_of_the_owner: val.name_of_the_owner, + year_of_purchase: val.year_of_purchase + }; + const control = this._assetsQuesFrom.controls['assets_details']; + control.push(this.initDetailsWithdata(vals)); + this.setAssetsDetailsWithData(vals.assets_mode, val.details , control.length - 1) + } + } +this.loadDetails = true; + } + + setAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void { + let val = i; + // var data = Object.keys(datas).map(function (key) { + // return datas[key]; + // }); + let data= datas[0]; + const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + arr.controls.splice(0); + switch (assets_details_mode) { + case '1': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadPropertyWithData(data)); + break; + } + case '2': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.load_Two_Four_WeelerWithData(data)); + break; + } + case '3': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.load_Two_Four_WeelerWithData(data)); + break; + } + case '4': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadJwellDescriptionWithData(data)); + break; + } + case '5': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadConsumerDurableDescriptionWithData(data)); + break; + } + case '6': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadInsuranceDescriptionWithData(data)); + break; + } + case '7': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.loadInvestDescriptionWithData(data)); + break; + } + case '8': { + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + control.push(this.otherAssetsDescriptionWithData(data)); + break; + } + default: { + break; + } + } + } + + addSupplierDetails(e) { + const control = this._assetsQuesFrom.controls['assets_details']; + control.push(this.initDetails()); + } + removeLanguage(i: number) { + const control = this._assetsQuesFrom.controls['assets_details']; + control.removeAt(i); + } + + public paymentModeTextBox: number; + selectedPM(e) { + this.paymentModeTextBox = e.value; + // this.f.supplier_details.controls.get('payment_mode_value'); + } + + public freqPurchaseTextBox: number; + selectedFreqPurchase(e) { + this.freqPurchaseTextBox = e.value; + } + + + /** To Save/Edited Popup Data */ + onSubmit() { + this.submitted = true; + // stop here if form is invalid + if (this._assetsQuesFrom.invalid) { + alert() + return; + } else { + var answerFormValues = this._assetsQuesFrom.value; + + //To Remove The "Null" With Key also + Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); + alert(JSON.stringify(answerFormValues)); + // Add BRANCH data with help Service File + this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( + dataresult => { + if (dataresult.status == 200) { + // console.log(dataresult); + // this.notifier.notify('success', 'Record Saved Successfully.!'); + // this.dialogRef.close(); + // alert("sample alert for Saving"); + } + else { + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + // this.errorMessage = "Some Thing Wents Wrong Try Again !"; + } + }, error => { + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + // this.errorMessage = "Something Wents Wrong Try Again !"; + // this.dialogRef.close(); + }); + //After Saving the BRANCH data then popup close + // this.dialogRef.close(); + } + } + + /** To Reset Popup Data */ + onReset() { + // this._addQuesFrom.reset(); + } + + // { + // 'main_raw_materials': 'sdkjfal', + // 'supplier_details' ; [ + // { + // 'supplier_name':'ldskjfalks', + // 'payment_mode': '1', + // 'payment_mode_value':'' + // } + // ] + // } + +} 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 3a2f64e99..674a1dd52 100644 --- 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 @@ -164,10 +164,9 @@ apiLoadFinish: boolean = false; } addSupplierDetailsWithData(supp_data) { - -var result = Object.keys(supp_data).map(function(key) { - return supp_data[key]; -}); + var result = Object.keys(supp_data).map(function(key) { + return supp_data[key]; + }); if (result.length > 0) { for (let val of result) { let vals = { 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 5673a92b3..92e667cc0 100644 --- 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 @@ -45,7 +45,10 @@ categoryFormButtons : any=[ "form_id":3, "form_name":"Personal Details", }, - +{ + "form_id":4, + "form_name":"Asset Details", +}, ]; formsCategoryEnable:boolean=false; 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 09047a111..e61e5b004 100644 --- 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 @@ -45,6 +45,7 @@ import { QcCompletedPdComponent } from './list-pd/qc-completed-pd/qc-completed-p import { ClientInfoComponent } from './list-pd/start-pd/forms/client-info/client-info.component'; import { SupplierInfoComponent } from './list-pd/start-pd/forms/supplier-info/supplier-info.component'; import { PersonalInfoComponent } from './list-pd/start-pd/forms/personal-info/personal-info.component'; +import { AssetsInfoComponent } from './list-pd/start-pd/forms/assets-info/assets-info.component'; /** * Custom angular notifier options */ @@ -115,7 +116,7 @@ const pdCustomNotifierOptions: NotifierOptions = { AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule, OwlNativeDateTimeModule, ], - declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent], + declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent], exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], providers: [PdTrigerService, GetGeometricLocationService], entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent] 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 06398801e..7013bf116 100644 --- 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 @@ -203,7 +203,7 @@ getPDFormDetailsWithID(pdID, formID ):Observable { // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate; - return this._http.post(this.apiUrl+"savePDFormDetails",{"records":saveData}) + return this._http.post(this.apiUrl+"savePDFormDetails",{"records1":saveData}) .pipe( catchError(this.handleError('operation', [])) ) @@ -216,7 +216,7 @@ getPDFormDetailsWithID(pdID, formID ):Observable { // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate; - return this._http.post(this.apiUrl+"savePDQuestions",{"records":saveData}) + return this._http.post(this.apiUrl+"savePDQuestions",{"records1":saveData}) .pipe( catchError(this.handleError('operation', [])) ) From 6171dcb4f0e8828ca24efb915a0dd4eb5effe4ee Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 8 Nov 2018 11:12:00 +0530 Subject: [PATCH 2/6] PD Type Font size UI --- .../manage-pd/list-pd/all-pd/all-pd.component.html | 2 +- .../manage-pd/list-pd/completed-pd/completed-pd.component.html | 2 +- .../list-pd/inprogress-pd/inprogress-pd.component.html | 2 +- .../list-pd/qc-completed-pd/qc-completed-pd.component.html | 2 +- .../manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html | 2 +- .../app/quality-check/qc-list/qc-view/qc-view.component.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 08f7c888f..bc3b23a62 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -6,7 +6,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 86e8b7e0e..037c35c73 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -6,7 +6,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index ef0a6b08f..b4ecb5c24 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -5,7 +5,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index e11883010..0153e37cc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -5,7 +5,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 6f5fdaf0f..186a64ad6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -5,7 +5,7 @@
{{(details.pd_type_name | slice:0:1)}}
+ [matTooltip]="details.pd_type_name" matTooltipPosition="above">{{(details.pd_type_name | slice:0:1)}} 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 350c34216..6d24d5113 100644 --- 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 @@ -44,7 +44,7 @@

{{master.product_name}} / {{master.subproduct_name}}

{{master.pd_type_name}} /  {{master.loan_amount}}

-

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

+

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

Remarks : {{master.remarks}}

From 81cd63c1be33e6cf44066d5ca65ca8d1351ceb2b Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 8 Nov 2018 12:56:14 +0530 Subject: [PATCH 3/6] assets info form field details changes : kdk --- .../assets-info/assets-info.component.html | 12 +- .../assets-info/assets-info.component.ts | 111 +++++++----------- .../list-pd/start-pd/start-pd.component.html | 6 +- .../pd-service/pd-triger.service.ts | 2 +- 4 files changed, 54 insertions(+), 77 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index a672be442..b55e5fa2d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -194,20 +194,20 @@
- EMI + EMI
-
+
-
+
-
+
@@ -228,7 +228,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 81c00de7e..204344fbb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -151,9 +151,13 @@ export class AssetsInfoComponent implements OnInit { } ] + private notifier: NotifierService; constructor( + notifier: NotifierService, private _formBuilder: FormBuilder, - private pdTrigerService: PdTrigerService) { } + private pdTrigerService: PdTrigerService) { + this.notifier = notifier; + } ngOnInit() { @@ -165,52 +169,9 @@ export class AssetsInfoComponent implements OnInit { data => { if (data) { if (data.dataStatus) { - this.formLoadData(data.records1) + this.formLoadData(data.records); } else { - let data = - { -"records1":{ -"pdid":"60", -"formid":"4", -"assets_details":[ -{ -"assets_mode":"1", -"details":[ -{ -"property_type":"1" -} -], -"approximate_market_value":"12000", -"name_of_the_owner":"xyz", -"year_of_purchase":"2010", -"emi":0, -"emi_paid":"", -"elapsed_tenure":"", -"balance_tenure":"" -}, -{ -"assets_mode":"7", -"details":[ -{ -"investments_type":"1", -"amount_of_invest":"200000", -"bank_name":"mmm bank" -} -], -"approximate_market_value":"123333", -"name_of_the_owner":"msnc", -"year_of_purchase":"2013", -"emi":1, -"emi_paid":"fasdf", -"elapsed_tenure":"sdfasd", -"balance_tenure":"sdfasdf" -} -], -"fk_createdby":"1" -} -} - this.formLoadData(data.records1) - // this.formLoadData(null); + this.formLoadData(null); } this.apiLoadFinish = true; } else { @@ -240,6 +201,7 @@ export class AssetsInfoComponent implements OnInit { ]) }); } + this.loadDetails = true; } // convenience getter for easy access to form fields @@ -257,11 +219,11 @@ export class AssetsInfoComponent implements OnInit { approximate_market_value: ['', Validators.compose([Validators.required])], name_of_the_owner: ['', Validators.compose([Validators.required])], year_of_purchase: ['', Validators.compose([Validators.required])], - emi: [''] , + emi: [''], emi_paid: [''], - elapsed_tenure:[''], + elapsed_tenure: [''], balance_tenure: [''] - }); + }); } @@ -425,13 +387,13 @@ export class AssetsInfoComponent implements OnInit { approximate_market_value: [data.approximate_market_value, Validators.compose([Validators.required])], name_of_the_owner: [data.name_of_the_owner, Validators.compose([Validators.required])], year_of_purchase: [data.year_of_purchase, Validators.compose([Validators.required])], - emi: [data.year_of_purchase], + emi: [data.emi || 0], emi_paid: [data.emi_paid || ''], - elapsed_tenure:[data.elapsed_tenure || ''], - balance_tenure: [data.balance_tenure || ''] - }); + elapsed_tenure: [data.elapsed_tenure || ''], + balance_tenure: [data.balance_tenure || ''] + }); } -loadDetails: boolean; + loadDetails: boolean; addAssetsDetailsWithData(supp_data) { var result = Object.keys(supp_data).map(function (key) { return supp_data[key]; @@ -439,17 +401,21 @@ loadDetails: boolean; if (result.length > 0) { for (let val of result) { let vals = { - assets_mode: val.assets_mode, - approximate_market_value: val.approximate_market_value, - name_of_the_owner: val.name_of_the_owner, - year_of_purchase: val.year_of_purchase + assets_mode: val.assets_mode, + approximate_market_value: val.approximate_market_value, + name_of_the_owner: val.name_of_the_owner, + year_of_purchase: val.year_of_purchase, + emi: val.emi, + emi_paid: val.emi_paid, + elapsed_tenure: val.elapsed_tenure, + balance_tenure: val.balance_tenure }; const control = this._assetsQuesFrom.controls['assets_details']; control.push(this.initDetailsWithdata(vals)); - this.setAssetsDetailsWithData(vals.assets_mode, val.details , control.length - 1) + this.setAssetsDetailsWithData(vals.assets_mode, val.details, control.length - 1) } } -this.loadDetails = true; + this.loadDetails = true; } setAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void { @@ -457,7 +423,8 @@ this.loadDetails = true; // var data = Object.keys(datas).map(function (key) { // return datas[key]; // }); - let data= datas[0]; + // alert(JSON.stringify(datas)); + let data = datas; const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; arr.controls.splice(0); switch (assets_details_mode) { @@ -533,29 +500,35 @@ this.loadDetails = true; this.submitted = true; // stop here if form is invalid if (this._assetsQuesFrom.invalid) { - alert() return; } else { var answerFormValues = this._assetsQuesFrom.value; //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - alert(JSON.stringify(answerFormValues)); + answerFormValues.assets_details.map(val => { + if (val.emi == '0') { + val.emi_paid = ''; + val.elapsed_tenure = ''; + val.balance_tenure = ''; + } + }); + // Add BRANCH data with help Service File this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( dataresult => { if (dataresult.status == 200) { // console.log(dataresult); - // this.notifier.notify('success', 'Record Saved Successfully.!'); + this.notifier.notify('success', 'Record Saved Successfully.!'); // this.dialogRef.close(); // alert("sample alert for Saving"); } else { - // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); // this.errorMessage = "Some Thing Wents Wrong Try Again !"; } }, error => { - // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); // this.errorMessage = "Something Wents Wrong Try Again !"; // this.dialogRef.close(); }); @@ -566,9 +539,10 @@ this.loadDetails = true; /** To Reset Popup Data */ onReset() { - // this._addQuesFrom.reset(); + const arr = this._assetsQuesFrom.controls.assets_details; + arr.controls.splice(0); + this.getPdSupplierFormDetails(); } - // { // 'main_raw_materials': 'sdkjfal', // 'supplier_details' ; [ @@ -579,5 +553,4 @@ this.loadDetails = true; // } // ] // } - } 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 7788df8b8..3f9b53c34 100644 --- 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 @@ -390,7 +390,11 @@ - + + + +
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 7013bf116..dec74ad4f 100644 --- 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 @@ -203,7 +203,7 @@ getPDFormDetailsWithID(pdID, formID ):Observable { // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate; - return this._http.post(this.apiUrl+"savePDFormDetails",{"records1":saveData}) + return this._http.post(this.apiUrl+"savePDFormDetails",{"records":saveData}) .pipe( catchError(this.handleError('operation', [])) ) From 6cb431487c3dba2055d0e112abea4f9dc2faa5ed Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 8 Nov 2018 14:12:54 +0530 Subject: [PATCH 4/6] User Registration DP UI --- .../users/register/register.component.html | 361 ++++++------------ .../users/register/register.component.scss | 16 - .../users/register/register.component.ts | 4 +- 3 files changed, 126 insertions(+), 255 deletions(-) diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index c676e20a8..544e273bf 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -1,279 +1,166 @@ - - - - -
+ +
-
-
User Registration
-
-
- -
+
+
User Registration
+
+
+ +
Personal
-
- - - - - +
+ + + + + + + + -
- Profile Picture - - - - -
+ + + + + + First Name Required. Atleast 5 Characters. Not More Than 10 Characters. - - - Last Name Required. - - + - - - + Isactive - -
+
- Contact
- -
- - - email Address Required. - Invalid Email Address. - - - - - - Phone Number Required. - Invalid Phone Number. + Contact
+ +
+ + + email Address Required. + Invalid Email Address. + - - - - - -- - - {{s.name}} - - - State Required. - + + + Phone Number Required. + Invalid Phone Number. + + - - - -- - - {{c.name}} - - - city Required. - -
+ + + -- + + {{s.name}} + + + State Required. + + + + + -- + + {{c.name}} + + + city Required. + +
- - - - - - - - - - - - - - Role
- -
- - - -- - - {{types.name}} - - - Enitity Type Required - Enitity Type Required +
+ + + Role
+ +
+ + + -- + + {{types.name}} + + + Enitity Type Required + Enitity Type Required + + + + + -- + + {{ent.full_name}} + + + Lender Name Required. + + + + + -- + + {{ent.full_name}} + + Vendor Name Required. + + + + + + + {{role.role_name}} + + + +
+ User Role Required + User Role Required + + + + -- + + {{pd.team_name}} + + + + +
- - - - - - -- - - {{ent.full_name}} - - - Lender Name Required. - - - - - -- - - {{ent.full_name}} - - Vendor Name Required. - - - - - - - - {{role.role_name}} - - - -
- User Role Required - User Role Required - - - - -- - - {{pd.team_name}} - - - - -
- - - - + + +
- - +
- + diff --git a/ng6-seed/src/app/settings/users/register/register.component.scss b/ng6-seed/src/app/settings/users/register/register.component.scss index cdb065060..e69de29bb 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.scss +++ b/ng6-seed/src/app/settings/users/register/register.component.scss @@ -1,16 +0,0 @@ - - // .mat-card-title{ - - // color: #fff; - // margin-left: 13px; - // background: rgba(157, 69, 124, 1); - // box-shadow: 0 4px 20px 0 rgba(157, 69, 124, 1), 0 7px 10px -5px rgba(157, 69, 124, 1);; - // display: inline-block; - // border-radius: 6px; - // padding: 10px; - // margin-top: -52px; - - - // } - - diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index 9f5c03f20..20e3fbe8c 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -200,7 +200,7 @@ this.loader = true; this.AWS.adminUpdateuser(userData, data.record).subscribe(res => { this.loader =false; console.log(res); - Swal('user Created'); + Swal('User Created'); this.router.navigate(['setting/users/userlist']); }); } @@ -216,7 +216,7 @@ this.loader = true; });} this.users.saveRecords(res,userData).subscribe(res=>{ this.loader = false; - Swal('Update User'); + Swal('User Updated'); this.router.navigate(['setting/users/userlist']); //this.shared.redirectTo('settings/userListing'); delete this.AWS.localUserId; From dfe8d471a6dc637598a4789c3421e848b74a6626 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 8 Nov 2018 15:23:10 +0530 Subject: [PATCH 5/6] User Register UI --- .../users/register/register.component.html | 14 ++++++-------- .../users/register/register.component.scss | 11 +++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 544e273bf..88ae0d7d5 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -15,17 +15,15 @@ Personal
- - + diff --git a/ng6-seed/src/app/settings/users/register/register.component.scss b/ng6-seed/src/app/settings/users/register/register.component.scss index e69de29bb..b05fce9d5 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.scss +++ b/ng6-seed/src/app/settings/users/register/register.component.scss @@ -0,0 +1,11 @@ +.hoverdp:hover img { + opacity: 0.5; +} + +.hoverdp mat-icon{ + display:none; +} +.hoverdp:hover mat-icon{ + display:block; +} + \ No newline at end of file From 6f9f9d173e494244eca34122471f982943d1c03f Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 8 Nov 2018 15:45:48 +0530 Subject: [PATCH 6/6] DP UI --- .../src/app/settings/users/register/register.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 88ae0d7d5..9fcaa8124 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -17,12 +17,12 @@