From 8d3657dbfde7bd24247cb2168d1cdfd01224fcf5 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 2 Aug 2018 10:19:08 +0530
Subject: [PATCH 1/3] account staement changes

---
 .../account-statement.component.html               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/views/payment-details/account-statement/account-statement.component.html b/src/app/views/payment-details/account-statement/account-statement.component.html
index 2c1bdd7..bafac4e 100644
--- a/src/app/views/payment-details/account-statement/account-statement.component.html
+++ b/src/app/views/payment-details/account-statement/account-statement.component.html
@@ -16,7 +16,7 @@
     </div>
   <div class="card-body">
     <div class="row">
-                      <div class="col-md-3">
+                      <div class="col-md-2">
                           <div class="input-prepend input-group">
                               <select id="disabledSelect" class="form-control">
                                   <option value="0">From Date</option>
@@ -24,7 +24,7 @@
                               </select>
                           </div>
                       </div>
-                      <div class="col-md-3">
+                      <div class="col-md-2">
                           <div class="input-prepend input-group">
                               <select id="disabledSelect" class="form-control">
                                   <option value="0">To Date</option>
@@ -40,16 +40,16 @@
                               </select>
                           </div>
                       </div>
-<!-- 
-                      <div class="col-md-2">
+
+                      <div class="col-md-3">
                           <div class="input-prepend input-group">
                               <select id="disabledSelect" class="form-control">
                                   <option value="0">Amount</option>
                                  
                               </select>
                           </div>
-                      </div> -->
-                      <div class="col-md-3">
+                      </div>
+                      <div class="col-md-2">
                           <div class="input-prepend input-group">
                               <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Search</button>
                           </div>
@@ -57,7 +57,7 @@
                   </div>
                   <br>
                     <div class="row">
-                      <div class="col-md-3">
+                      <div class="col-md-4">
                           <div class="input-prepend input-group">
                               <span class="input-group-addon">
                                   <i class="fa fa-search"></i>

From 7408df1242349599d7d5f7193c95195d653ae1ca Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 2 Aug 2018 10:20:13 +0530
Subject: [PATCH 2/3] merge changes

---
 .../enrolment/student/student.component.html  | 633 +++++++++---------
 .../enrolment/student/student.component.ts    |   4 +-
 2 files changed, 313 insertions(+), 324 deletions(-)

diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html
index bccbd2c..a7fd4cc 100644
--- a/src/app/views/enrolment/student/student.component.html
+++ b/src/app/views/enrolment/student/student.component.html
@@ -2,412 +2,399 @@
     <a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
 </span>-->
 <div class="col-lg-12" *ngIf="!show">
- 
-            <tabset>
-                <tab>
-                    <ng-template tabHeading>Student List</ng-template>
-                    <div class="card line-height">
-                        <div class="card-header">
-                            <i class="fa fa-align-justify"></i> Student Details List
-                        </div>
-                        <div class="card-body">
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <div class="input-prepend input-group">
-                                        <select id="disabledSelect" class="form-control">
+
+    <tabset>
+        <tab>
+            <ng-template tabHeading>Student List</ng-template>
+            <div class="card line-height">
+                <div class="card-header">
+                    <i class="fa fa-align-justify"></i> Student Details List
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="input-prepend input-group">
+                                <select id="disabledSelect" class="form-control">
                                     <option value="0">Batch</option>
                                     <option value="1">Jan 2017</option>
                                     <option value="2">Jul 2017</option>
                                     <option value="3">Jan 2018</option>
                                 </select>
-                                    </div>
-                                </div>
-                                <div class="col-md-3">
-                                    <div class="input-prepend input-group">
-                                        <select id="disabledSelect" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-3">
+                            <div class="input-prepend input-group">
+                                <select id="disabledSelect" class="form-control">
                                     <option value="0">Please Select University</option>
                                     <option value="1">MMM univ</option>
                                     <option value="2">PPP univ</option>
                                     <option value="3">SSS univ</option>
                                 </select>
-                                    </div>
-                                </div>
-                                <div class="col-md-3">
-                                    <div class="input-prepend input-group">
-                                        <select id="disabledSelect" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-3">
+                            <div class="input-prepend input-group">
+                                <select id="disabledSelect" class="form-control">
                                     <option value="0">Please Select Course</option>
                                     <option value="1">B.com</option>
                                     <option value="2">MCA</option>
                                     <option value="3">M.Sc</option>
                                 </select>
