From 673ccb490f26bdf5574997ca33c227b24e102906 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Sat, 17 Nov 2018 13:23:41 +0530
Subject: [PATCH] financial-info, qc form details changes : kdk

---
 .../forms/financial-info/financial-info.component.html      | 2 +-
 .../forms/financial-info/financial-info.component.ts        | 6 +++---
 .../quality-check/qc-list/qc-start/qc-start.component.html  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index adadb2070..26880e2f1 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -22,7 +22,7 @@
                             <input matInput  placeholder="Margin" formControlName="financial_margin">
                         </mat-form-field>
                         <mat-form-field *ngIf="i != 0">
-                            <input matInput [ngClass]="{'highlight': details.controls['financial_variation'].value >= 40 || details.controls['financial_variation'].value >= -40}" placeholder="Variation from Previous Year" formControlName="financial_variation">
+                            <input matInput [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" placeholder="Variation from Previous Year" formControlName="financial_variation">
                         </mat-form-field>
                         <mat-form-field>
                             <input matInput placeholder="Reason For Major Difference" formControlName="financial_reason">
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 6d12f4675..cc3b02487 100644
--- 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
@@ -134,7 +134,7 @@ export class FinancialInfoComponent implements OnInit {
             console.log('value')
             let array = <FormArray>this.financialForm.controls['date_per_financial']
             let prev_profit = array.value[index - 1].financial_net_profit;
-            let variation = profit - prev_profit / prev_profit * 100;
+            let variation = ((profit - prev_profit)/ prev_profit) * 100;
             detail.controls.financial_variation.setValue(variation.toFixed(2))
             // detail.controls.financial_variation.disable()
         }
@@ -144,7 +144,7 @@ export class FinancialInfoComponent implements OnInit {
         let salary = detail.value.financial_annual_sale;
         let profit = detail.value.financial_net_profit;
         if (salary != '' && profit != '') {
-            let margin = profit / salary * 100;
+            let margin = (profit / salary) * 100;
             detail.controls.financial_margin.setValue(margin.toFixed(2))
             // detail.controls.financial_margin.disable()
         }
@@ -154,7 +154,7 @@ export class FinancialInfoComponent implements OnInit {
         if ( profit != '' && index != 0) {
             let array = <FormArray>this.financialForm.controls['estimated_value']
             let prev_profit = array.value[index - 1].estimate_net_profit;
-            let variation = profit - prev_profit / prev_profit * 100;
+            let variation = ((profit - prev_profit) / prev_profit) * 100;
             detail.controls.estimate_variation.setValue(variation.toFixed(2))
             // detail.controls.estimate_variation.disable()
         }
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html
index a931c74f1..e93d17739 100644
--- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html
@@ -64,7 +64,7 @@
                             <!-- <h6 class="mt-0">About</h6> -->
                             <p>No Records Found..</p>
                          </mat-card-content>
-                        </div>
+                     
                                   
                          <!-- check type of questions -->
                               <ng-container [ngSwitch]="selectedCategory.fk_question_answertype">
@@ -370,6 +370,7 @@
                               </ng-container>
                           
                            </ng-container>
+                              </div>
                           <!-- end check box questions section -->
                         <!-- start forms based questions -->
                     <div *ngIf="formsCategoryEnable">