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

required removed : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-01-07 15:55:55 +05:30
parent 7caad4729e
commit fc0126f635
21 changed files with 146 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
<mat-tab-group> <mat-tab-group>
<mat-tab label="Business Asset Questions"> <mat-tab label="Assets Used For Business">
<ng-template matTabContent> <ng-template matTabContent>
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="100"> <div fxFlex="100">
@ -220,7 +220,7 @@
<mat-form-field *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5" style="width:30%"> <mat-form-field *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5" style="width:30%">
<!-- <input matInput placeholder="Name of the Business Owner" formControlName="business_name_of_the_owner" autocomplete="off"> --> <!-- <input matInput placeholder="Name of the Business Owner" formControlName="business_name_of_the_owner" autocomplete="off"> -->
<mat-select placeholder="Name of the Business Owner" <mat-select placeholder="Asset Owned by"
formControlName="business_name_of_the_owner" required> formControlName="business_name_of_the_owner" required>
<mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option> <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option>
<!-- <mat-option value="Others">Others</mat-option> --> <!-- <mat-option value="Others">Others</mat-option> -->
@ -229,7 +229,16 @@
</div> </div>
<span *ngIf="sup.get('business_assets_mode').value != ''">
<mat-form-field style="width:30%">
<mat-label>Purchase Year</mat-label>
<input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="business_purchase_year" (keypress)="keyPress($event)">
<mat-error> Invalid year format</mat-error>
</mat-form-field>
</span>
<span *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5"> <span *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5">
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -290,7 +299,7 @@
</div> </div>
</ng-template> </ng-template>
</mat-tab> </mat-tab>
<mat-tab label="Other Asset Questions"> <mat-tab label="Other Personal Assets">
<ng-template matTabContent> <ng-template matTabContent>
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="100"> <div fxFlex="100">
@ -536,6 +545,16 @@
</mat-form-field> </mat-form-field>
</div> </div>
<span *ngIf="sup.get('assets_mode').value != ''">
<mat-form-field style="width:30%">
<mat-label>Purchase Year</mat-label>
<input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="purchase_year" (keypress)="keyPress($event)">
<mat-error> Invalid year format</mat-error>
</mat-form-field>
</span>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5" style="width:95%"> <mat-form-field *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5" style="width:95%">

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

@ -378,7 +378,7 @@ public m_investmentType = [];
name_of_the_owner: [''], name_of_the_owner: [''],
other_owner:[''], other_owner:[''],
relation: [''], relation: [''],
//purchase_year: [''], purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
//purchase_month: [''], //purchase_month: [''],
emi: [''], emi: [''],
emi_paid: [''], emi_paid: [''],
@ -396,7 +396,7 @@ public m_investmentType = [];
business_name_of_the_owner: [], business_name_of_the_owner: [],
//other_owner:[''], //other_owner:[''],
//relation:[''], //relation:[''],
//purchase_year: [''], business_purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
//purchase_month: [''], //purchase_month: [''],
business_emi: [''], business_emi: [''],
business_emi_paid: [''], business_emi_paid: [''],
@ -639,7 +639,7 @@ public m_investmentType = [];
name_of_the_owner: [data.name_of_the_owner], name_of_the_owner: [data.name_of_the_owner],
other_owner:[data.other_owner || ''], other_owner:[data.other_owner || ''],
relation: [data.relation || ''], relation: [data.relation || ''],
// purchase_year: [data.purchase_year], purchase_year: [data.purchase_year],
// purchase_month: [data.purchase_month], // purchase_month: [data.purchase_month],
emi: [data.emi || 0], emi: [data.emi || 0],
emi_paid: [data.emi_paid || ''], emi_paid: [data.emi_paid || ''],
@ -658,7 +658,7 @@ public m_investmentType = [];
business_name_of_the_owner: [data.business_name_of_the_owner], business_name_of_the_owner: [data.business_name_of_the_owner],
// other_owner:[data.other_owner || ''], // other_owner:[data.other_owner || ''],
// relation: [data.relation || ''], // relation: [data.relation || ''],
// purchase_year: [data.purchase_year], business_purchase_year: [data. business_purchase_year],
// purchase_month: [data.purchase_month], // purchase_month: [data.purchase_month],
business_emi: [data.business_emi || 0], business_emi: [data.business_emi || 0],
business_emi_paid: [data.business_emi_paid || ''], business_emi_paid: [data.business_emi_paid || ''],
@ -688,7 +688,7 @@ public m_investmentType = [];
name_of_the_owner: val.name_of_the_owner, name_of_the_owner: val.name_of_the_owner,
other_owner:val.other_owner, other_owner:val.other_owner,
relation: val.relation, relation: val.relation,
// purchase_year: val.purchase_year, purchase_year: val.purchase_year,
// purchase_month: val.purchase_month, // purchase_month: val.purchase_month,
emi: val.emi, emi: val.emi,
emi_paid: val.emi_paid, emi_paid: val.emi_paid,
@ -723,7 +723,7 @@ public m_investmentType = [];
business_name_of_the_owner: val.business_name_of_the_owner, business_name_of_the_owner: val.business_name_of_the_owner,
// other_owner: val.other_owner, // other_owner: val.other_owner,
// relation : val.relation, // relation : val.relation,
// purchase_year: val.purchase_year, business_purchase_year: val. business_purchase_year,
// purchase_month: val.purchase_month, // purchase_month: val.purchase_month,
business_emi: val.business_emi, business_emi: val.business_emi,
business_emi_paid: val.business_emi_paid, business_emi_paid: val.business_emi_paid,

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