-                                    </div>
-                                </div>
-                                <div class="col-md-2">
-                                    <div class="input-prepend input-group">
-                                        <select id="disabledSelect" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="input-prepend input-group">
+                                <select id="disabledSelect" class="form-control">
                                     <option value="0">Please Sem/Year</option>
                                     <option value="1">2</option>
                                     <option value="2">3</option>
                                     <option value="3">4</option>
                                 </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-md-2">
-                                    <div class="input-prepend input-group">
-                                        <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Filter</button>
-                                    </div>
-                                </div>
                             </div>
-                            <br>
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <div class="input-prepend input-group">
-                                        <span class="input-group-addon">
-                                    <i class="fa fa-search"></i>
-                                    </span>
-                                        <input id="search" class="form-control" type="text" placeholder="search">
-                                    </div>
-                                </div>
-                            </div>
-                            <br>
-                            <table class="table table-bordered table-responsive line-height-table">
-                                <thead>
-                                    <tr>
-                                        <th>Form Id</th>
-                                        <th>Student Name</th>
-                                        <th>Father Name</th>
-                                        <th>Mobile</th>
-                                        <th>Course/University</th>
-                                        <th>Sem/Year</th>
-                                        <th>Batch</th>
-                                        <th>Status</th>
-                                        <th>Action</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr *ngFor="let app of students">
-                                        <td>{{app.formId}}</td>
-                                        <td>{{app.studentName}}</td>
-                                        <td>{{app.fatherName}}</td>
-                                        <td>{{app.mobile}}</td>
-                                        <td>{{app.course}} / {{app.univ}}</td>
-                                        <td>{{app.sem}}</td>
-                                        <td>{{app.batch}}</td>
-                                        <td>
-                                            <span *ngIf="app.status == 1"  style="line-height: 0.1;">Active</span>
-                                            <span *ngIf="app.status == 0"  style="line-height: 0.1;">In-Active</span>
-                                        </td>
-                                        <td>
-                                            <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
-                                            <i class="fa fa-edit fa-file-code-o" tooltip="Answer Booklet"></i> | 
-                                            <i class="fa fa-edit fa-id-card-o" tooltip="Mark Card"></i> 
-                                            <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            <ul class="pagination">
-                                <li class="page-item"><a class="page-link" href="#">Prev</a></li>
-                                <li class="page-item active">
-                                    <a class="page-link" href="#">1</a>
-                                </li>
-                                <li class="page-item"><a class="page-link" href="#">2</a></li>
-                                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                                <li class="page-item"><a class="page-link" href="#">4</a></li>
-                                <li class="page-item"><a class="page-link" href="#">Next</a></li>
-                            </ul>
                         </div>
-                    </div>
-                </tab>
-                <tab>
-                    <ng-template tabHeading>Add Student</ng-template>
-                    <div align="right">
-                        <!--<button *ngIf="!oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">Re-registration</button>
-                        <button *ngIf="oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">New Student</button>-->
+
+                        <div class="col-md-2">
+                            <div class="input-prepend input-group">
+                                <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Filter</button>
+                            </div>
+                        </div>
                     </div>
                     <br>
-                    <div *ngIf="!oldReg">
-                        <div class="card line-height">
-                            <div class="card-header">
-                                Personal Details
+                    <div class="row">
+                        <div class="col-md-4">
+                            <div class="input-prepend input-group">
+                                <span class="input-group-addon">
+                                    <i class="fa fa-search"></i>
+                                    </span>
+                                <input id="search" class="form-control" type="text" placeholder="search">
                             </div>
