From 4d4bed232bd4bd8ee0c25afa3a0d84ab57298b94 Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Sat, 3 Nov 2018 11:29:59 +0530
Subject: [PATCH 1/5] Question List UI

---
 .../template/questions/list/list.component.html    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html
index 4665b1381..99295c4c7 100644
--- a/ng6-seed/src/app/template/questions/list/list.component.html
+++ b/ng6-seed/src/app/template/questions/list/list.component.html
@@ -25,7 +25,8 @@
         </div>
         <!--</mat-card-content>-->
         <mat-card-content>
-            <mat-table [dataSource]="dataSource"  matSort *ngIf="productList.length > 0" >
+            <ng-container *ngIf="productList.length > 0">
+            <mat-table [dataSource]="dataSource">
      
                 <ng-container matColumnDef="category_name">
                       <mat-cell  fxFlex="25%" class="cell"  *matCellDef="let product;" style="width:20% !important;"> 
@@ -45,11 +46,12 @@
                <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
                 </mat-row>
                 </mat-table>
-            
-                  
-                <mat-paginator #paginator class="mat-elevation-z1" [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+            </ng-container>
+                <div *ngIf="productList.length > 0">
+                <mat-paginator  [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
                 [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
               </mat-paginator>
+              </div>
    
   
      <!---- <ng-container *ngIf="productList.length > 0">
@@ -79,7 +81,9 @@
         </div>
       </ng-container>-->
       <mat-card *ngIf="noQuesMasterRecrdFound">
-          <div class="no-record-found">No Record Found ... </div>
+        <mat-card-content>
+            <div class="no-record-found">No Record Found ... </div>
+        </mat-card-content>         
         </mat-card> 
   
     

From 64816cd2d6d729d500f18352691b153b92ad3906 Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Sat, 3 Nov 2018 14:01:59 +0530
Subject: [PATCH 2/5] Entity UI

---
 .../entity-edit-billing-info.component.html               | 8 ++++----
 .../entity-edit-region/entity-edit-region.component.html  | 4 +++-
 .../entity-edit-tat/entity-add-tat.component.html         | 2 +-
 .../entity-edit-tat/entity-edit-tat.component.html        | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
index 28ffe3d7d..b8a07d63f 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
@@ -1,4 +1,4 @@
-<div fxLayout="row wrap" fxLayoutAlign="end">
+<div fxLayout="row wrap" fxLayoutAlign="end" style="padding-top:1%">
     <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Billing Information" matTooltipPosition="above" (click)="editDetails(null); false"><mat-icon>add</mat-icon></button>
 </div>
 <mat-card *ngFor="let data of entityBillingInfoRecord">
@@ -8,17 +8,17 @@
         </div>
         <div fxFlex="50%">
           <div>
-            {{data.addressline2}}, {{data.addressline3}}
+            {{data.addressline2}}<span *ngIf="data.addressline3">, {{data.addressline3}}</span>
           </div>
           <div>
-            Pan: {{data.pan}}, Gst: {{data.gstno}}
+           <span *ngIf="data.pan">Pan: {{data.pan}}</span> <span *ngIf="data.gstno">,  Gst: {{data.gstno}}</span>
           </div>
           <div>
             <div *ngFor="let conts of data.contacts; let last = last">{{conts.contact_person}} - {{conts.contact_email}} - {{conts.contact_mobile_no}} <span *ngIf="!last">,</span></div>
           </div>
         </div>
         <div fxFlex="20%">
-          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
+          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
         </div>
    </div>
 </mat-card>
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
index bcca26bbe..750981985 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
@@ -1,6 +1,7 @@
 <form [formGroup]="_editEntityRegionFrom" (submit)="onSubmit()">
     <div formArrayName="region_lender" class="example-full-width">
         <mat-card *ngFor="let region of _editEntityRegionFrom.controls.region_lender['controls']; let i=index">
+           <mat-card-content>
             <div [formGroupName]="i">
                 <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="center center">
                     <mat-form-field fxFlex="30%">
@@ -31,7 +32,7 @@
                         <mat-error *ngIf="submitted && region['controls'].fk_branch_id.hasError('required')" class="mat-text-warn">Branch Required.!</mat-error>
                     </mat-form-field>-->
                      
-                     <div fxFlex="30%">
+                     <div fxFlex="30%" style="text-align:center;">
                             <mat-checkbox *ngIf="region.get('entity_region_map_id').value != null" formControlName="isactive" [ngModel]="region.get('isactive').value == 1 ? true : region.get('isactive').value == 0 ? false : null"
                             (ngModelChange)="region.get('isactive').value = $event ? 1 : 0"></mat-checkbox>
                             
@@ -41,6 +42,7 @@
                      </div>
                 </div>
             </div>
+        </mat-card-content>
         </mat-card>
          </div>
     <div class="row" style="text-align:right;">
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html
index 921e2291d..b7de951e7 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html
@@ -1,4 +1,4 @@
-<div style="overflow: auto;">
+<div >
     <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="end">
         <div style="text-align:right;">
             <button mat-raised-button mat-icon-button color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above"
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html
index 13d6670fe..ecc31a782 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html
@@ -1,6 +1,6 @@
 <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="end" style="padding-top:1%">
-      <div fxFlex="20%">
-        <button mat-fab class="mr-1 mb-1" color="primary"matTooltip="Add New Tat Details" matTooltipPosition="above"  (click)="addNewTatDetails()"><mat-icon>add</mat-icon></button>
+      <div fxFlex="20%" style="text-align:right;">
+        <button mat-fab class="mr-1 mb-1" color="primary"matTooltip="Add More TAT Details" matTooltipPosition="above"  (click)="addNewTatDetails()"><mat-icon>add</mat-icon></button>
       </div>
 </div>
 
@@ -18,7 +18,7 @@
           {{data.tatVal2}}
         </div>
         <div fxFlex="18%">
-          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
+          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
         </div>
    </div>
 </mat-card>
\ No newline at end of file

From 5d6682e40a539f8685acca411b4afa065fe03b1e Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Sat, 3 Nov 2018 14:26:42 +0530
Subject: [PATCH 3/5] Entity list UI

---
 .../entity-list/entity.list.component.html    | 41 ++++++++++++++++++-
 .../questions/list/list.component.html        |  6 +--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
index 32b8be9c7..c6ce4f330 100644
--- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
@@ -8,7 +8,40 @@
         <button mat-fab class="mr-1 mb-1" color="primary"matTooltip="Add New Entity" matTooltipPosition="above"  (click)="addNewEntity()"><mat-icon>add</mat-icon></button>
       </div>
     </div>
+     <mat-card-content>
     <ng-container *ngIf="enityList.length > 0">
+        <mat-table [dataSource]="dataSource">
+ 
+            <ng-container matColumnDef="entity_name">
+                  <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                    <span *ngIf="product.entity_name" mat-line>{{ product.entity_name }}</span>
+                     </mat-cell>
+            </ng-container>
+            <ng-container matColumnDef="name">
+                <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                    <div> {{ product.full_name }} ({{product.short_name}})</div>
+                    <div> {{ product.branch_name }} </div>
+                    <div> {{product.city_name}}<span *ngIf="product.state_name">,</span> {{product.state_name}} </div>
+                   </mat-cell>
+          </ng-container>
+          <ng-container matColumnDef="contact">
+              <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                  <div> {{ product.phone_number }}</div>
+                  <div> {{ product.official_email }}</div></mat-cell>
+        </ng-container>
+        <ng-container matColumnDef="actions">
+              <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                  <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editEntity(product)"><mat-icon>edit</mat-icon></button>
+           
+              </mat-cell>
+        </ng-container>
+           
+           <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
+            </mat-row>
+            </mat-table> 
+        </ng-container>
+      </mat-card-content>
+    <!----<ng-container *ngIf="enityList.length > 0">
       <div style="padding: 0 12px;">
         <mat-card class="product-card" *ngFor="let product of dataSource.connect() | async">
           <div fxLayout="row" fxLayoutAlign="start start">
@@ -38,13 +71,17 @@
           </div>
         </mat-card>
       </div>
-    </ng-container>
+    </ng-container>-->
     <mat-card *ngIf="noQuesMasterRecrdFound">
+      <mat-card-content>
       <div class="no-record-found">No Record Found ... </div>
+    </mat-card-content>
     </mat-card>
-    <mat-paginator #paginator class="mat-elevation-z1" [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+    <div *ngIf="enityList.length > 0">
+    <mat-paginator  [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
       [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
     </mat-paginator>
+    </div>
   </mat-card>
 </div>
 
diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html
index 99295c4c7..fd7fe1a92 100644
--- a/ng6-seed/src/app/template/questions/list/list.component.html
+++ b/ng6-seed/src/app/template/questions/list/list.component.html
@@ -29,17 +29,17 @@
             <mat-table [dataSource]="dataSource">
      
                 <ng-container matColumnDef="category_name">
-                      <mat-cell  fxFlex="25%" class="cell"  *matCellDef="let product;" style="width:20% !important;"> 
+                      <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;" > 
                         <span *ngIf="product.category_name" mat-line>{{ product.category_name }}</span>
                          </mat-cell>
                 </ng-container>
                 <ng-container matColumnDef="question">
-                  <mat-cell  fxFlex="65%"  class="cell" *matCellDef="let product;" style="width:70% !important;"> 
+                  <mat-cell  fxFlex="70%"  class="cell" *matCellDef="let product;" > 
                     <span *ngIf="product.question" mat-line>{{ product.question }}</span>
                      </mat-cell>
                </ng-container>
                 <ng-container matColumnDef="actions">
-                  <mat-cell fxFlex="10%"  class="cell" *matCellDef="let product;" style="width:10% !important;"> 
+                  <mat-cell fxFlex="10%"  class="cell" *matCellDef="let product;"> 
                     <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editQuestion(product)"><mat-icon>edit</mat-icon></button>
                     </mat-cell>
                </ng-container>

From e4d7420a09b3c646bc25f89c4b1395623d20fb59 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 3 Nov 2018 15:32:01 +0530
Subject: [PATCH 4/5] Login css : ps

---
 .../app/session/login/login-component.html    | 12 ++---
 .../app/session/login/login-component.scss    | 53 ++++++++++---------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html
index 61229ce5e..41ee7e92e 100644
--- a/ng6-seed/src/app/session/login/login-component.html
+++ b/ng6-seed/src/app/session/login/login-component.html
@@ -2,7 +2,7 @@
     <div class="form-bg">
         <div fxLayout="row" fxLayoutAlign="center" class="pt-2">
                     <!-- <p>SINEEDGE Login Details</p> -->
-                    <h3><img [src]="'http://ssa.sineedge.com/sparqapi/logo/sineedge_red.png'" style="height: 50px;;"> <span> SINEEDGE </span>
+                    <h3 class="page-title"><img [src]="'http://ssa.sineedge.com/sparqapi/logo/sineedge_red.png'" style="height: 50px;;"> <span> SINEEDGE </span>
                     </h3>
         </div>
         <div fxLayout="row" fxLayoutAlign="center start" class="pt-2">
@@ -11,7 +11,6 @@
                     <div>
                         <h2 class="base-border">Login</h2>
                         <!-- <p>Enter Your Login Details</p> -->
-                        <br>
                         <form #form="ngForm" (ngSubmit)="login()">
                             <div fxLayout="column" fxLayoutAlign="start stretch">
                                 <mat-form-field style="width: 100%">
@@ -22,10 +21,11 @@
                                     <input matInput placeholder="Password" minlength= "8" type="password" name="password" required [(ngModel)]="password">
                                 </mat-form-field>
                                 <button class="mat-green" mat-raised-button>SIGN IN</button><br/>
-                                <div *ngIf="email">
-                                <a  class="mat-text-warn mb-0" (click)="forgotpassword();">Forgot password?</a></div>
+                                <div>
+                                <a  *ngIf="email" class="mat-text-warn mb-0" (click)="forgotpassword();">Forgot password?</a></div>
                                 <!-- <p class="mb-0">Don't have an account? <a [routerLink]="['/register']" class="mat-text-primary">Register Here</a></p> -->
-                            </div>
+                                </div>
+                                
                             
                         </form>
                     </div>
@@ -41,7 +41,7 @@
 <footer class="page-footer">
 
     <!-- © Copyright -->
-    <div class="footer-copyright text-center py-1">&#169; 2018 
+    <div class="footer-copyright text-center">&#169; 2018 
     <a href="http://www.sineedge.com" target="_blank"> SineEdge Consulting Pvt Ltd. </a> All rights are reserved
     </div>
     <!-- © Copyright -->
diff --git a/ng6-seed/src/app/session/login/login-component.scss b/ng6-seed/src/app/session/login/login-component.scss
index c82aba065..0829347fd 100644
--- a/ng6-seed/src/app/session/login/login-component.scss
+++ b/ng6-seed/src/app/session/login/login-component.scss
@@ -1,36 +1,41 @@
 .form-bg {
-//    background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important;
+//background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important;
 //background-image: url(../../../assets/images/login_o.jpg);
-    //background-color: #F44336;
-    background: url(../../../assets/images/bg.png) repeat-x 0 0 #E00201;
-    height: 100vh !important;
+//background-color: #F44336;
+    background: url(../../../assets/images/bg.png) repeat-x 0 0 #ffffff;
+    //height: 100vh !important;
     background-position: center !important;
-    min-height: calc(0vh + 0px) !important;
+    min-height: calc(90vh + 90px) !important;
 }
+
 .signin-page{
-	float: left;
-	width: 100%;
-	
-	padding-bottom: 40px;
+        float: left;
+        width: 100%;	
+        padding-bottom: 40px;
 }
-// .form-bg {
-//     float: left;
-//     width: 100%;
-//     background-color: repeat-x 0 0 #F44336;
-//     padding-bottom: 40px;
-// }
+    // .form-bg {
+    //     float: left;
+    //     width: 100%;
+    //     background-color: repeat-x 0 0 #F44336;
+    //     padding-bottom: 40px;
+    // }
 .form-bg::before {
-    background-color: rgba(0, 0, 0, 0) !important;
+        background-color: rgba(0, 0, 0, 0) !important;
 }
 .form-bg::after{
-    background-color:  #E00201;
+        background-color:  #E00201;
 }
-h3, .page-footer{
-    color:#E00201;
-    background-color:#ffffff;
-    font-weight: bold;
+.page-title{
+        color:#E00201;
+        background-color:#ffffff;
+        font-weight: bold;
+}
+.page-footer{
+        color:#E00201;
+        background-color:#ffffff;
+        font-size: 14px;
 }
 .bottom-sec,.mat-green{
-    color:white !important;
-    font-weight: 700;
-}
+        color:white !important;
+        font-weight: 700;
+}
\ No newline at end of file

From e5d4a00505499830b20d7276cc3a29945c991348 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Sun, 4 Nov 2018 10:38:44 +0530
Subject: [PATCH 5/5] question master add changes : kdk

---
 .../template/questions/add/add.component.html | 111 ++++++++-------
 .../template/questions/add/add.component.ts   |  19 ++-
 .../questions/edit/edit.component.html        | 134 ++++++++++--------
 .../template/questions/edit/edit.component.ts |  38 +++--
 4 files changed, 181 insertions(+), 121 deletions(-)

diff --git a/ng6-seed/src/app/template/questions/add/add.component.html b/ng6-seed/src/app/template/questions/add/add.component.html
index f4e60e780..daa410b1d 100644
--- a/ng6-seed/src/app/template/questions/add/add.component.html
+++ b/ng6-seed/src/app/template/questions/add/add.component.html
@@ -1,78 +1,89 @@
-<div style="max-height: 580px;">
-    <mat-card style="width: 580px; padding: 6px;">
-      <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
-        <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
-        <div style="width: 20%;"></div>
-        <div style="width: 30%;text-align:right;">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
-        </div>
-      </div>
-      <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
-        <!--<div class="form-group">-->
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+<!--<pre> {{ m_group | json}}</pre>-->
+
+<h2 mat-dialog-title>{{pageTitle}}</h2>
+<mat-dialog-content class="mat-typography">
+  <mat-card style="width: 580px; padding: 6px;">
+    <form [formGroup]="_addQuesFrom" (submit)="onSubmit()" novalidate>
+      <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+        <div fxFlex="50">
+          <mat-form-field>
             <mat-select placeholder="Select Category" formControlName="fk_question_category">
               <mat-option *ngFor="let ct of categories" [value]="ct.question_category_id">{{ ct.category_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_category.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+        <div fxFlex="50">
+          <mat-form-field>
+            <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
+              <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
+            </mat-select>
+            <mat-error *ngIf="submitted && f.fk_question_group_id.hasError('required')" class="mat-text-warn">You must Select Group.</mat-error>
+          </mat-form-field>
+        </div>
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div class="example-full-width">
+          <mat-form-field fxFill>
             <textarea matInput placeholder="Question" formControlName="question"></textarea>
             <mat-error *ngIf="submitted && f.question.hasError('required')" class="mat-text-warn">You must Include Question.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div class="example-full-width">
+          <mat-form-field fxFill>
             <textarea matInput placeholder="Description" formControlName="description"></textarea>
             <mat-error *ngIf="submitted && f.description.hasError('required')" class="mat-text-warn">You must Include Description.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div>
+          <mat-form-field>
             <mat-select placeholder="Select Answer Type" formControlName="fk_question_answertype">
               <mat-option *ngFor="let ans of questionsOptions" [value]="ans.question_answer_type_id">{{ ans.answer_type_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_answertype.hasError('required')" class="mat-text-warn">You must Select Answer Type.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <div formArrayName="answers" class="example-full-width">
-            <div *ngFor="let answ of _addQuesFrom.controls.answers['controls']; let i=index">
-              <div [formGroupName]="i">
-                <div fxLayout="row" style="width: 100%">
-                  <div style="width: 80%">
-                    <mat-form-field class="ml-xs example-full-width">
-                      <!--<span>Answer {{i + 1}}</span>-->
-                      <textarea matInput placeholder="Answer" formControlName="answer"></textarea>
-                      <!--<mat-error *ngIf="submitted && answer.hasError('required')" class="mat-text-warn">You must Include Question.</mat-error>-->
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div formArrayName="answers" fxFill>
+          <div *ngFor="let answ of _addQuesFrom.controls.answers['controls']; let i=index">
+            <div [formGroupName]="i">
+              <div fxLayout="row" fxLayoutGap="12px" fxLayoutAlign="start none">
+                <div fxFlex="80">
+                  <mat-form-field class="ml-xs example-full-width">
+                    <textarea matInput placeholder="Answer" formControlName="answer"></textarea>
+                  </mat-form-field>
+                </div>
+                <div fxFlex="30">
+                  <mat-form-field>
+                    <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
+                      <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
+                    </mat-select>
                     </mat-form-field>
-                  </div>
-                  <div style="width:20%">
-                    <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
+                </div>
+                <div fxFlex="20">
+                  <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
                      <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                    </span>
-                  </div>
                 </div>
               </div>
             </div>
-            <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
-            <!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button> -->
-            <!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
           </div>
+          <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
+            class="mr-1 mb-1 hover-icon" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
         </div>
-        <!--Error List Shown Here-->
-        <!--<ul>
-        <li *ngFor="let err of errorMessage">
-          <mat-error>{{err.err}}</mat-error>
-        </li>
-      </ul>-->
-        <div class="row" style="text-align:right;">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
-        </div>
-        <!--</div>-->
-      </form>
-    </mat-card>
-  </div>
\ No newline at end of file
+      </div>
+      <div class="row" style="text-align:right;">
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
+      </div>
+    </form>
+  </mat-card>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>Cancel</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/ng6-seed/src/app/template/questions/add/add.component.ts b/ng6-seed/src/app/template/questions/add/add.component.ts
index 657254038..3a5968b3b 100644
--- a/ng6-seed/src/app/template/questions/add/add.component.ts
+++ b/ng6-seed/src/app/template/questions/add/add.component.ts
@@ -39,6 +39,7 @@ export class AddComponent implements OnInit {
   public submitted = false;
   public categories: any = [];
   public questionsOptions: any = [];
+  public m_group: any = [];
   errorMessage: string;
 
 	/**
@@ -62,6 +63,7 @@ export class AddComponent implements OnInit {
       question: [null, Validators.compose([Validators.required])],
       description: [null, Validators.compose([Validators.required])],
       fk_question_category: [null, Validators.compose([Validators.required])],
+      fk_question_group_id: [null, Validators.compose([Validators.required])],
       fk_question_answertype: [null, Validators.compose([Validators.required])],
       answers: this._formBuilder.array([
         this.initAnswers(),
@@ -70,6 +72,7 @@ export class AddComponent implements OnInit {
     // OnInit Load Category and Question Type Masters
     this.getCategoryListMaster();
     this.getQuestionOptionsMaster();
+    this.getQuestionGroupMaster();
   }
 
   // convenience getter for easy access to form fields
@@ -78,7 +81,8 @@ export class AddComponent implements OnInit {
   // Dynamic Form field creation Functionality : START ===>
   initAnswers() {
     return this._formBuilder.group({
-      answer: ['', Validators.compose([Validators.required])]
+      answer: ['', Validators.compose([Validators.required])],
+      fk_question_group_id: ['']
     });
   }
   addLanguage(e) {
@@ -103,6 +107,19 @@ export class AddComponent implements OnInit {
       }
     )
   }
+
+  getQuestionGroupMaster() {
+    this.masterService.getAllMasterData('QUESTIONGROUP').subscribe(
+      data => {
+        this.m_group = data.records;
+      },
+      error => {
+        this.notifier.notify('warning', 'No Question Group Records Found.!');
+        this.errorMessage = "No Question Group Records Found.";
+      }
+    )
+  }
+
   getQuestionOptionsMaster() {
     this.masterService.getAllMasterData('QUESTIONANSWERTYPE').subscribe(
       data => {
diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.html b/ng6-seed/src/app/template/questions/edit/edit.component.html
index d68696cd4..20fea4322 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.html
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.html
@@ -1,92 +1,108 @@
-<div style="max-height: 480px;">
-    <mat-card style="width: 580px; padding: 6px;">
-      <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
-        <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
-        <div style="width: 20%;"></div>
-        <div style="width: 30%;text-align:right;">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
-        </div>
-      </div>
-  
-      <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
-        <!--<div class="form-group">-->
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+<h2 mat-dialog-title>{{pageTitle}}</h2>
+<mat-dialog-content class="mat-typography">
+  <mat-card style="width: 580px; padding: 6px;">
+    <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
+      <!--<div class="form-group">-->
+      <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+        <div fxFlex="50">
+          <mat-form-field>
             <mat-select placeholder="Select Category" formControlName="fk_question_category">
               <mat-option *ngFor="let ct of categories" [value]="ct.question_category_id">{{ ct.category_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_category.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+        <div fxFlex="50">
+          <mat-form-field>
+            <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
+              <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
+            </mat-select>
+            <mat-error *ngIf="submitted && f.fk_question_group_id.hasError('required')" class="mat-text-warn">You must Select Group.</mat-error>
+          </mat-form-field>
+        </div>
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div class="example-full-width">
+          <mat-form-field fxFill>
             <textarea matInput placeholder="Question" formControlName="question"></textarea>
             <mat-error *ngIf="submitted && f.question.hasError('required')" class="mat-text-warn">You must Include Question.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div class="example-full-width">
+          <mat-form-field fxFill>
             <textarea matInput placeholder="Description" formControlName="description"></textarea>
             <mat-error *ngIf="submitted && f.description.hasError('required')" class="mat-text-warn">You must Include Description.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-form-field class="ml-xs example-full-width">
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div>
+          <mat-form-field>
             <mat-select placeholder="Select Answer Type" formControlName="fk_question_answertype">
               <mat-option *ngFor="let ans of questionsOptions" [value]="ans.question_answer_type_id">{{ ans.answer_type_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_answertype.hasError('required')" class="mat-text-warn">You must Select Answer Type.</mat-error>
           </mat-form-field>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-
-          <!--<mat-checkbox formControlName="isactive" [ngModel]="f.isactive.value === 1 ? true : false"
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <!--<mat-checkbox formControlName="isactive" [ngModel]="f.isactive.value === 1 ? true : false"
             (ngModelChange)="f.isactive.value = $event ? 1 : 0">Active/InActive</mat-checkbox>
       -->
-
-        </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <div formArrayName="answers" class="example-full-width">
-            <div *ngFor="let answ of f_ans.controls; let i=index">
-              <div [formGroupName]="i">
-                <div fxLayout="row" style="width: 100%">
-                  <div style="width: 80%">
-                    <mat-form-field class="ml-xs example-full-width">
-                      <!--<span>Answer {{i + 1}} </span>-->
-                      <textarea matInput placeholder="Answer" formControlName="answer"></textarea>
-                      <!--<mat-error *ngIf="submitted && answer.hasError('required')" class="mat-text-warn">You must Include Question.</mat-error>-->
-                    </mat-form-field>
-                  </div>
-                  <div style="width:20%">
-                    <mat-checkbox *ngIf="answ.get('question_answer_id').value != null" formControlName="isactive" [ngModel]="answ.get('isactive').value == 1 ? true : answ.get('isactive').value == 0 ? false : null"
-                      (ngModelChange)="answ.get('isactive').value = $event ? 1 : 0"></mat-checkbox>
-                    <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
+      </div>
+      <div fxLayout="row" fxLayoutAlign="start none">
+        <div formArrayName="answers" fxFill>
+          <div *ngFor="let answ of f_ans.controls; let i=index">
+            <div [formGroupName]="i">
+              <div fxLayout="row" fxLayoutGap="12px" fxLayoutAlign="start none">
+                <div fxFlex="80">
+                  <mat-form-field class="ml-xs example-full-width">
+                    <!--<span>Answer {{i + 1}} </span>-->
+                    <textarea matInput placeholder="Answer" formControlName="answer"></textarea>
+                    <!--<mat-error *ngIf="submitted && answer.hasError('required')" class="mat-text-warn">You must Include Question.</mat-error>-->
+                  </mat-form-field>
+                </div>
+                <div fxFlex="30">
+                  <mat-form-field>
+                    <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
+                      <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
+                    </mat-select>
+                  </mat-form-field>
+                </div>
+                <div fxFlex="20">
+                  <mat-checkbox *ngIf="answ.get('question_answer_id').value != null" formControlName="isactive" [ngModel]="answ.get('isactive').value == 1 ? true : answ.get('isactive').value == 0 ? false : null"
+                    (ngModelChange)="answ.get('isactive').value = $event ? 1 : 0"></mat-checkbox>
+                  <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
                      <button *ngIf="answ.get('question_answer_id').value == null" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                     </span>
-                  </div>
                 </div>
               </div>
             </div>
-            <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" (click)="addLanguage(null, null, null, $event); false"><mat-icon>add</mat-icon></button>
-            <!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, $event); false">Add More</button> -->
-            <!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
           </div>
+          <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
+            class="mr-1 mb-1 hover-icon" (click)="addLanguage(null, null, null, $event); false"><mat-icon>add</mat-icon></button>
+          <!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, $event); false">Add More</button> -->
+          <!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
         </div>
-     
-        <!--Error List Shown Here-->
-        <!--<ul>
+      </div>
+      <!--Error List Shown Here-->
+      <!--<ul>
         <li *ngFor="let err of errorMessage">
           <mat-error>{{err.err}}</mat-error>
         </li>
       </ul>-->
-        <div class="row" style="text-align:right;">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button"
-            (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button>
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
-        </div>
-        <!--</div>-->
-      </form>
-    </mat-card>
-  </div>
-  
-  <notifier-container></notifier-container>
\ No newline at end of file
+      <div class="row" style="text-align:right;">
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button"
+          (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button>
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
+      </div>
+      <!--</div>-->
+    </form>
+  </mat-card>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>Cancel</button>
+</mat-dialog-actions>
+<notifier-container></notifier-container>
\ No newline at end of file
diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.ts b/ng6-seed/src/app/template/questions/edit/edit.component.ts
index 16268c336..4db0e5967 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.ts
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.ts
@@ -39,6 +39,7 @@ export class EditComponent implements OnInit {
   public _addQuesFrom: FormGroup;
   public submitted = false;
   public categories: any = [];
+  public m_group: any = [];
   public questionsOptions: any = [];
   errorMessage: string;
 
@@ -60,15 +61,16 @@ export class EditComponent implements OnInit {
 
   ngOnInit() {
     this.loadFormData();
-    if (this.data["0"].length > 0) {
-      for (let val of this.data["0"]) {
-        // alert(JSON.stringify(val));
-        let vals = val;
-        this.addLanguage(vals['answer'], vals['question_answer_id'], vals['isactive'], null);
-      }
-    }
+    // if (this.data["0"].length > 0) {
+    //   for (let val of this.data["0"]) {
+    //     // alert(JSON.stringify(val));
+    //     let vals = val;
+    //     this.addLanguage(vals['answer'], vals['question_answer_id'], vals['isactive'], null);
+    //   }
+    // }
     // OnInit Load Category and Question Type Masters
     this.getCategoryListMaster();
+    this.getQuestionGroupMaster();
     this.getQuestionOptionsMaster();
   }
 
@@ -78,7 +80,7 @@ export class EditComponent implements OnInit {
       for (let val of this.data["0"]) {
         // alert(JSON.stringify(val));
         let vals = val;
-        this.addLanguage(vals['answer'], vals['question_answer_id'], vals['isactive'], null);
+        this.addLanguage(vals['answer'], vals['question_answer_id'], vals['fk_question_group_id'], vals['isactive'], null);
       }
     }
   }
@@ -91,6 +93,7 @@ export class EditComponent implements OnInit {
       question: [this.data.question, Validators.compose([Validators.required])],
       description: [this.data.description, Validators.compose([Validators.required])],
       fk_question_category: [this.data.fk_question_category, Validators.compose([Validators.required])],
+      fk_question_group_id: [this.data.fk_question_group_id, Validators.compose([Validators.required])],
       fk_question_answertype: [this.data.fk_question_answertype, Validators.compose([Validators.required])],
       isactive: [this.data.isactive],
       answers: this._formBuilder.array([
@@ -107,17 +110,18 @@ export class EditComponent implements OnInit {
 
 
   // Dynamic Form field creation Functionality : START ===>
-  initAnswers(ans, fk_id, isAct) {
+  initAnswers(ans, fk_id, fk_question_group_id, isAct) {
     isAct = isAct == null ? 1 : isAct;
     return this._formBuilder.group({
       answer: [ans, Validators.compose([Validators.required])],
       question_answer_id: [fk_id],
+      fk_question_group_id: [fk_question_group_id],
       isactive: [isAct]
     });
   }
-  addLanguage(ans, fk_id, isAct, e) {
+  addLanguage(ans, fk_id, fk_question_group_id, isAct, e) {
     const control = <FormArray>this._addQuesFrom.controls['answers'];
-    control.push(this.initAnswers(ans, fk_id, isAct));
+    control.push(this.initAnswers(ans, fk_id, fk_question_group_id, isAct));
   }
   removeLanguage(i: number) {
     const control = <FormArray>this._addQuesFrom.controls['answers'];
@@ -137,6 +141,18 @@ export class EditComponent implements OnInit {
       }
     )
   }
+
+   getQuestionGroupMaster() {
+    this.masterService.getAllMasterData('QUESTIONGROUP').subscribe(
+      data => {
+        this.m_group = data.records;
+      },
+      error => {
+        this.notifier.notify('warning', 'No Question Group Records Found.!');
+        this.errorMessage = "No Question Group Records Found.";
+      }
+    )
+  }
   getQuestionOptionsMaster() {
     this.masterService.getAllMasterData('QUESTIONANSWERTYPE').subscribe(
       data => {