From 1dea3c72bb5453561762422a6ff963d30c686a34 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 10 Aug 2018 12:47:22 +0530
Subject: [PATCH 1/2] fees status and other registration changes in student
 enrolment

---
 .../enrolment/student/student.component.html  | 209 +++++++++++++++++-
 .../enrolment/student/student.component.ts    |  51 ++++-
 2 files changed, 254 insertions(+), 6 deletions(-)

diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html
index f9a0241..c160a22 100644
--- a/src/app/views/enrolment/student/student.component.html
+++ b/src/app/views/enrolment/student/student.component.html
@@ -116,7 +116,9 @@
                                         </td>
                                         <td>{{app.comments}}</td>
                                         <td>
-                                            <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>
+                                            <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>  | 
+                                            <i class="fa fa-money line-height-table" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i>
+
                                             <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
                                         </td>
                                     </tr>
@@ -321,7 +323,7 @@
 
                 </tab>
                 <tab>
-                    <ng-template tabHeading>Re-registertion</ng-template>
+                    <ng-template tabHeading>Re-registration</ng-template>
                     <div>
                         <div class="card line-height">
                             <div class="card-header">
@@ -400,6 +402,86 @@
                         </div>
                     </div>
                 </tab>
+                <tab>
+                        <ng-template tabHeading>Other Registration</ng-template>
+                        <div>
+                            <div class="card line-height">
+                                <div class="card-header">
+                                    Other Registration
+                                </div>
+                                <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="otherSearch" class="form-control" type="text" placeholder="Form ID">
+                                                </div>
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                                <label>Enrolment Number</label>
+                                                <div class="input-prepend input-group">
+                                                    <input id="otherEnrolment" class="form-control" type="text" placeholder="Enrolment Number">
+                                                </div>
+                                            </div>
+                                            <div class=" form-group col-md-3">
+                                                <label>Student Name</label>
+                                                <div class="input-prepend input-group">
+                                                    <input id="otherStudent" class="form-control" type="text" placeholder="Student 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>
+                                        </div>
+                                    </div>
+                                    <div class="container">
+                                        <div align="right">
+                                            <button type="submit" class="btn btn-sm btn-success"  (click)="otherRegModal.show(); getOtherRegModelWindowDetails(app)"> Add Other Registration</button>
+                                            <!--<button type="reset" class="btn btn-sm btn-danger"> Reset</button>-->
+                                        </div>
+                                        <table class="table table-bordered table-responsive">
+                                            <thead>
+                                                <tr>
+                                                    <th>Batch</th>
+                                                    <th>Form Id</th>
+                                                    <th>Course</th>
+                                                    <th>University</th>
+                                                    <th>Sem/Year</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <tr>
+                                                    <td>Jan 2018</td>
+                                                    <td>KES08432</td>
+                                                    <td>B.Com</td>
+                                                    <td>KR Univ</td>
+                                                    <td>3</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>Jul 2017</td>
+                                                    <td>KES04321</td>
+                                                    <td>B.Com</td>
+                                                    <td>KR Univ</td>
+                                                    <td>2</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>Jan 2017</td>
+                                                    <td>KES00921</td>
+                                                    <td>B.Com</td>
+                                                    <td>KR Univ</td>
+                                                    <td>1</td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </tab>
             </tabset>
         </tab>
     </tabset>
@@ -468,4 +550,125 @@
     </div>
     <!-- /.modal-dialog -->
 </div>