-                            <div class="card-body">
-                                <div class="container">
-                                    <div class="row">
-                                        <div class="form-group col-md-4">
-                                            <label for="fname">First Name <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="fname" placeholder="Enter First name">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="lname">Last Name <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="lname" placeholder="Enter Last name">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="gender">Gender <span class="danger">*</span></label>
-                                            <!--<input type="text" class="form-control" id="gender" placeholder="Enter Gender">-->
-                                            <div>
-                                            <label class="radio" for="gender">
+                        </div>
+                    </div>
+                    <br>
+                    <table class="table table-bordered table-responsive line-height-table">
+                        <thead>
+                            <tr>
+                                <th>Form Id</th>
+                                <th>Student Name</th>
+                                <th>Father Name</th>
+                                <th>Mobile</th>
+                                <th>Course/University</th>
+                                <th>Sem/Year</th>
+                                <th>Batch</th>
+                                <th>Status</th>
+                                <th>Action</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr *ngFor="let app of students">
+                                <td>{{app.formId}}</td>
+                                <td>{{app.studentName}}</td>
+                                <td>{{app.fatherName}}</td>
+                                <td>{{app.mobile}}</td>
+                                <td>{{app.course}} / {{app.univ}}</td>
+                                <td>{{app.sem}}</td>
+                                <td>{{app.batch}}</td>
+                                <td>
+                                    <span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span>
+                                    <span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span>
+                                </td>
+                                <td>
+                                    <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>                                    |
+                                    <i class="fa fa-edit fa-file-code-o" tooltip="Answer Booklet" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app, 'answerBooklet')"></i>                                    |
+                                    <i class="fa fa-edit fa-id-card-o" tooltip="Mark Card" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app, 'markCard')"></i>
+                                    <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <ul class="pagination">
+                        <li class="page-item"><a class="page-link" href="#">Prev</a></li>
+                        <li class="page-item active">
+                            <a class="page-link" href="#">1</a>
+                        </li>
+                        <li class="page-item"><a class="page-link" href="#">2</a></li>
+                        <li class="page-item"><a class="page-link" href="#">3</a></li>
+                        <li class="page-item"><a class="page-link" href="#">4</a></li>
+                        <li class="page-item"><a class="page-link" href="#">Next</a></li>
+                    </ul>
+                </div>
+            </div>
+        </tab>
+        <tab>
+            <ng-template tabHeading>Add Student</ng-template>
+            <div align="right">
+                <!--<button *ngIf="!oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">Re-registration</button>
+                        <button *ngIf="oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">New Student</button>-->
+            </div>
+            <br>
+            <div *ngIf="!oldReg">
+                <div class="card line-height">
+                    <div class="card-header">
+                        Personal Details
+                    </div>
+                    <div class="card-body">
+                        <div class="container">
+                            <div class="row">
+                                <div class="form-group col-md-4">
+                                    <label for="fname">First Name <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="fname" placeholder="Enter First name">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="lname">Last Name <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="lname" placeholder="Enter Last name">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="gender">Gender <span class="danger">*</span></label>
+                                    <!--<input type="text" class="form-control" id="gender" placeholder="Enter Gender">-->
+                                    <div>
+                                        <label class="radio" for="gender">
                                                         <input type="radio" id="gender-male" name="inline-radios" value="Male"> Male
                                                     </label>
-                                            <label class="radio" for="inline-radio2">
+                                        <label class="radio" for="inline-radio2">
                                                         <input type="radio" id="gender-female" name="inline-radios" value="Female"> Female
                                                     </label>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="form-group col-md-4">
-                                            <label for="pmobile">Primary Mobile Number <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="pmobile" placeholder="Enter Primary Mobile Number">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="smobile">Secondary Mobile Number</label>
-                                            <input type="text" class="form-control" id="smobile" placeholder="Enter Secondary Mobile Number">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="email">Email <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="email" placeholder="Enter Email">
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="form-group col-md-4">
-                                            <label for="fatherName">Father Name <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="fatherName" placeholder="Enter Father Name">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="motherName">Mother Name <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="motherName" placeholder="Enter Mother Name">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="dob">Date Of Birth <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="dob" placeholder="Enter DOB">
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        
-                                        <div class="form-group col-md-4">
-                                            <label for="adhar">Aadhar Number <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="adhar" placeholder="Enter Aadhar Number">
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="qualification">Qualification</label>
-                                            <input type="text" class="form-control" id="qualification" placeholder="Enter Qualification">
-                                        </div>
-                                    </div>
-                                    <!--/.row-->
-                                    <div class="row">
-                                        <div class="form-group col-md-4">
-                                            <label for="premanentAddress">Permanent Address <span class="danger">*</span></label>
-                                            <textarea class="form-control" id="premanentAddress" placeholder="Enter Permanent Address"></textarea>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="currentAddress">Current Address<span class="danger">*</span> </label>
-                                            <textarea class="form-control" id="currentAddress" placeholder="Enter Current Address"></textarea>
-                                            Same as Permanent Address <span><input type="checkbox"></span>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
-                            <!--<div class="card-footer">
-                        </div>-->
-                        </div>
-                        <div class="card line-height">
-                            <div class="card-header">
-                                Course Details
+                            <div class="row">
+                                <div class="form-group col-md-4">
+                                    <label for="pmobile">Primary Mobile Number <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="pmobile" placeholder="Enter Primary Mobile Number">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="smobile">Secondary Mobile Number</label>
+                                    <input type="text" class="form-control" id="smobile" placeholder="Enter Secondary Mobile Number">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="email">Email <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="email" placeholder="Enter Email">
+                                </div>
                             </div>
