From 9c9fab8e8e2e493369f09cbad035b21d3738d9c0 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Thu, 9 Aug 2018 17:10:51 +0530
Subject: [PATCH] student enrolment changes : kdk

---
 .../enrolment/student/student.component.html  | 125 ++++++++++++------
 .../enrolment/student/student.component.ts    |   9 +-
 .../study-center/study-center.component.html  |  12 +-
 3 files changed, 96 insertions(+), 50 deletions(-)

diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html
index c487aac..f9a0241 100644
--- a/src/app/views/enrolment/student/student.component.html
+++ b/src/app/views/enrolment/student/student.component.html
@@ -89,30 +89,32 @@
                             <table class="table table-bordered table-responsive line-height-table">
                                 <thead>
                                     <tr>
+                                        <th>Batch</th>
                                         <th>Form Id</th>
                                         <th>Student Name</th>
                                         <th>Father Name</th>
-                                        <th>Mobile</th>
+                                          <!--<th>Mobile</th>-->
                                         <th>Course/University</th>
                                         <th>Sem/Year</th>
-                                        <th>Batch</th>
                                         <th>Status</th>
+                                        <th>Comments</th>
                                         <th>Action</th>
                                     </tr>
                                 </thead>
                                 <tbody>
                                     <tr *ngFor="let app of students">
+                                        <td>{{app.batch}}</td>
                                         <td>{{app.formId}}</td>
                                         <td>{{app.studentName}}</td>
                                         <td>{{app.fatherName}}</td>
-                                        <td>{{app.mobile}}</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>{{app.comments}}</td>
                                         <td>
                                             <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>
                                             <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
@@ -232,17 +234,6 @@
                             <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">
@@ -265,6 +256,10 @@
                                             </select>
                                             </div>
                                         </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="specialisation">Specialisation<span class="danger"></span></label>
+                                            <input type="text" class="form-control" id="specialisation" placeholder="Enter Specialisation">
+                                        </div>
                                     </div>
                                     <div class="row">
                                         <div class="form-group col-md-4">
@@ -278,10 +273,42 @@
                                             </select>
                                             </div>
                                         </div>
+                                        <div class=" form-group col-md-4">
+                                            <label for="premanentAddress">Session <span class="danger">*</span></label>
+                                            <div class="input-prepend input-group">
+                                                <select id="disabledSelect" class="form-control">
+                                                <option value="0">Select Session</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">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>
+                                    <div class="row">
                                         <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 class="form-group col-md-4">
+                                            <label for="entrlmentNo">Enrolment Number<span class="danger"></span></label>
+                                            <input type="text" class="form-control" id="entrlmentNo" placeholder="Enter Enrolment Number">
+                                        </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="rollNo">Roll Number<span class="danger"></span></label>
+                                            <input type="text" class="form-control" id="rollNo" placeholder="Enter Roll Number">
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -303,22 +330,22 @@
                             <div class="card-body">
                                 <div class="container">
                                     <div class="row">
+                                        <div class=" form-group col-md-3">
+                                            <label>Form ID</label>
+                                            <div class="input-prepend input-group">
+                                                <input id="search" class="form-control" type="text" placeholder="Form ID">
+                                            </div>
+                                        </div>
                                         <div class="form-group col-md-3">
-                                            <label>Mobile Number</label>
+                                            <label>Enrolment Number</label>
                                             <div class="input-prepend input-group">
-                                                <input id="search" class="form-control" type="text" placeholder="Mobile Number">
+                                                <input id="search" class="form-control" type="text" placeholder="Enrolment Number">
                                             </div>
                                         </div>
                                         <div class=" form-group col-md-3">
-                                            <label>Email</label>
+                                            <label>Student Name</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">
+                                                <input id="search" class="form-control" type="text" placeholder="Student Name">
                                             </div>
                                         </div>
                                         <div class="col-md-2">
@@ -331,14 +358,14 @@
                                 </div>
                                 <div class="container">
                                     <div align="right">
-                                        <button type="submit" class="btn btn-sm btn-success"> Add New Sem</button>
+                                        <button type="submit" class="btn btn-sm btn-success"  (click)="myModal.show(); getModelWindowDetails(app)"> 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>Form Id</th>
                                                 <th>Course</th>
                                                 <th>University</th>
                                                 <th>Sem/Year</th>
@@ -346,22 +373,22 @@
                                         </thead>
                                         <tbody>
                                             <tr>
-                                                <td>KES08432</td>
                                                 <td>Jan 2018</td>
+                                                <td>KES08432</td>
                                                 <td>B.Com</td>
                                                 <td>KR Univ</td>
                                                 <td>3</td>
                                             </tr>
                                             <tr>
-                                                <td>KES04321</td>
                                                 <td>Jul 2017</td>
+                                                <td>KES04321</td>
                                                 <td>B.Com</td>
                                                 <td>KR Univ</td>
                                                 <td>2</td>
                                             </tr>
                                             <tr>
-                                                <td>KES00921</td>
                                                 <td>Jan 2017</td>