@ -95,7 +95,7 @@
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Applicant Name" formControlName="applicant_name" required (selectionChange)="selectedBorrower($event.value,i)"> <mat-select placeholder="Applicant Name" formControlName="applicant_name" (selectionChange)="selectedBorrower($event.value,i)">
<mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option> <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -106,14 +106,14 @@
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="Applicant Name" <input matInput placeholder="Applicant Name"
formControlName="applicant_name" required> formControlName="applicant_name">
</mat-form-field> --> </mat-form-field> -->
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="Bank Name" formControlName="bank_name" required> <input matInput placeholder="Bank Name" formControlName="bank_name" >
</mat-form-field> --> </mat-form-field> -->
<mat-form-field> <mat-form-field>
<mat-select placeholder="Bank Name" formControlName="bank_name" required> <mat-select placeholder="Bank Name" formControlName="bank_name" >
<mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option> <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -124,7 +124,7 @@
<mat-form-field> <mat-form-field>
<mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)" placeholder="Account Type" formControlName="account_type" required > <mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)" placeholder="Account Type" formControlName="account_type" >
<mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option> <mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option>
</mat-select> </mat-select>
<!--<mat-select placeholder="Account Type" <!--<mat-select placeholder="Account Type"
@ -139,7 +139,7 @@
<mat-form-field *ngIf="pd_cus_segment!='SAL'"> <mat-form-field *ngIf="pd_cus_segment!='SAL'">
<mat-select placeholder="Is this the main business account" <mat-select placeholder="Is this the main business account"
formControlName="is_main" required> formControlName="is_main" >
<mat-option value="Yes">Yes</mat-option> <mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option> <mat-option value="No">No</mat-option>
</mat-select> </mat-select>
@ -148,7 +148,7 @@
<div fxLayout="row" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutAlign="start none">
<mat-form-field style="width: 35%;" *ngIf="salaryField"> <mat-form-field style="width: 35%;" *ngIf="salaryField">
<mat-select placeholder="Salary Credited in this account" <mat-select placeholder="Salary Credited in this account"
formControlName="salary" required> formControlName="salary" >
<mat-option value="Yes">Yes</mat-option> <mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option> <mat-option value="No">No</mat-option>
<mat-option value="NA">NA</mat-option> <mat-option value="NA">NA</mat-option>
@ -163,17 +163,17 @@
</div> </div>
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="Approximate Vintage" <input matInput placeholder="Approximate Vintage"
formControlName="vintage" required> formControlName="vintage" >
</mat-form-field>--> </mat-form-field>-->
<div> <div>
<label>Number of Years / Months since account was started</label> <label>Number of Years / Months since account was started</label>
<br> <br>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Year(s)" formControlName="vintage_year" required (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder="Year(s)" formControlName="vintage_year" (keypress)="keyPress($event)">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Month(s)" formControlName="vintage_month" required (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(itemrow,$event.target.value)"> <input matInput autocomplete="off" placeholder="Month(s)" formControlName="vintage_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -294,7 +294,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="banking_form_remark" required></textarea> <textarea matInput placeholder="Remarks" formControlName="banking_form_remark" ></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

25
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
View File

@ -149,20 +149,20 @@ export class BankingDetailsComponent implements OnInit {
createBankarray() { createBankarray() {
return this.fb.group({ return this.fb.group({
applicant_name: ['', Validators.compose([Validators.required])], applicant_name: [''],
other_applicant : [''], other_applicant : [''],
bank_name: ['', Validators.compose([Validators.required])], bank_name: [''],
other_bank: [''], other_bank: [''],
account_type: ['', Validators.compose([Validators.required])], account_type: [''],
//salary: ['', Validators.compose([Validators.required])], //salary: [''],
salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : ['', Validators.compose([Validators.required])], salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : [''],
limit: ['', Validators.compose([Validators.required])], limit: [''],
//is_main: ['', Validators.compose([Validators.required])], //is_main: [''],
//is_main: [this.pd_cus_segment == 'SAL' ? '' : '', Validators.compose([Validators.required])], //is_main: [this.pd_cus_segment == 'SAL' ? '' : ''],
//is_main:[''], //is_main:[''],
is_main: this.pd_cus_segment == 'SAL' ? [''] : ['', Validators.compose([Validators.required])], is_main: this.pd_cus_segment == 'SAL' ? [''] : [''],
vintage_year: ['', Validators.compose([Validators.required])], vintage_year: [''],
vintage_month: ['', Validators.compose([Validators.required])], vintage_month: [''],
}); });
} }
@ -190,9 +190,6 @@ export class BankingDetailsComponent implements OnInit {
} }
bankSubmit() { bankSubmit() {
if (!this.bankingForm.valid) {
return;
}
let records: any = {}; let records: any = {};
records.pdid = this.pdid; records.pdid = this.pdid;
records.formid = '7'; records.formid = '7';

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

@ -16,7 +16,7 @@ import {BusinessInfoComponent} from './../../forms/business-info/business-info.c
styleUrls: ['./business-info-group.component.scss'] styleUrls: ['./business-info-group.component.scss']
}) })
export class BusinessInfoGroupComponent implements OnInit { export class BusinessInfoGroupComponent implements OnInit {
pageTitle: string ="Business Informations"; pageTitle: string ="Business Information";
existCompanyList: any = []; existCompanyList: any = [];
pdid: number; pdid: number;
form_id: number; form_id: number;

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

@ -1454,7 +1454,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="business_remarks" required></textarea> <textarea matInput placeholder="Remarks" formControlName="business_remarks"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

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

@ -611,7 +611,7 @@ export class BusinessInfoComponent implements OnInit {
esic_regn: ['', Validators.compose([Validators.required])], esic_regn: ['', Validators.compose([Validators.required])],
other_documents: ['', Validators.compose([Validators.required])], other_documents: ['', Validators.compose([Validators.required])],
documents: this.fb.array([]), documents: this.fb.array([]),
business_remarks: ['', Validators.compose([Validators.required])], business_remarks: [''],
//any_delays: ['', Validators.compose([Validators.required])], //any_delays: ['', Validators.compose([Validators.required])],
persons_with_relationships:this.fb.array([]), persons_with_relationships:this.fb.array([]),
select_business_activity_type: this.fb.array([]), select_business_activity_type: this.fb.array([]),
@ -1116,6 +1116,7 @@ export class BusinessInfoComponent implements OnInit {
data.records.forEach(val => { data.records.forEach(val => {
if (val.isactive == 1) { if (val.isactive == 1) {
this.countryDataList.push(val); this.countryDataList.push(val);
console.log(this.countryDataList);
} }
}) })
}); });
@ -1227,6 +1228,7 @@ export class BusinessInfoComponent implements OnInit {
// } // }
submitDetails() { submitDetails() {
// let family: any = []; // let family: any = [];
console.log(this.businessForm.value); console.log(this.businessForm.value);
@ -1256,9 +1258,8 @@ export class BusinessInfoComponent implements OnInit {
//type 1: Checking manufacturing_activity_details //type 1: Checking manufacturing_activity_details
if(records.manufacturing_activity_details.length > 0){ if(records.manufacturing_activity_details.length > 0){
records.manufacturing_activity_details.forEach((val,index) => { records.manufacturing_activity_details.forEach((val,index) => {
if(records.manufacturing_activity_details.area_of_sale != "Within India"){ if(val.area_of_sale!= "Within India"){
let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) { let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) {
return val.countries_where_export_done[key]; return val.countries_where_export_done[key];
}); });
@ -1266,7 +1267,7 @@ export class BusinessInfoComponent implements OnInit {
if(total > 100 || total < 100){ if(total > 100 || total < 100){
validationFlag++; validationFlag++;
} }
} }
}); });
@ -1275,9 +1276,8 @@ export class BusinessInfoComponent implements OnInit {
//type 3 checking wholesale_trading_activity_details //type 3 checking wholesale_trading_activity_details
if(records.wholesale_trading_activity_details.length > 0){ if(records.wholesale_trading_activity_details.length > 0){
records.wholesale_trading_activity_details.forEach((val,index) => { records.wholesale_trading_activity_details.forEach((val,index) => {
if(records.wholesale_trading_activity_details.area_of_sale != "Within India"){ if(val.area_of_sale != "Within India"){
let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) { let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
return val.countries_where_export_done[key]; return val.countries_where_export_done[key];
}); });
@ -1294,7 +1294,7 @@ export class BusinessInfoComponent implements OnInit {
if(records.retail_trading_activity_details.length > 0){ if(records.retail_trading_activity_details.length > 0){
records.retail_trading_activity_details.forEach((val,index) => { records.retail_trading_activity_details.forEach((val,index) => {
if(records.retail_trading_activity_details.area_of_sale != "Within India"){ if(val.area_of_sale != "Within India"){
let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) { let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
return val.countries_where_export_done[key]; return val.countries_where_export_done[key];
}); });
@ -1312,7 +1312,7 @@ export class BusinessInfoComponent implements OnInit {
if(records.service_provider_activity_details.length > 0){ if(records.service_provider_activity_details.length > 0){
records.service_provider_activity_details.forEach((val,index) => { records.service_provider_activity_details.forEach((val,index) => {
if(records.service_provider_activity_details.area_of_sale != "Within India"){ if(val.area_of_sale != "Within India"){
let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) { let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) {
return val.countries_where_export_done[key]; return val.countries_where_export_done[key];
@ -1400,12 +1400,12 @@ export class BusinessInfoComponent implements OnInit {
} }
filterMaxSaleCities(datasource: any,filterValues:any) { filterMaxSaleCities(datasource: any,filterValues:any) {
console.log('Whole State data',datasource); // Whole State data // console.log('Whole State data',datasource); // Whole State data
console.log('Filtered state id',filterValues); // Filtered state id // console.log('Filtered state id',filterValues); // Filtered state id
if(filterValues){ if(filterValues){
let getOriginalStateList = datasource.map(dval => dval.state_id); let getOriginalStateList = datasource.map(dval => dval.state_id);
console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources // console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources
let setCityFilter = filterValues.map(x => { let setCityFilter = filterValues.map(x => {
let findIndex = getOriginalStateList.indexOf(x); let findIndex = getOriginalStateList.indexOf(x);
@ -1425,7 +1425,7 @@ export class BusinessInfoComponent implements OnInit {
Filter = getFilteredCityValues.map(x => { Filter = getFilteredCityValues.map(x => {
let findIndex = getOriginalCityList.indexOf(x); let findIndex = getOriginalCityList.indexOf(x);
findIndex = merged[findIndex]; findIndex = merged[findIndex];
console.log('findIndex',findIndex); // console.log('findIndex',findIndex);
//return findIndex.filter(x => x !== undefined); //return findIndex.filter(x => x !== undefined);
}); });

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

@ -20,7 +20,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="final_form_remarks"></textarea> <textarea matInput placeholder="Remarks" formControlName="final_form_remarks" required></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
View File

@ -55,7 +55,7 @@ export class FinalRemarksComponent implements OnInit {
pdid: [this.pdid], pdid: [this.pdid],
formid: ['20'], formid: ['20'],
final_custormer_remark_type : [], final_custormer_remark_type : [],
final_form_remarks: [] final_form_remarks: ['',Validators.required]
}); });
this.getM_Type(); this.getM_Type();
} }

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

@ -274,7 +274,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="general_remark" required></textarea> <textarea matInput placeholder="Remarks" formControlName="general_remark"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

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

@ -251,7 +251,7 @@ export class GeneralInfoComponent implements OnInit {
createCompanies(elementValue:any) { createCompanies(elementValue:any) {
return this._fb.group({ return this._fb.group({
company_order_id: [elementValue.company_order_id], company_order_id: [elementValue.company_order_id],
company_name: [elementValue.company_name,Validators.required], company_name: [elementValue.company_name],
is_active: [elementValue.is_active] is_active: [elementValue.is_active]
}); });
} }
@ -361,7 +361,7 @@ export class GeneralInfoComponent implements OnInit {
// create multiple company relation // create multiple company relation
createMultipleCompanyRelation(elementValue: any) { createMultipleCompanyRelation(elementValue: any) {
return this._fb.group({ return this._fb.group({
company_name: [elementValue.company_name,Validators.required], company_name: [elementValue.company_name],
company_relationship: [elementValue.company_relationship], company_relationship: [elementValue.company_relationship],
company_other_relationship:[elementValue.company_other_relationship] company_other_relationship:[elementValue.company_other_relationship]
}); });

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts
View File

@ -82,8 +82,8 @@ export class LenderRepresentativeComponent implements OnInit {
} }
public initRepresentative(): void { public initRepresentative(): void {
this.representativeForm = this.fb.group({ this.representativeForm = this.fb.group({
lender_representative_accompany: ['', Validators.compose([Validators.required])], lender_representative_accompany: [''],
representative_remarks: ['', Validators.compose([Validators.required])], representative_remarks: [''],
lender_representative_details: this.fb.array([]), lender_representative_details: this.fb.array([]),
}); });
} }
@ -99,8 +99,8 @@ export class LenderRepresentativeComponent implements OnInit {
} }
createLRDetail() { createLRDetail() {
return this.fb.group({ return this.fb.group({
lender_representative_who_accompanies : ['', Validators.compose([Validators.required])], lender_representative_who_accompanies : [''],
lender_representative_carry_loan_files: ['', Validators.compose([Validators.required])], lender_representative_carry_loan_files: [''],
}); });
} }

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

@ -20,13 +20,13 @@
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%"> <mat-form-field style="width: 80%">
<input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" required autocomplete="off"> <input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" autocomplete="off">
<mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%"> <mat-form-field style="width: 80%">
<mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" required> <mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" >
<mat-option *ngFor="let enduse of m_endUseofLoad" [value]="enduse.subproduct_id">{{ enduse.name }}</mat-option> <mat-option *ngFor="let enduse of m_endUseofLoad" [value]="enduse.subproduct_id">{{ enduse.name }}</mat-option>
</mat-select> </mat-select>
<!--<mat-select multiple placeholder="What is the end use" <!--<mat-select multiple placeholder="What is the end use"
@ -53,7 +53,7 @@
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%"> <mat-form-field style="width: 80%">
<mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event)" <mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event)"
formControlName="is_transfer" required > formControlName="is_transfer" >
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
@ -65,12 +65,12 @@
<div *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_transfer'].value != ''"> <div *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_transfer'].value != ''">
<mat-form-field style="width: 60%"> <mat-form-field style="width: 60%">
<input matInput placeholder="What is the amount required for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off"> <input matInput placeholder="What is the amount for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off">
<mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Is there a Top Up" <mat-select placeholder="Is there a Top Up"
formControlName="is_topup" required> formControlName="is_topup" >
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
@ -98,12 +98,12 @@
<div *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' "> <div *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' ">
<mat-form-field style="width: 30%"> <mat-form-field style="width: 30%">
<input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" required (keyup)="inWords($event,4)" autocomplete="off"> <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" (keyup)="inWords($event,4)" autocomplete="off">
<mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 30%"> <mat-form-field style="width: 30%">
<mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution" formControlName="source" required multiple> <mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution" formControlName="source" multiple>
<mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option> <mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -134,7 +134,7 @@
<mat-form-field style="width: 60%"> <mat-form-field style="width: 60%">
<input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)" required autocomplete="off"> <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)" autocomplete="off">
<mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> --> <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
@ -142,7 +142,7 @@
<mat-card-header><p>Details of Property being Mortgaged</p></mat-card-header> <mat-card-header><p>Details of Property being Mortgaged</p></mat-card-header>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field> <mat-form-field>
<mat-select placeholder="Type of Property" formControlName="property_type" (selectionChange)="mortage_type($event.value)" required> <mat-select placeholder="Type of Property" formControlName="property_type" (selectionChange)="mortage_type($event.value)" >
<mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.mortage_property_id">{{ typeprop.property_name }}</mat-option> <mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.mortage_property_id">{{ typeprop.property_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -169,7 +169,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select multiple placeholder="Name of Owner" <mat-select multiple placeholder="Name of Owner"
formControlName="owner_name" (selectionChange)="ownerNameChange($event)" required> formControlName="owner_name" (selectionChange)="ownerNameChange($event)" >
<mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option> <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
<mat-option value="Others">Others (Please Specify)</mat-option> <mat-option value="Others">Others (Please Specify)</mat-option>
</mat-select> </mat-select>
@ -180,7 +180,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Status of Construction" formControlName="construction_status" required> <mat-select placeholder="Status of Construction" formControlName="construction_status" >
<mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option> <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -199,12 +199,12 @@
<mat-form-field> <mat-form-field>
<input matInput placeholder="Estimate Market Value as Per Customer" <input matInput placeholder="Estimate Market Value as Per Customer"
formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" required autocomplete="off"> formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" autocomplete="off">
<mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="Value as Per Agreement" <input matInput placeholder="Value as Per Agreement"
formControlName="value_per_agreement" (keypress)="keyPress($event)" required (keyup)="inWords($event,3)"> formControlName="value_per_agreement" (keypress)="keyPress($event)" (keyup)="inWords($event,3)">
<mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{valAsPerAgmtInWords}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{valAsPerAgmtInWords}} Only</mat-hint>
</mat-form-field> --> </mat-form-field> -->
</mat-card-content> </mat-card-content>
@ -319,7 +319,7 @@
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="loandetails_remarks" required></textarea> <textarea matInput placeholder="Remarks" formControlName="loandetails_remarks" ></textarea>
</mat-form-field> </mat-form-field>
</div> </div>

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

@ -339,11 +339,11 @@ getM_sourceofamount() {
public initloanDetailsForm(): void { public initloanDetailsForm(): void {
this.loanDetailsForm = this.fb.group({ this.loanDetailsForm = this.fb.group({
loan_amount: [this.exist_loan_amt, Validators.compose([Validators.required])], loan_amount: [this.exist_loan_amt],
end_use: ['', Validators.compose([Validators.required])], end_use: [''],
end_use_other: [''], end_use_other: [''],
is_transfer: ['', Validators.compose([Validators.required])], is_transfer: [''],
//is_topup: ['', Validators.compose([Validators.required])], //is_topup: [''],
is_topup: [''], is_topup: [''],
balance_transfer_amount: [''], balance_transfer_amount: [''],
topup_amount: [''], topup_amount: [''],
@ -355,16 +355,16 @@ getM_sourceofamount() {
other_source:[''], other_source:[''],
personal_loan_source:[''], personal_loan_source:[''],
//lender_name_type: [''], //lender_name_type: [''],
emi_level: ['', Validators.compose([Validators.required])], emi_level: [''],
property_type: ['', Validators.compose([Validators.required])], property_type: [''],
property_type_others:[''], property_type_others:[''],
owner_name: ['', Validators.compose([Validators.required])], owner_name: [''],
other_owners_name :[''], other_owners_name :[''],
construction_status: ['', Validators.compose([Validators.required])], construction_status: [''],
//percentage_of_construction : [''], //percentage_of_construction : [''],
emv_per_customer: ['', Validators.compose([Validators.required])], emv_per_customer: [''],
//value_per_agreement: ['', Validators.compose([Validators.required])], //value_per_agreement: [''],
loandetails_remarks: ['', Validators.compose([Validators.required])], loandetails_remarks: [''],
}); });
} }
// endUserChange(event) { // endUserChange(event) {

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

@ -142,7 +142,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput autocomplete="off" placeholder="Remarks" formControlName="neighbour_reference_remark" required></textarea> <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="neighbour_reference_remark" ></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

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

@ -137,17 +137,17 @@ export class NeighbourHoodComponent implements OnInit {
let stdcode = elementValue.landline.substr(0,stdcodesearch); let stdcode = elementValue.landline.substr(0,stdcodesearch);
let landline = elementValue.landline.substr(+stdcodesearch + 1,8); let landline = elementValue.landline.substr(+stdcodesearch + 1,8);
return this._fb.group({ return this._fb.group({
reference_name: [elementValue.reference_name, Validators.required], reference_name: [elementValue.reference_name],
mobile: [elementValue.mobile,Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(10)])], mobile: [elementValue.mobile,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
std_code: [stdcode,Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], std_code: [stdcode,Validators.compose([Validators.minLength(2),Validators.maxLength(4)])],
landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])],
location:[elementValue.location,Validators.required], location:[elementValue.location],
relationship_with:[elementValue.relationship_with,Validators.required], relationship_with:[elementValue.relationship_with],
others: [elementValue.others], others: [elementValue.others],
year_relation_applicant:[elementValue.year_relation_applicant,Validators.required], year_relation_applicant:[elementValue.year_relation_applicant],
months_relation_applicant:[elementValue.months_relation_applicant,Validators.required], months_relation_applicant:[elementValue.months_relation_applicant],
business_volume_amount:[elementValue.business_volume_amount,Validators.required], business_volume_amount:[elementValue.business_volume_amount],
business_volume_unit:[elementValue.business_volume_unit, Validators.required], business_volume_unit:[elementValue.business_volume_unit],
others_unit : [elementValue.others_unit], others_unit : [elementValue.others_unit],
reference_final_remarks:[elementValue.reference_final_remarks], reference_final_remarks:[elementValue.reference_final_remarks],
specify_final_remark : [elementValue.specify_final_remark], specify_final_remark : [elementValue.specify_final_remark],
@ -173,8 +173,8 @@ export class NeighbourHoodComponent implements OnInit {
// create neighbourhood form array // create neighbourhood form array
createNeighbourhood(elementValue:any){ createNeighbourhood(elementValue:any){
return this._fb.group({ return this._fb.group({
neighbourhood_name: [elementValue.neighbourhood_name, Validators.required], neighbourhood_name: [elementValue.neighbourhood_name],
do_know: [elementValue.do_know,Validators.required], do_know: [elementValue.do_know],
how_long_do_know: [elementValue.how_long_do_know], how_long_do_know: [elementValue.how_long_do_know],
is_applicant_owner: [elementValue.is_applicant_owner], is_applicant_owner: [elementValue.is_applicant_owner],
}); });

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

@ -38,7 +38,7 @@
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<mat-select placeholder="Source" <mat-select placeholder="Source"
formControlName="source" required> formControlName="source">
<mat-option value="{{src.id}}" *ngFor="let src of sourceData">{{src.name}}</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="rental_income">Rental Income</mat-option>
<mat-option value="interest_income">Interest Income</mat-option> <mat-option value="interest_income">Interest Income</mat-option>
@ -54,12 +54,12 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required (keyup)="inWords($event,i)"> <input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" (keyup)="inWords($event,i)">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint> <mat-hint align="start" style="font-size:70%" *ngIf="details.get('amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<mat-select placeholder="Frequency" formControlName="frequency" required> <mat-select placeholder="Frequency" formControlName="frequency">
<mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option> <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -198,7 +198,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%"> <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks" required></textarea> <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

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

@ -112,8 +112,8 @@ public viewerOptions: any = {
} }
public initOtherincomeForm(): void { public initOtherincomeForm(): void {
this.otherIncomeForm = this.fb.group({ this.otherIncomeForm = this.fb.group({
other_income: ['', Validators.compose([Validators.required])], other_income: [''],
otherincome_remarks: ['', Validators.compose([Validators.required])], otherincome_remarks: [''],
income_details: this.fb.array([]) income_details: this.fb.array([])
}); });
} }
@ -129,10 +129,10 @@ public viewerOptions: any = {
} }
createDetail() { createDetail() {
return this.fb.group({ return this.fb.group({
source: ['', Validators.compose([Validators.required])], source: [''],
others_source : [''], others_source : [''],
amount: ['', Validators.compose([Validators.required])], amount: [''],
frequency: ['', Validators.compose([Validators.required])], frequency: [''],
others_frequency : [''] others_frequency : ['']
}); });
} }

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

@ -305,7 +305,7 @@
<div fxFlex="60" class="pb-0 text-sm-left" align="left"> <div fxFlex="60" class="pb-0 text-sm-left" align="left">
<!-- <mat-form-field appearance="outline" style="width: 100%"> <!-- <mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label> <mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="personal_info_form_remark" required></textarea> <textarea matInput placeholder="Remarks" formControlName="personal_info_form_remark" ></textarea>
</mat-form-field> --> </mat-form-field> -->
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">

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

@ -108,32 +108,32 @@ export class RentalInfoComponent implements OnInit {
pdid: this.pdid, pdid: this.pdid,
formid: this.form_id, formid: this.form_id,
fk_createdby: this.pdid, fk_createdby: this.pdid,
person_met: ['', Validators.compose([Validators.required])], person_met: [''],
property_own: ['', Validators.compose([Validators.required])], property_own: [''],
nature_property: ['', Validators.compose([Validators.required])], nature_property: [''],
rental_home: this._fb.array([]) rental_home: this._fb.array([])
}); });
} }
createpropertyArray() { createpropertyArray() {
this.propertyList = this._fb.group({ this.propertyList = this._fb.group({
complete_add: ['', Validators.compose([Validators.required])], complete_add: [''],
area_of_property: ['', Validators.compose([Validators.required])], area_of_property: [''],
structure_property: ['', Validators.compose([Validators.required])], structure_property: [''],
total_room: ['', Validators.compose([Validators.required])], total_room: [''],
is_rent: ['', Validators.compose([Validators.required])], is_rent: [''],
date_agreement: [''], date_agreement: [''],
date_validity: [''], date_validity: [''],
rent_agreement: [''], rent_agreement: [''],
actual_rent: [''], actual_rent: [''],
photo_areegment: [''], photo_areegment: [''],
bank: ['', Validators.compose([Validators.required])], bank: [''],
cash: ['', Validators.compose([Validators.required])], cash: [''],
rent_each_floor: ['', Validators.compose([Validators.required])], rent_each_floor: [''],
total_rent: ['', Validators.compose([Validators.required])], total_rent: [''],
related_doc_owner: ['', Validators.compose([Validators.required])], related_doc_owner: [''],
property_photographs: ['', Validators.compose([Validators.required])], property_photographs: [''],
third_party_check: ['', Validators.compose([Validators.required])], third_party_check: [''],
details_tenants: this._fb.array([this.createTenatsArray()]), details_tenants: this._fb.array([this.createTenatsArray()]),
}); });
return this.propertyList; return this.propertyList;
@ -141,12 +141,12 @@ export class RentalInfoComponent implements OnInit {
createTenatsArray() { createTenatsArray() {
return this._fb.group({ return this._fb.group({
name: ['', Validators.compose([Validators.required])], name: [''],
mobile_no: ['', Validators.compose([Validators.required])], mobile_no: [''],
tenants_seen: ['', Validators.compose([Validators.required])], tenants_seen: [''],
tenants_con_owner: ['', Validators.compose([Validators.required])], tenants_con_owner: [''],
staying_since: ['', Validators.compose([Validators.required])], staying_since: [''],
rent_paid: ['', Validators.compose([Validators.required])], rent_paid: [''],
}); });
} }

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

@ -349,7 +349,7 @@ export class StockComponent implements OnInit {
}) })
// this.stockForms = this.fb.group({ // this.stockForms = this.fb.group({
// stock_remarks: ['', Validators.compose([Validators.required])], // stock_remarks: [''],
// raw_materials: this.fb.array([]), // raw_materials: this.fb.array([]),
// finished_goods: this.fb.array([]), // finished_goods: this.fb.array([]),
// traded_goods: this.fb.array([]) // traded_goods: this.fb.array([])
@ -563,8 +563,8 @@ tradingFormCreation(val) {
createGoods2() { createGoods2() {
return this.fb.group({ return this.fb.group({
goods_name: ['', Validators.compose([Validators.required])], goods_name: [''],
goods_observed: ['', Validators.compose([Validators.required])], goods_observed: [''],
goods_quantity: [''], goods_quantity: [''],
goods_value: [''], goods_value: [''],
finished_goods_value: [''], finished_goods_value: [''],
@ -601,8 +601,8 @@ tradingFormCreation(val) {
createTradedGoods2() { createTradedGoods2() {
return this.fb.group({ return this.fb.group({
traded_goods_name: ['', Validators.compose([Validators.required])], traded_goods_name: [''],
traded_goods_observed: ['', Validators.compose([Validators.required])], traded_goods_observed: [''],
traded_goods_quantity: [''], traded_goods_quantity: [''],
estimated_traded_goods_value: [''], estimated_traded_goods_value: [''],
traded_goods_value: [''], traded_goods_value: [''],