-                            <div class="card-body">
-                                <div class="container">
-                                    <div class="row">
-                                        <div class=" form-group col-md-4">
-                                            <label for="premanentAddress">Batch <span class="danger">*</span></label>
-                                            <div class="input-prepend input-group">
-                                                <select id="disabledSelect" class="form-control">
+                            <div class="row">
+                                <div class="form-group col-md-4">
+                                    <label for="fatherName">Father Name <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="fatherName" placeholder="Enter Father Name">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="motherName">Mother Name <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="motherName" placeholder="Enter Mother Name">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="dob">Date Of Birth <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="dob" placeholder="Enter DOB">
+                                </div>
+                            </div>
+                            <div class="row">
+
+                                <div class="form-group col-md-4">
+                                    <label for="adhar">Aadhar Number <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="adhar" placeholder="Enter Aadhar Number">
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="qualification">Qualification</label>
+                                    <input type="text" class="form-control" id="qualification" placeholder="Enter Qualification">
+                                </div>
+                            </div>
+                            <!--/.row-->
+                            <div class="row">
+                                <div class="form-group col-md-4">
+                                    <label for="premanentAddress">Permanent Address <span class="danger">*</span></label>
+                                    <textarea class="form-control" id="premanentAddress" placeholder="Enter Permanent Address"></textarea>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="currentAddress">Current Address<span class="danger">*</span> </label>
+                                    <textarea class="form-control" id="currentAddress" placeholder="Enter Current Address"></textarea>                                    Same as Permanent Address <span><input type="checkbox"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<div class="card-footer">
+                        </div>-->
+                </div>
+                <div class="card line-height">
+                    <div class="card-header">
+                        Course Details
+                    </div>
+                    <div class="card-body">
+                        <div class="container">
+                            <div class="row">
+                                <div class=" form-group col-md-4">
+                                    <label for="premanentAddress">Batch <span class="danger">*</span></label>
+                                    <div class="input-prepend input-group">
+                                        <select id="disabledSelect" class="form-control">
                                                 <option value="0">Select Batch</option>
                                                 <option value="1">Jan 2017</option>
                                                 <option value="2">Jul 2017</option>
                                                 <option value="3">Jan 2018</option>
                                             </select>
-                                            </div>
-                                        </div>
-                                        <div class=" form-group  col-md-4">
-                                            <label for="premanentAddress"> University <span class="danger">*</span></label>
-                                            <div class="input-prepend input-group">
-                                                <select id="disabledSelect" class="form-control">
+                                    </div>
+                                </div>
+                                <div class=" form-group  col-md-4">
+                                    <label for="premanentAddress"> University <span class="danger">*</span></label>
+                                    <div class="input-prepend input-group">
+                                        <select id="disabledSelect" class="form-control">
                                                 <option value="0">Select University</option>
                                                 <option value="1">MMM univ</option>
                                                 <option value="2">PPP univ</option>
                                                 <option value="3">SSS univ</option>
                                             </select>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="premanentAddress"> Course <span class="danger">*</span></label>
-                                            <div class="input-prepend input-group">
-                                                <select id="disabledSelect" class="form-control">
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="premanentAddress"> Course <span class="danger">*</span></label>
+                                    <div class="input-prepend input-group">
+                                        <select id="disabledSelect" class="form-control">
                                                 <option value="0">Select Course</option>
                                                 <option value="1">B.com</option>
                                                 <option value="2">MCA</option>
                                                 <option value="3">M.Sc</option>
                                             </select>
-                                            </div>
-                                        </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="form-group col-md-4">
-                                            <label for="premanentAddress"> Sem/Year <span class="danger">*</span></label>
-                                            <div class="input-prepend input-group">
-                                                <select id="disabledSelect" class="form-control">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group col-md-4">
+                                    <label for="premanentAddress"> Sem/Year <span class="danger">*</span></label>
+                                    <div class="input-prepend input-group">
+                                        <select id="disabledSelect" class="form-control">
                                                 <option value="0">Select Sem/Year</option>
                                                 <option value="1">2</option>
                                                 <option value="2">3</option>
                                                 <option value="3">4</option>
                                             </select>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label for="doj">Joining Date <span class="danger">*</span></label>
