diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 5560b6e5..38b27c1d 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -1389,7 +1389,7 @@ class Fees_status_model extends CI_Model
                 $this->db->select('ListCode');
                 $this->db->from('T_PickListDetails');
                 // $this->db->where('ListName','EXPECTED'); 
-                $this->db->where('ListName','NOT APPLICABLE');
+                $this->db->where('ListName','BLANK');
                 $this->db->where('IsActive',1); 
                 $this->db->where('BranchCode',$details['BranchCode']);
 
@@ -1517,7 +1517,7 @@ class Fees_status_model extends CI_Model
         $this->db->select('ListCode');
         $this->db->from('T_PickListDetails');
         // $this->db->where('ListName','EXPECTED');
-        $this->db->where('ListName','NOT APPLICABLE');
+        $this->db->where('ListName','BLANK');
         $this->db->where('IsActive',1);  
         $this->db->where('BranchCode',$details['BranchCode']);
 
@@ -2030,7 +2030,7 @@ class Fees_status_model extends CI_Model
             // Status 
             // $this->db->where('ListName','Fees update Status');
             // $this->db->where('ListName','EXPECTED');
-            $this->db->where('ListName','NOT APPLICABLE');
+            $this->db->where('ListName','BLANK');
         }
 
         $this->db->where('BranchCode',$feesDetails['UpdatedBy']);
diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 60ac2b3e..b35e1e42 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -273,8 +273,14 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
           
           }
           if ($st != ''){
-            if($st=="all"){ $sql.=""; }
-            else{ $sql.="and list.lcode = '".$st."'"; }
+            if($st=="all"){ $sql.="";}
+            else{ 
+                $getStatusName =$this->db->query("Select ListName from T_PickListDetails where ListCode = '".$st."' and BranchCode = '".$br."' and IsActive ='1'")->row();
+                if($getStatusName->ListName == "BLANK"){
+                    $sql.="and list.lcode IS null OR list.status = 'BLANK'"; 
+                }else{
+                    $sql.="and list.lcode = '".$st."'"; }
+                }
           }
           if ($from != ''){
             $fromd= date("Y-m-d",strtotime($from));
diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php
index 4e184d17..34f4fb87 100755
--- a/Apollo/api/application/models/Studentview_model.php
+++ b/Apollo/api/application/models/Studentview_model.php
@@ -507,6 +507,8 @@ class Studentview_model extends CI_Model
         $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = SMS.ListCode');
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('SMS.StudentID', $studentID);
+        $this->db->where('PLD.ListName !=','BLANK');
+        $this->db->where('SMS.ListCode !=','');
         // $this->db->group_by('SMS.ID');
         $this->db->order_by('SMS.ID', 'DESC');
         $getMaterialDetails = $this->db->get();
@@ -535,6 +537,7 @@ class Studentview_model extends CI_Model
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('AS.StudentID', $studentID);
         $this->db->where('CM.CertificateName !=', APPLICATION_CONST);
+        $this->db->where('PLD.ListName !=','BLANK');
         $this->db->group_by('AS.ID');
         $this->db->order_by('AS.ID', 'DESC');
         $getCertDetails = $this->db->get();
@@ -564,6 +567,7 @@ class Studentview_model extends CI_Model
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('AS.StudentID', $studentID);
         $this->db->where('CM.CertificateName', APPLICATION_CONST);
+        $this->db->where('PLD.ListName !=','BLANK');
         $this->db->where('AS.ListCode !=','');
         $this->db->order_by('AS.ID', 'DESC');
         $getCertDetails = $this->db->get();
@@ -616,7 +620,7 @@ class Studentview_model extends CI_Model
         $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode');
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('ABT.StudentID', $studentID);
-        
+        $this->db->where('PLD.ListName !=','BLANK');
         // $this->db->group_by('ABT.ID');
         $this->db->order_by('ABT.ID', 'DESC');
         $getBookletDetails = $this->db->get();
@@ -689,7 +693,7 @@ class Studentview_model extends CI_Model
         LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode 
         LEFT JOIN T_BatchMaster as t4 on t4.BatchCode = t2.BatchCode
         WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
-        and t1.ListCode  != ""
+        and t1.ListCode  != "" and t3.ListName !="BLANK"
         ORDER BY t1.AppFormDate DESC, CFD.Sem_Year ASC';
         $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
 
diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index 4088408f..634f15c7 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -1016,8 +1016,9 @@ $scope.GetstaffwiseDetails($scope.tod);
     }
     console.log("donedon",$scope.selectedLeadID);
     }
+    
     $scope.calltracking = function(){
-        // console.log($scope.selectedStudentsID);
+        console.log('CALL',$scope.selectedLeadID);
         // swal('testing','','warning');
         // return true;
         //$rootScope.student = $scope.selectedStudentsID;
@@ -1026,7 +1027,6 @@ $scope.GetstaffwiseDetails($scope.tod);
             swal('Select Check box','','warning');
 			return false;
         }else{
-            // var len2 = $scope.selectedLeadID.length;
             if($scope.search3_activity!='' && $scope.search3_activity!=null && $scope.search3_activity!=undefined){
                 angular.forEach($scope.selectedLeadID, function(item) {                
                     if(item.ActivityName.toLowerCase().indexOf($scope.search3_activity.toLowerCase()) >= 0 ){
@@ -1035,7 +1035,13 @@ $scope.GetstaffwiseDetails($scope.tod);
                 });      
                 var ActivityID = $scope.filteredList[0].ActivityID;
             }else{
+                var keys = [];
                 var ActivityID = '';
+                angular.forEach($scope.selectedLeadID, function(item) {
+                    var key = item['ActivityStatus'];
+                    if(keys.indexOf(key) === -1) { keys.push(key); /*keys.push(item); */}
+                });
+                if(keys.length === 1){ ActivityID = keys[0]; }
             }
             // console.log(ActivityID,'ActivityID');
         $scope.controller = 'ng-controller="callTrackingCtrl"';
diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html
index c13d3333..bab0a081 100755
--- a/Apollo/assets/views/student/studentDetailsModal.html
+++ b/Apollo/assets/views/student/studentDetailsModal.html
@@ -409,7 +409,7 @@
 												<th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Sem/Year</th>
                                                 <th style="text-align:center;">Status</th>
-                                                <th style="text-align:center;">Comments</th>
+                                                <th style="text-align:center;">Courier Details/Comments</th>
                                                 
                                             </tr>
                                             </thead>