From e179fb728cdc9c19d7c6e8de80ccd6dc6a0290a0 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 16 Aug 2018 12:17:31 +0530
Subject: [PATCH 1/4] fees status student view changes function name change
 from open to open StudentView because of name conflict

---
 Apollo/assets/js/controllers/feesStatusCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index c5230ee5..7bee4abf 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2367,7 +2367,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
-    $scope.open = function (studentDetails) {
+    $scope.openStudentView = function (studentDetails) {
 
 
         // get student view details

From ba2aaaadf82d5c751d1b9714d98893ea3f00de8a Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 16 Aug 2018 12:18:31 +0530
Subject: [PATCH 2/4] fees status view function name change form open to
 openStudentView

---
 Apollo/assets/views/status-update/fees_status.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index 44b53fbd..aed584e9 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -127,9 +127,9 @@
             </thead>
             <tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
             <tr>
-                <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.Firstname}}</a></td>
+                <td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.Firstname}}</a></td>
                 <td>{{user.Lastname}}</td>
-                <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
+                <td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.MobileNumber}}</a></td>
                 <td>{{user.UniversityName}}</td>
                 <td>{{user.CourseName}}</td>
               <!--  <td>{{user.SessionName}}</td>-->

From 8c5c85dfb8ae5a9aa56fbf24015fd66dc4e21cca Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 16 Aug 2018 12:19:20 +0530
Subject: [PATCH 3/4] fees status model changes student mobile and university
 mobile conflict

---
 Apollo/api/application/models/Fees_status_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 2857c9cd..97c5984f 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -17,7 +17,7 @@ class Fees_status_model extends CI_Model
     public function getStudentList($search=null)
     {
         if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!=''){ 
-            $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.MobileNumber,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization');
+            $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization');
             $this->db->from(STUDENTS.' as ST');
             $this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID');
             $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID');

From d9f05d8b359377fbab1cb72ecce3657d5688561d Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 16 Aug 2018 16:06:24 +0530
Subject: [PATCH 4/4] update fees changes

---
 .../assets/views/status-update/updateFeesStatus.html   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index c2293878..00f9933d 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -52,7 +52,7 @@
                                     <select class="form-control" name="feesType" tabindex="7" id="feesType"
                                             ng-model="updateModel.feesType"
                                             ng-options="fees.Sem_Year for fees in studentFeesInfo"
-                                            required ng-change="changeTotalFees(updateModel.feesType);">
+                                            required ng-change="changeTotalFees(updateModel.feesType,Form);">
                                        <!-- <option value=""> Select Sem/Year</option>-->
                                     </select>
                                     <span class="error text-small block"
@@ -225,7 +225,7 @@
                                     <select class="form-control" name="feesTypeBill" tabindex="17" id="feesTypeBill"
                                             ng-model="updateModel.feesType"
                                             ng-options="fees.Sem_Year for fees in studentFeesInfo"
-                                            required ng-change="changeTotalFees(updateModel.feesType);">
+                                            required ng-change="changeTotalFees(updateModel.feesType,Form);">
                                         <!-- <option value=""> Select Sem/Year</option>-->
                                     </select>
                                     <span class="error text-small block"
@@ -283,7 +283,7 @@
                                     <input type="text"  placeholder="Enter Fees Amount"
                                            autofocus tabindex="19" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
                                            ng-model="updateModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
-										   <span style="font-size: 11px;color:red;">Total Payable:</span><span style="font-size: 11px;">Rs.{{updateModel.feesType.BalanceAmount}}</span>
+										   <b><span style="font-size: 11px;color:red;">Total Payable:</span><span style="font-size: 11px;color: black;">Rs.{{payableAmtInfo}}</span></b>
                                     <span class="error text-small block"
                                           ng-if="Form.billAmount.$dirty && Form.billAmount.$invalid"
                                           ng-hide="Form.billAmount.$error.maxlength || Form.billAmount.$error.pattern">Bill amount is required</span>
@@ -551,11 +551,9 @@
                     </div>
 
 
-
+</fieldset>
             </div>
-             
 
-            </fieldset>
         </div>
     </div>