-                                            <input type="text" class="form-control" id="doj" placeholder="Enter DOJ">
-                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="card-footer" align="right">
-                                <button type="submit" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
-                                <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
+                                <div class="form-group col-md-4">
+                                    <label for="doj">Joining Date <span class="danger">*</span></label>
+                                    <input type="text" class="form-control" id="doj" placeholder="Enter DOJ">
+                                </div>
                             </div>
                         </div>
                     </div>
+                    <div class="card-footer" align="right">
+                        <button type="submit" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
+                        <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
+                    </div>
+                </div>
+            </div>
 
-                </tab>
-                <tab>
-                    <ng-template tabHeading>Re-registertion</ng-template>
-                    <div>
-                        <div class="card line-height">
-                            <div class="card-header">
-                                Re-registration
-                            </div>
-                            <div class="card-body">
-                                <div class="container">
-                                    <div class="row">
-                                        <div class="form-group col-md-3">
-                                            <label>Mobile Number</label>
-                                            <div class="input-prepend input-group">
-                                                <input id="search" class="form-control" type="text" placeholder="Mobile Number">
-                                            </div>
-                                        </div>
-                                        <div class=" form-group col-md-3">
-                                            <label>Email</label>
-                                            <div class="input-prepend input-group">
-                                                <input id="search" class="form-control" type="text" placeholder="Email">
-                                            </div>
-                                        </div>
-                                        <div class=" form-group col-md-3">
-                                            <label>Father Name</label>
-                                            <div class="input-prepend input-group">
-                                                <input id="search" class="form-control" type="text" placeholder="Father Name">
-                                            </div>
-                                        </div>
-                                        <div class="col-md-2">
-                                            <label></label>
-                                            <div class="input-prepend input-group">
-                                                <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Search</button>
-                                            </div>
-                                        </div>
+        </tab>
+        <tab>
+            <ng-template tabHeading>Re-registertion</ng-template>
+            <div>
+                <div class="card line-height">
+                    <div class="card-header">
+                        Re-registration
+                    </div>
+                    <div class="card-body">
+                        <div class="container">
+                            <div class="row">
+                                <div class="form-group col-md-3">
+                                    <label>Mobile Number</label>
+                                    <div class="input-prepend input-group">
+                                        <input id="search" class="form-control" type="text" placeholder="Mobile Number">
                                     </div>
                                 </div>
-                                <div class="container">
-                                    <div align="right">
-                                        <button type="submit" class="btn btn-sm btn-success"> Add New Sem</button>
-                                        <!--<button type="reset" class="btn btn-sm btn-danger"> Reset</button>-->
+                                <div class=" form-group col-md-3">
+                                    <label>Email</label>
+                                    <div class="input-prepend input-group">
+                                        <input id="search" class="form-control" type="text" placeholder="Email">
+                                    </div>
+                                </div>
+                                <div class=" form-group col-md-3">
+                                    <label>Father Name</label>
+                                    <div class="input-prepend input-group">
+                                        <input id="search" class="form-control" type="text" placeholder="Father Name">
+                                    </div>
+                                </div>
+                                <div class="col-md-2">
+                                    <label></label>
+                                    <div class="input-prepend input-group">
+                                        <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Search</button>
                                     </div>
-                                    <table class="table table-bordered table-responsive">
-                                        <thead>
-                                            <tr>
-                                                <th>Form Id</th>
-                                                <th>Batch</th>
-                                                <th>Course</th>
-                                                <th>University</th>
-                                                <th>Sem/Year</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr>
-                                                <td>KES08432</td>
-                                                <td>Jan 2018</td>
-                                                <td>B.Com</td>
-                                                <td>KR Univ</td>
-                                                <td>3</td>
-                                            </tr>
-                                            <tr>
-                                                <td>KES04321</td>
-                                                <td>Jul 2017</td>
-                                                <td>B.Com</td>
-                                                <td>KR Univ</td>
-                                                <td>2</td>
-                                            </tr>
-                                            <tr>
-                                                <td>KES00921</td>
-                                                <td>Jan 2017</td>
-                                                <td>B.Com</td>
-                                                <td>KR Univ</td>
-                                                <td>1</td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
                                 </div>
                             </div>
                         </div>
