From 2b7ec182c502cadafd5fd4e09951c7a5f4e75ce2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 11 Jun 2018 12:56:03 +0530
Subject: [PATCH 1/3] student fees status last name changes

---
 .../views/status-update/fees_status.html      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index afda8dd2..be694c05 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -103,10 +103,21 @@
         <table class="table table-hover" ng-controller="studentModalDemoCtrl">
             <thead>
             <tr>
-                <th>Student Name</th>
-                <th>Mobile Number</th>
-                <th>University</th>
-                <th>Course</th>
+                <th ng-click="sort('Firstname')">First Name
+                    <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                </th>
+                <th ng-click="sort('Lastname')">Last Name
+                    <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                </th>
+                <th ng-click="sort('MobileNumber')">Mobile Number
+                    <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                </th>
+                <th ng-click="sort('UniversityName')">University
+                    <span class="glyphicon sort-icon" ng-show="sortKey=='UniversityName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                </th>
+                <th ng-click="sort('CourseName')">Course
+                    <span class="glyphicon sort-icon" ng-show="sortKey=='CourseName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                </th>
               <!--  <th>Session</th>-->
                 <th>Action</th>
                 <th></th>
@@ -116,6 +127,7 @@
             <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>{{user.Lastname}}</td>
                 <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
                 <td>{{user.UniversityName}}</td>
                 <td>{{user.CourseName}}</td>

From e71cd7d3480f503cfd579f6c638ee9cbbe8a8a62 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 11 Jun 2018 12:56:18 +0530
Subject: [PATCH 2/3] student fees status last name changes

---
 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 edf2493a..5fbfe46b 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.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName');
+            $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');
             $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 b654ffde55d2c12fb066310434f355745686981b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 11 Jun 2018 13:04:48 +0530
Subject: [PATCH 3/3] student fees status changes

---
 .../views/status-update/fees_status.html      | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index be694c05..3a0e3bf9 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -158,44 +158,6 @@
 
     </div>
 
-
-
-    <!--<div class="row">
-        <fieldset>
-            <div class="table-responsive">
-            <table ng-table="tableParams" class="table table-hover">
-                <tbody ng-repeat="user in studentInfo">
-                <tr>
-                    <td data-title="'Student Name'"> {{user.Firstname}} </td>
-                    <td data-title="'Mobile Number'"> {{user.MobileNumber}} </td>
-                    <td data-title="'University'">{{user.UniversityName}}</td>
-                    <td data-title="'Course'">{{user.CourseName}}</td>
-                    <td data-title="'Batch'">{{user.BatchName}}</td>
-                    <td data-title="'Action'">
-                        <input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click Update Fees" id="editRow{{user.ID}}" value="Update Fees" ng-click="updateFees(user)">
-
-                    </td>
-                </tr>
-                <tr ng-show="editId === user.ID" ng-if="editId === user.ID">
-                    <td colspan="12" ng-include
-                        src="'assets/views/status-update/updateFeesStatus.html'"></td>
-                </tr>
-                </tbody>
-            </table>
-            </div>
-
-
-
-
-
-
-
-
-
-        </fieldset>
-
-    </div>-->
-
 </div>
 <!-- end: LIST GROUP -->