+                                                <td>KES00921</td>
                                                 <td>B.Com</td>
                                                 <td>KR Univ</td>
                                                 <td>1</td>
@@ -379,10 +406,10 @@
 </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-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">{{ myModalData.applicationId }}</h4>
+                <h4 class="modal-title">Re-registertion</h4>
                 <button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -391,31 +418,43 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-md-6">
-                            <label><b> Student Name : </b> </label> {{myModalData.studentName}}
+                            <label><b> Student Name : </b> </label> XYZ
                         </div>
                         <div class="col-md-6">
-                            <label><b>Course Name : </b> </label> {{myModalData.courseName}}
+                            <label><b>Enrolment Number : </b> </label> UNIV120876
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-md-6">
-                            <label><b> Sem/Year : </b> </label> {{myModalData.sem}}
+                            <label><b> Course : </b> </label> B.Com
+                        </div>
+                        <div class="col-md-6">
+                            <label><b> University : </b> </label> KR Univ
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-md-4">
-                            <label for="name"> Status</label>
+                            <label for="name"> Sem/Year <span class="danger">*</span></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>
+                                <option value="0">Select Sem/Year</option>
+                                <option value="1">4</option>
+                                <option value="2">5</option>
+                                <option value="3">6</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>
-
+                            <label for="name">Session <span class="danger">*</span></label>
+                            <select id="disabledSelect" class="form-control">
+                                <option value="0">Select Session</option>
+                                <option value="1">Jul 2018 - Dec 2018</option>
+                            </select>
+                        </div>
+                        <div class="col-md-4">
+                            <label for="name">Batch <span class="danger">*</span></label>
+                            <select id="disabledSelect" class="form-control">
+                                <option value="0">Select Batch</option>
+                                <option value="1">Dec 2018</option>
+                            </select>
                         </div>
                     </div>
                 </div>
diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts
index 4885938..9a241ad 100644
--- a/src/app/views/enrolment/student/student.component.ts
+++ b/src/app/views/enrolment/student/student.component.ts
@@ -24,7 +24,8 @@ export class StudentComponent implements OnInit {
         univ: 'KR university',
         sem: 2,
         batch: 'Jan 2018',
-        status: '1'
+        status: '1',
+        comments: 'approved by Univ'
       },
       {
         formId: 'KAN00107',
@@ -35,7 +36,8 @@ export class StudentComponent implements OnInit {
         univ: 'KR university',
         sem: 4,
         batch: 'Jan 2018',
-        status: '1'
+        status: '1',
+        comments: 'approved by Univ'
       },
       {
         formId: 'KAN00086',
@@ -46,7 +48,8 @@ export class StudentComponent implements OnInit {
         univ: 'KR university',
         sem: 8,
         batch: 'Jan 2018',
-        status: '0'
+        status: '0',
+        comments: 'rejected by Univ'
       }
     ]
   }
diff --git a/src/app/views/masters/study-center/study-center.component.html b/src/app/views/masters/study-center/study-center.component.html
index a196c76..eb644b7 100644
--- a/src/app/views/masters/study-center/study-center.component.html
+++ b/src/app/views/masters/study-center/study-center.component.html
@@ -77,6 +77,10 @@
                                     <!--<legend>Study Center Details</legend>-->
                                     <div class="container">
                                         <div class="row">
+                                            <div class="form-group col-md-4">
+                                                <label for="scCode"> Study Center Code <span class="danger">*</span></label>
+                                                <input type="text" class="form-control" id="scCode" placeholder="Enter Study Center Code">
+                                            </div>
                                             <div class="form-group col-md-4">
                                                 <label for="name"> Name <span class="danger">*</span></label>
                                                 <input type="text" class="form-control" id="name" placeholder="Enter Name">
@@ -85,12 +89,12 @@
                                                 <label for="pNumber">Phone Number<span class="danger">*</span></label>
                                                 <input type="text" class="form-control" id="pNumber" placeholder="Enter Phone Number">
                                             </div>
+                                        </div>
+                                        <div class="row">
                                             <div class="form-group col-md-4">
                                                 <label for="pNumber">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="city">City<span class="danger">*</span></label>
                                                 <input type="text" class="form-control" id="city" placeholder="Enter City">
@@ -99,12 +103,12 @@
                                                 <label for="state">State<span class="danger">*</span></label>
                                                 <input type="text" class="form-control" id="state" placeholder="Enter State">
                                             </div>
+                                        </div>
+                                        <div class="row">
                                             <div class="form-group col-md-4">
                                                 <label for="pincode">Pin Code<span class="danger">*</span></label>
                                                 <input type="text" class="form-control" id="pincode" placeholder="Enter PinCode">
                                             </div>
-                                        </div>
-                                        <div class="row">
                                             <div class="form-group col-md-4">
                                                 <label for="premanentAddress">Full Contact Address <span class="danger">*</span></label>
                                                 <textarea class="form-control" id="premanentAddress" placeholder="Enter Full Contact Address"></textarea>