diff --git a/Apollo/api/application/controllers/Fees_Status_Controller.php b/Apollo/api/application/controllers/Fees_Status_Controller.php
index 238a8394..3ced61b3 100755
--- a/Apollo/api/application/controllers/Fees_Status_Controller.php
+++ b/Apollo/api/application/controllers/Fees_Status_Controller.php
@@ -212,6 +212,7 @@ class Fees_Status_Controller extends REST_Controller {
         $student['CourseID'] = $this->post('courseID');
         $student['StudentID'] = $this->post('studentID');
         $student['BranchCode'] = $this->post('branchCode');
+        // $student['BatchCode'] = $this->post('batchCode');
         $getStudentFeesDetails = $this->Fees_model->getFeesStructureAssign($student);
         if ($getStudentFeesDetails)
         {
diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php
index 62111e93..7e5be3e4 100755
--- a/Apollo/api/application/controllers/StatusUpdation_Controller.php
+++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php
@@ -130,11 +130,15 @@ class StatusUpdation_Controller extends REST_Controller {
         $reqData = $this->post('data');
         $reqDetails = $this->post('requestDetails');
         $time = date('Y-m-d H:i:s');
+        // $scope.text.replace(/\n\r?/g, '<br />');
         $dateTime = $time;
         $count = count($reqData);
         for ($i = 0;$i < $count;$i++) {
             $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AnsDate' => $reqData[$i]['SDate'], 'Coursedetail' => $reqData[$i]['Coursedetail'], 'Comments' => $reqData[$i]['Comments'],'CourierDetails' => $reqData[$i]['CourierDetails'], 'Sem' => $reqData[$i]['Sem'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime,);
         }
+
+        // print_r($data);
+        // die();
         $updateAnswerBookletStat = $this->statusupdation_model->update_answerbooklet($data, $reqDetails); // Check if the employee exist
         if ($updateAnswerBookletStat) {
             $updateAnswerBookletStat['status'] = REST_Controller::HTTP_OK;
@@ -193,13 +197,17 @@ class StatusUpdation_Controller extends REST_Controller {
 
     // update application status
     public function updateApplicationStatus_post() {
+        // echo "A Look Here";
+        
         $reqData = $this->post('data');
         $reqDetails = $this->post('requestDetails');
+        // print_r($reqData);
+        // die();
         $time = date('Y-m-d H:i:s');
         $dateTime = $time;
         $count = count($reqData);
         for ($i = 0;$i < $count;$i++) {
-            $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AppDate' => $reqData[$i]['SDate'], 'Comments' => $reqData[$i]['Comments'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime, 'CertificationType' => $reqData[$i]['CertificateType'], 'CertificationNo' => $reqData[$i]['CertificateNumber'],);
+            $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AppDate' => $reqData[$i]['SDate'], 'Comments' => $reqData[$i]['Comments'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime, 'CertificationType' => $reqData[$i]['CertificateType'], 'CertificationNo' => $reqData[$i]['CertificateNumber'],'CourierDetails'=>$reqData[$i]['CourierDetails']);
         }
         $updateApplicationStatus = $this->statusupdation_model->update_applicationStatus($data, $reqDetails); // Check if the employee exist
         if ($updateApplicationStatus) {
diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php
index c431c3ad..6f7e3641 100755
--- a/Apollo/api/application/controllers/Student_Controller.php
+++ b/Apollo/api/application/controllers/Student_Controller.php
@@ -127,6 +127,7 @@ class Student_Controller extends REST_Controller {
 	$userType =$this->post('userType');
 	$createdBy =$this->post('createdBy');
         $trackingDetails = $this->student_model->get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch,$userType,$createdBy); // Check if the employee exist
+        
         if ($trackingDetails) {
           
 			$trackingDetailsData['trackingdata']=$trackingDetails;
@@ -136,7 +137,7 @@ class Student_Controller extends REST_Controller {
             $this->response($trackingDetailsData, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
             
         } else {
-           
+            // $this->response($trackingDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
 			
             
         }	
diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 3be240f5..565e202e 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -18,13 +18,18 @@ class Fees_status_model extends CI_Model
     {
      
         if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!='' OR $search['BatchCode']!=''){ 
-            $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,BA.BatchCode,BA.BatchName,STC.IsActive as CourseActive, STC.Status as CourseStatus,ST.DeactiveComments,ST.IsActive');
+            $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,STC.IsActive as CourseActive, STC.Status as CourseStatus,ST.DeactiveComments,ST.IsActive');
+            if($search['BatchCode']!=''){
+                $this->db->select('BA.BatchCode,BA.BatchName');
+            }
             $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');
            // $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = STC.SessionID');
             $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
+            if($search['BatchCode']!=''){
             $this->db->join(BATCH.' as BA', 'BA.UniversityID = US.UniversityID AND BA.BranchCode = STC.BranchID');
+            }
             $this->db->where('ST.IsActive','1');
             $this->db->where('STC.IsActive','1');
             if($search['requestedBranch']!='All'){
@@ -812,6 +817,9 @@ class Fees_status_model extends CI_Model
                 $this->db->where('SFS.StudentID',$student['StudentID']);
                 $this->db->where('SFS.CourseID',$student['CourseID']);
                 $this->db->where('SFS.FeesType',$row->ID);
+                // if($student['BatchCode'] != ''){
+                //     $this->db->where('SFS.BatchCode',$student['BatchCode']);
+                // }
                 $existFeesDetails = $this->db->get();
 
                // print_r($this->db->last_query());die();
diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 64d1a80e..8a9be978 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -318,7 +318,8 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
         // (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 // left join 
        // (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
-       $sql1 ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') AS initialPaid,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,cm.uid AS univID,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber,sfs.batch as Batch,IFNULL(sfs.batchname, '-') AS Batch_Name,scd.coursestatus as Course_Status
+       $sql1 ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') AS initialPaid,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,cm.uid AS univID,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber,sfs.batch as Batch,IFNULL(sfs.batchname, '-') AS Batch_Name,
+       scd.coursestatus as Course_Status
 FROM 
 (  
 SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,STR_TO_DATE(AppDate, '%d-%m-%Y' 
diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php
index 0ae90464..f416f1c7 100755
--- a/Apollo/api/application/models/StatusUpdation_model.php
+++ b/Apollo/api/application/models/StatusUpdation_model.php
@@ -104,38 +104,39 @@ class StatusUpdation_model extends CI_Model {
     
     // update certificate stauts
     public function update_certificateStatus($arr) {
-		
-	
+        // echo "hai hello check me again";
+        // print_r($arr);
+        
         $this->db->insert_batch(CERTIFICATION_STATUS, $arr);
         if ($this->db->affected_rows() >= 1) {
 			//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
 			
 			$answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']);
-			//print_r($answerBookletStatus);
+			// print_r($answerBookletStatus);
 
-// echo $answerBookletStatus['ListName'];
-//             die();
-			//echo "COURSE ====$arr[0]['CourseID']";
-		   // echo "PARENT -- $answerBookletStatus";
+            // echo $answerBookletStatus['ListName'];
+            // die();
+			// echo "COURSE ====$arr[0]['CourseID']";
+		    // echo "PARENT -- $answerBookletStatus";
 
-$getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
+            $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
 
-// $latestappstatus='';
-//  if(!empty($getlastansbookstatus))
-//  {
+            // $latestappstatus='';
+            //  if(!empty($getlastansbookstatus))
+            //  {
 
-//     foreach($getlastansbookstatus as $get)
-//     {
-//      $latestappstatus= $get->ListCode;
-//     }
-//  }
+            //     foreach($getlastansbookstatus as $get)
+            //     {
+            //      $latestappstatus= $get->ListCode;
+            //     }
+            //  }
 
-$upperresult=strtoupper($getlastansbookstatus);
+            $upperresult=strtoupper($getlastansbookstatus);
 
-$WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
+            $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
 
- //  echo $arr[0]['ListCode'];
- // die();
+            //  echo $arr[0]['ListCode'];
+            // die();
 			if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
 			{
 				//echo "SEND SMS";
@@ -147,11 +148,12 @@ $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
 					$CmntToMsg =  $arr[0]['Comments'];
 					$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
 
-$issuecheck = strtoupper($statuToMsg);
-$withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
-//echo $withoutspaceissue;die();
+                    $issuecheck = strtoupper($statuToMsg);
+                    $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
+                    //echo $withoutspaceissue;die();
 					// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
-					if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
+					// if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
+                       if($WithoutspaceStatus == 'SENTTOUNIVERSITY'){
 
 
                        // echo 'if';die();
@@ -211,6 +213,8 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
         $this->db->where('SFS.BranchCode', $branchId);
         $cerfDetails = $this->db->get();
         $certificateDetails = $cerfDetails->result();
+        // print_r($this->db->last_query());
+        // die();
         if (count($certificateDetails) > 0) {
             $results['certificateStatus'] = true;
             $results['certificate_details'] = $certificateDetails;
@@ -438,6 +442,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $CmntToMsg = $arr[0]['Comments'];
                 $studentName = $this->getStudentName($arr[0]['StudentID']);
                 $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
+
                 if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
                     $cerNamtToMsg = 'Study Material';
                     $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@@ -511,6 +516,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course == '' && $Batch != '') {
+                // echo 'i am in 3';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
@@ -524,6 +530,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course != '' && $Batch != '') {
+                // echo 'i am in 4';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
@@ -539,6 +546,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
             }
         } else {
             if ($University != '' && $Course == '' && $Batch == '') {
+                // echo 'i am in 5.1';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID 
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND  SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON 
@@ -552,6 +560,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course != '' && $Batch == '') {
+                // echo 'i am in 5.2';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID  AND  SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON 
@@ -565,6 +574,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course == '' && $Batch != '') {
+                // echo 'i am in 5.3';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID  AND  SC.BranchID = U.BranchCode
@@ -579,6 +589,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course != '' && $Batch != '') {
+                // echo 'i am in 5.4';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID  AND  SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON 
diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
index c730f821..790768e8 100755
--- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
+++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
@@ -381,6 +381,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
                 var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
                     if (item.Selected === true) {
                         let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.BranchCode);
+                        getStudentID.courierDetails.replace('/\n\r?/g', '<br />');
                         studentForUpdate.push(getStudentID);
                         return true;
                     }
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index df6c4df3..7e526f66 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -248,6 +248,7 @@ console.log($scope.paymentOptions);
         $scope.BatchDate ='';
 
         $scope.editId=-1;
+        // var Batch = p.BatchCode ? p.BatchCode : '';
         $scope.getStudentSetFees(p.ID,p.CourseID,p.StudentID);
         $scope.viewId=p.ID;
   
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index 2eaa6fd7..1218493a 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -3887,7 +3887,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
     $scope.updateComments = function (form,details,loading) {
 var stud = details.StudentID;
-var cmts = details.Comment;
+var cmts = details.Comments;
 console.log('stud',stud,'cmts',cmts);
             var update = {
                 method: 'POST',
@@ -3898,10 +3898,12 @@ console.log('stud',stud,'cmts',cmts);
                 data: {studentID: stud,comments: cmts}
             };
             $http(update).then(function (response) {
-                console.log(response);
+                // console.log(response);
                 if (response.data.status==200 && response.data.studCommentUpdateStatus) {
                     // $scope.ldloading2[loading.replace('-', '_')] = false;
                     swal("",response.data.message, "success");
+                    // $scope.getStudentList();
+                    
                 } else {
                     // $scope.ldloading[loading.replace('-', '_')] = false;
                     swal("Failed!", response.data.message, "error");
diff --git a/Apollo/assets/views/hallticket/batchshedule.html b/Apollo/assets/views/hallticket/batchshedule.html
index e79810ab..f5319896 100644
--- a/Apollo/assets/views/hallticket/batchshedule.html
+++ b/Apollo/assets/views/hallticket/batchshedule.html
@@ -159,7 +159,7 @@
 						
 						<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" 
                         ng-change="check(selectedCourseNameC.list);">
-						
+						  
                                         <ui-select-match placeholder="Select Courses" >
                                             {{$item.CourseName}} 
                                         </ui-select-match>
diff --git a/Apollo/assets/views/stafflead.html b/Apollo/assets/views/stafflead.html
index e5b316e9..a755969d 100644
--- a/Apollo/assets/views/stafflead.html
+++ b/Apollo/assets/views/stafflead.html
@@ -84,7 +84,7 @@
                         
                     </tr>
                 </thead> 
-                <tbody dir-paginate="p in SatffCountDetails|filter:search:strict|itemsPerPage:10">
+                <tbody dir-paginate="p in SatffCountDetails|filter:search:strict">
                     
                     <tr >
                         <td>{{p.SL_NO}}</td>
@@ -105,8 +105,8 @@
 
                 
             </table>
-<!-- <dir-pagination-controls direction-links="true" boundary-links="true">
-</dir-pagination-controls> -->
+<dir-pagination-controls direction-links="true" boundary-links="true">
+</dir-pagination-controls>
 </div>
 
 
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html
index 4ea97d12..8abc5963 100644
--- a/Apollo/assets/views/status-update/application_status.html
+++ b/Apollo/assets/views/status-update/application_status.html
@@ -245,7 +245,7 @@
                                                          <table class="table table-strip" ng-init="editStatus = false; stufmtype.ID = -1">
                                                              <thead>
                                                                  <tr>
-                                                                    <!-- <th>id</th> -->
+                                                                    <th>id</th>
                                                                     <th>Batch</th>
                                                                     <th>Sem/Year</th>
                                                                     <th>From Type</th>
@@ -254,7 +254,7 @@
                                                              </thead>
                                                              <tbody ng-repeat="stufmtype in studentFormTypeList">
                                                                  <tr>
-                                                                     <!-- <td>{{stufmtype.ID}}</td> -->
+                                                                     <td>{{stufmtype.ID}}</td>
                                                                      <td>{{stufmtype.BatchName}}</td>
                                                                      <td>{{stufmtype.Sem_Year}}</td>
                                                                      <td>{{stufmtype.RegistrationType}}</td>
@@ -444,7 +444,7 @@
                                                          <table class="table table-strip" ng-init="editStatus = false; stufmtype.ID = -1">
                                                              <thead>
                                                                  <tr>
-                                                                    <th>id</th>
+                                                                    <!-- <th>id</th> -->
                                                                     <th>Batch</th>
                                                                     <th>Sem/Year</th>
                                                                     <th>From Type</th>
@@ -453,8 +453,8 @@
                                                              </thead>
                                                              <tbody ng-repeat="stufmtype in studentFormTypeList">
                                                                  <tr>
-                                                                     <td>{{stufmtype.ID}}</td>
-                                                                     <td>{{stufmtype.BatchCode}}</td>
+                                                                     <!-- <td>{{stufmtype.ID}}</td> -->
+                                                                     <td>{{stufmtype.BatchName}}</td>
                                                                      <td>{{stufmtype.Sem_Year}}</td>
                                                                      <td>{{stufmtype.RegistrationType}}</td>
                                                                      <td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>