-<!-- /.modal -->
\ No newline at end of file
+<!-- /.modal -->
+
+<!-- start student fees modal-->
+
+<div bsModal #feesModal="bs-modal" class="modal fade" tabindex="-2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Fees Details</h4>
+                <button type="button" class="close" (click)="feesModal.hide()" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="form-group col-sm-4">
+                          <label for="feesName">Fees Name <span class="danger">*</span></label>
+                          <select class="form-control" id="semyear">
+                            <option>Late Fees</option>
+                            <option>Other Fees</option>
+                          </select>
+                        </div>
+                        <div class="form-group col-sm-4">
+                              <label for="feesAmount">Fees Amount <span class="danger">*</span></label>
+                              <input type="text" class="form-control" value="15000" id="feesAmount" placeholder="Enter fees amount">            
+                            </div>
+                           
+                            <div class="form-group col-sm-4" style="margin-top: 28px;">
+                                  <button type="button" class="btn btn-sm btn-primary"><i class="fa fa-plus-circle "></i> Add</button>
+                              </div>
+                </div><!--/.row-->
+                <div class="row">
+                        <div class="col-md-10">
+                                <table class="table table-bordered table-responive table-hover">
+                                  <thead>
+                                    <tr>
+                                      <th>Fees Name</th>
+                                      <th>Fees Amount</th>
+                                    </tr>
+                                  </thead>
+                                  <tbody>
+                                    <tr *ngFor="let list of feesModalData">
+                                      <td><span>{{list.feesName}}</span></td>
+                                      <td>
+                                        <span>{{list.feesAmount}}</span>
+                                      </td>
+            
+                                      
+                                    </tr>
+                               
+                                  </tbody>
+                                </table>
+                              </div>
+                              <!--/.col-->
+                  </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" (click)="feesModal.hide()">Close</button>
+                <button type="button" class="btn btn-primary">Save</button>
+            </div>
+        </div>
+        <!-- /.fees modal-content -->
+    </div>
+    <!-- /. fees modal-dialog -->
+</div>
+<!-- /.fees modal -->
+
+<!-- start other registration modal -->
+<div bsModal #otherRegModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">Other Registration</h4>
+                    <button type="button" class="close" (click)="otherRegModal.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-3">
+                                    <label><b> Student Name</b> </label>
+                                    <p>XYZ</p>
+                            </div>
+                            <div class="col-md-3">
+                                    <label><b> Enrolment Number</b> </label>
+                                <p>UNIV120876</p>
+
+                                </div>
+                                <div class="col-md-3">
+                                        <label><b> Course</b> </label>
+                                        <p>B.Com</p>
+                                    </div>
+                                    <div class="col-md-3">
+                                            <label><b> University</b> </label>
+                                            <p>KR Univ</p>
+                                        </div>
+                                        <div class="col-md-4">
+                                                <label for="name"><b> Registration Type <span class="danger">*</span></b> </label>
+                                                <select id="disabledSelect" class="form-control">
+                                                        <option value="0">Select</option>
+                                                        <option value="1">PC</option>
+                                                        <option value="2">TC</option>
+                                                        <option value="3">DC</option>
+                                                        <option value="3">Other</option>
+                                                    </select>
+                                            </div>
+                        </div>
+ 
+          
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" (click)="otherRegModal.hide()">Close</button>
+                    <button type="button" class="btn btn-primary">Save</button>
+                </div>
+            </div>
+            <!-- /.modal-content -->
+        </div>
+        <!-- /.modal-dialog -->
+    </div>
+    <!-- /.modal -->
\ No newline at end of file
diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts
index 9a241ad..d870705 100644
--- a/src/app/views/enrolment/student/student.component.ts
+++ b/src/app/views/enrolment/student/student.component.ts
@@ -12,6 +12,8 @@ export class StudentComponent implements OnInit {
   public myModalData;
   students: any;
   oldReg: boolean = false;
+  public feesModal;
+  public feesModalData;
   constructor() { }
   ngOnInit(){
     this.students = [
@@ -25,7 +27,20 @@ export class StudentComponent implements OnInit {
         sem: 2,
         batch: 'Jan 2018',
         status: '1',
-        comments: 'approved by Univ'
+        comments: 'approved by Univ',
+        feesDetails:[
+        {
+          feesName:"Tution Fees",
+          feesAmount:25000,
+          feesType:"Per Sem",
+          status:"Pending"
+      },
+      {
+        feesName:"Exam Fees",
+        feesAmount:800,
+        feesType:"Per Sem",
+    },
+      ],
       },
       {
         formId: 'KAN00107',
@@ -37,7 +52,20 @@ export class StudentComponent implements OnInit {
         sem: 4,
         batch: 'Jan 2018',
         status: '1',
-        comments: 'approved by Univ'
+        comments: 'approved by Univ',
+        feesDetails:[
+        {
+          feesName:"Tution Fees",
+          feesAmount:25000,
+          feesType:"Per Sem",
+          status:"Pending"
+      },
+      {
+        feesName:"Exam Fees",
+        feesAmount:800,
+        feesType:"Per Sem",
+    },
+      ],
       },
       {
         formId: 'KAN00086',
@@ -49,7 +77,19 @@ export class StudentComponent implements OnInit {
         sem: 8,
         batch: 'Jan 2018',
         status: '0',
-        comments: 'rejected by Univ'
+        comments: 'rejected by Univ',
+        feesDetails:[
+        {
+          feesName:"Tution Fees",
+          feesAmount:25000,
+          feesType:"Per Sem",
+      },
+      {
+        feesName:"Exam Fees",
+        feesAmount:800,
+        feesType:"Per Sem",
+    },
+      ],
       }
     ]
   }
@@ -60,4 +100,9 @@ export class StudentComponent implements OnInit {
   editEmployee(){
      this.show = !this.show;
   }
+  // open student fees modal 
+  getFeesModelWindowDetails(details) {
+    console.log(details)
+    this.feesModalData = details.feesDetails||null;
+  }
 }

From 6fe5e4ed889f2090c85390388f2a8720c3d83a7c Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 10 Aug 2018 12:48:22 +0530
Subject: [PATCH 2/2] merge fees change in student enrolment

---
 .../receivedmaterial/receivedmaterial.component.html   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html
index a931e48..3a86336 100644
--- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html
+++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html
@@ -72,7 +72,7 @@
             <th>Course Name</th>
             <th>Sem/Year</th>
             <th>Received Quantity</th>
-            <th>Balance Quantity</th>
+            <th>Received From</th>
 			<th>Received Date</th>
           </tr>
         </thead>
@@ -82,7 +82,7 @@
             <td>MCA</td>
             <td>1st Sem</td>
 			<td>10</td>
-            <td>0</td>
+           <td>vendor</td>
 			<td>10/10/2018</td>
           </tr>
           <tr>
@@ -90,7 +90,7 @@
             <td>MBA</td>
             <td>2nd Sem</td>
 			<td>15</td>
-            <td>2</td>
+            <td>university</td>
 			<td>15/10/2018</td>
           </tr>
           <tr>
@@ -98,7 +98,7 @@
             <td>BE</td>
             <td>3rd Sem</td>
 			<td>20</td>
-            <td>0</td>
+           <td>vendor</td>
 			<td>10/11/2018</td>
           </tr>
           <tr>
@@ -106,7 +106,7 @@
             <td>DE</td>
             <td>4th sem</td>
 			<td>34</td>
-            <td>10</td>
+           <td>vendor</td>
 			<td>12/11/2018</td>
           </tr>