+                        <div class="container">
+                            <div align="right">
+                                <button type="submit" class="btn btn-sm btn-success"> Add New Sem</button>
+                                <!--<button type="reset" class="btn btn-sm btn-danger"> Reset</button>-->
+                            </div>
+                            <table class="table table-bordered table-responsive">
+                                <thead>
+                                    <tr>
+                                        <th>Form Id</th>
+                                        <th>Batch</th>
+                                        <th>Course</th>
+                                        <th>University</th>
+                                        <th>Sem/Year</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>KES08432</td>
+                                        <td>Jan 2018</td>
+                                        <td>B.Com</td>
+                                        <td>KR Univ</td>
+                                        <td>3</td>
+                                    </tr>
+                                    <tr>
+                                        <td>KES04321</td>
+                                        <td>Jul 2017</td>
+                                        <td>B.Com</td>
+                                        <td>KR Univ</td>
+                                        <td>2</td>
+                                    </tr>
+                                    <tr>
+                                        <td>KES00921</td>
+                                        <td>Jan 2017</td>
+                                        <td>B.Com</td>
+                                        <td>KR Univ</td>
+                                        <td>1</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
                     </div>
-                </tab>
-            </tabset>
+                </div>
+            </div>
+        </tab>
+    </tabset>
 </div>
 
 <div bsModal #myModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document" *ngIf="myModalData">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">{{ myModalData.applicationId }}</h4>
+                <h4 class="modal-title" *ngIf="modelType == 'markCard'"> Mark Card Status</h4>
+                <h4 class="modal-title" *ngIf="modelType == 'answerBooklet'"> Answer Booklet Status</h4>
                 <button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
             </div>
             <div class="modal-body">
                 <div class="container">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <label><b> Student Name : </b> </label> {{myModalData.studentName}}
-                        </div>
-                        <div class="col-md-6">
-                            <label><b>Course Name : </b> </label> {{myModalData.courseName}}
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <label><b> Sem/Year : </b> </label> {{myModalData.sem}}
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-4">
-                            <label for="name"> Status</label>
-                            <select id="disabledSelect" class="form-control">
-                                <option value="0">Select Status</option>
-                                <option value="1">Approved</option>
-                                <option value="2">Rejected</option>
-                                <option value="3">Canceled</option>
-                            </select>
-                        </div>
-                        <div class="col-md-4">
-                            <label for="comment">Comments <span class="danger">*</span></label>
-                            <textarea class="form-control" id="comments" placeholder="Enter Comments"></textarea>
-
-                        </div>
-                    </div>
+                    <table class="table table-bordered table-responsive">
+                        <thead>
+                            <tr>
+                                <th>Status</th>
+                                <th>Comments</th>
+                                <th>Date</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>Send to SC</td>
+                                <td><b>{{ modelType | uppercase }} </b>- Send to Studet Center</td>
+                                <td>4/05/2018</td>
+                            </tr>
+                        </tbody>
+                    </table>
                 </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" (click)="myModal.hide()">Close</button>
-                <button type="button" class="btn btn-primary">Save</button>
+                <!--<button type="button" class="btn btn-primary">Save</button>-->
             </div>
         </div>
         <!-- /.modal-content -->
diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts
index 4885938..286115a 100644
--- a/src/app/views/enrolment/student/student.component.ts
+++ b/src/app/views/enrolment/student/student.component.ts
@@ -10,6 +10,7 @@ export class StudentComponent implements OnInit {
   closed = false;
   public myModal;
   public myModalData;
+  public modelType: string;
   students: any;
   oldReg: boolean = false;
   constructor() { }
@@ -50,8 +51,9 @@ export class StudentComponent implements OnInit {
       }
     ]
   }
-  getModelWindowDetails(emp) {
+  getModelWindowDetails(emp, type) {
     this.myModalData = emp||null;
+    this.modelType = type;
   }
 
   editEmployee(){

From 62280f7d82cb25f266983929d5e237a5cb6fef3b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 2 Aug 2018 10:47:03 +0530
Subject: [PATCH 3/3] merge cganges

---
 src/app/components/app-footer/app-footer.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/app-footer/app-footer.component.html b/src/app/components/app-footer/app-footer.component.html
index a6e7f5d..437e026 100755
--- a/src/app/components/app-footer/app-footer.component.html
+++ b/src/app/components/app-footer/app-footer.component.html
@@ -1,4 +1,4 @@
 <footer class="app-footer">
-  <!-- <a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs. -->
-  <span class="float-right">Powered by <a href="http://apollodec.com">Apollo</a></span>
+  <a href="http://apollodec.com">Apollo Distance Education College</a> &copy; 2018
+    <!-- <span class="float-right">Powered by <a href="http://apollodec.com">Apollo</a></span> -->
 </footer>