diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index f4a58047d..13cd38df4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -97,27 +97,29 @@
-
- +
+ Yes No - -
+
+
+
+
- - + + - - + + -
+
+
-
- + + + + {{details.get('variation').value <= 0 ? 'Decreases ' : 'Increases '}} in Sales in FY Over Sales in FY is % + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 71359d058..515fb19be 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -120,7 +120,7 @@ export class FinancialInfoComponent implements OnInit { formid: this.form_id, fk_createdby: this.pdid, financial_remarks: [''], - staring_financial_year : [''], + staring_financial_year : ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], total_financial_year : [''], same_as_financial_statements:[''], date_per_financial: this.fb.array([]), @@ -129,9 +129,9 @@ export class FinancialInfoComponent implements OnInit { } // createDate() { // return this.fb.group({ - // financial_year: ['', Validators.compose([Validators.required, Validators.pattern(/^[0-9]{4}-[0-9]{2}$/)])], - // financial_annual_sale: ['', Validators.compose([Validators.required, Validators.pattern(/^[0-9\(\)]+$/)])], - // financial_net_profit: ['', Validators.compose([Validators.required, Validators.pattern(/^-?[1-9]\d*|0$/)])], + // financial_year: ['', Validators.compose([ Validators.pattern(/^[0-9]{4}-[0-9]{2}$/)])], + // financial_annual_sale: ['', Validators.compose([ Validators.pattern(/^[0-9\(\)]+$/)])], + // financial_net_profit: ['', Validators.compose([ Validators.pattern(/^-?[1-9]\d*|0$/)])], // financial_margin: [''], // financial_variation: [''], // financial_reason: [''], @@ -167,11 +167,11 @@ export class FinancialInfoComponent implements OnInit { createValuewithData(value) { return this.fb.group({ - estimate_year: [value.estimate_year, Validators.compose([Validators.required, Validators.pattern(/^[0-9]{4}-[0-9]{2}$/)])], - estimate_annual_sale: [value.estimate_annual_sale, Validators.compose([Validators.required, Validators.pattern(/^[0-9\(\)]+$/)])], + estimate_year: [value.estimate_year, Validators.compose([ Validators.pattern(/^[0-9]{4}-[0-9]{2}$/)])], + estimate_annual_sale: [value.estimate_annual_sale, Validators.compose([ Validators.pattern(/^[0-9\(\)]+$/)])], estimate_profit_or_loss:[value.estimate_profit_or_loss], estimate_net_loss: [value.estimate_net_loss, Validators.compose([Validators.pattern(/^-?[1-9]\d*|0$/)])], - estimate_net_profit: [value.estimate_net_profit, Validators.compose([Validators.required, Validators.pattern(/^-?[1-9]\d*|0$/)])], + estimate_net_profit: [value.estimate_net_profit, Validators.compose([ Validators.pattern(/^-?[1-9]\d*|0$/)])], //estimate_margin: [value.], estimate_margin_of_profit: [value.estimate_margin_of_profit], estimate_margin_of_loss: [value.estimate_margin_of_loss],