diff --git a/Apollo/api/application/models/Dashboard_model.php b/Apollo/api/application/models/Dashboard_model.php
index aee3a37b..d7226cd0 100755
--- a/Apollo/api/application/models/Dashboard_model.php
+++ b/Apollo/api/application/models/Dashboard_model.php
@@ -401,7 +401,7 @@ public function leadCountMonth($branchId = null, $requestedBy = null){
                  left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
                  join T_PickListDetails list on list.ListCode=ltf.StatusName 
                  where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) 
-                  and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and  ltf.StatusName ='S020' ";
+                   and list.ListName like 'PENDING' and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
             $followupsCount=$this->db->query($sql);
             $fcount = $followupsCount->result();
             $ssql = "select count(ltf.TrackingID) as count
@@ -413,10 +413,10 @@ public function leadCountMonth($branchId = null, $requestedBy = null){
              left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
              join T_PickListDetails list on list.ListCode=ltf.StatusName 
              where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) 
-              and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."'  and ltf.StatusName ='S020' ";
+              and list.ListName like 'PENDING' and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
         $sfollowupsCount=$this->db->query($ssql);
         $sfcount = $sfollowupsCount->result();
-		//print_r($sql);die();
+		//print_r($sql);die();and  ltf.StatusName ='S020'
             if (count($fcount) > 0) {
                 $results['fUpList']      = true;
                 $results['fUp_data'] = $fcount;
@@ -438,10 +438,10 @@ public function leadCountMonth($branchId = null, $requestedBy = null){
                  left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
                  join T_PickListDetails list on list.ListCode=ltf.StatusName 
                  where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) 
-                  and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1  and lt.CreatedBranch = '".$branchId."' and  ltf.StatusName ='S020'";
+                 and list.ListName like 'PENDING' and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1  and lt.CreatedBranch = '".$branchId."' ";
             $followupsCount=$this->db->query($sql);
             $fcount = $followupsCount->result();
-            //to staff ltf.StatusName ='S020'
+            //and  ltf.StatusName ='S020'
             $ssql = "select count(ltf.TrackingID) as count
             from T_Lead_Tracking_Followup as ltf
              left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@@ -451,7 +451,7 @@ public function leadCountMonth($branchId = null, $requestedBy = null){
              left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
              join T_PickListDetails list on list.ListCode=ltf.StatusName 
              where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) 
-              and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."'  ";
+             and list.ListName like 'PENDING' and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."'  ";
         $sfollowupsCount=$this->db->query($ssql);
 		
 //print_r($sql);die();
@@ -797,7 +797,7 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
                $sql.= " group by bcode ";
 			   
 				$sql.=" ORDER BY BDate  DESC";
-              // print_r($sql); die();
+             
             $ltd=$this->db->query($sql);
             $tlead = $ltd->result();
             if (count($tlead) > 0) {
@@ -837,6 +837,7 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
         $sltd=$this->db->query($ssql);
         $stlead = $sltd->result();
 
+
             if (count($tlead) > 0) {
                 $results['lList']      = true;
                 $results['l_data'] = $tlead;
@@ -858,7 +859,7 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
                  left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
                  join T_PickListDetails list on list.ListCode=ltf.StatusName 
                  where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) 
-                  and list.ListName not like 'CLOSE' and list.ListName like 'PENDING' and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now())   and lt.CreatedBranch = '".$branchId."' and  ltf.StatusName ='S020' ";
+                  and list.ListName not like 'CLOSE' and list.ListName like 'PENDING' and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now())   and lt.CreatedBranch = '".$branchId."' ";
             $ltd=$this->db->query($sql);
             $tlead = $ltd->result();
             //To staff
diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php
index aad586dd..eb526a35 100755
--- a/Apollo/api/application/models/Login_model.php
+++ b/Apollo/api/application/models/Login_model.php
@@ -73,12 +73,12 @@ class Login_model extends CI_Model
                                         $result['details'] = $responseDetails;
                                     } else {
                                         $result['loginStatus'] = false;
-                                        $result['message']     = "Your login is de-activated.";
+                                        $result['message']     = "Please Enter The Correct OTP.";
                                     }
                                 }
                                 else{
                                     $result['loginStatus'] = false;
-                                    $result['message']     = "Your login is de-activated.";
+                                    $result['message']     = "Please Enter The Correct OTP.";
                                 }  
                         } else {
                               $this->db->select('LO.MobileNumber, LO.ListCode, LO.ID,ST.BranchCode, ST.LoginAccess');
@@ -105,12 +105,12 @@ class Login_model extends CI_Model
                                         $result['details'] = $responseDetails;
                                     } else {
                                         $result['loginStatus'] = false;
-                                        $result['message']     = "Your login is de-activated.";
+                                        $result['message']     = "Please Enter The Correct OTP.";
                                     }
                                 }
                                 else{
                                     $result['loginStatus'] = false;
-                                    $result['message']     = "Your login is de-activated.";
+                                    $result['message']     = "Please Enter The Correct OTP.";
                                 }  
                         }
                         
@@ -177,14 +177,14 @@ class Login_model extends CI_Model
                 else 
                 {
                     $result['loginStatus'] = false;
-                    $result['message']     = "Your login is de-activated.";
+                    $result['message']     = "Please Enter The Correct OTP.";
                 }
             }
             
             else
             {
                     $result['loginStatus'] = false;
-                    $result['message']     = "Your login is de-activated.";
+                    $result['message']     = "Please Enter The Correct OTP.";
             } 
 
 
@@ -246,7 +246,7 @@ class Login_model extends CI_Model
             else
             {
                     $result['loginStatus'] = false;
-                    $result['message']     = "Your login is de-activated.";
+                    $result['message']     = "Please Enter The Correct OTP.";
             }
 
 
@@ -394,7 +394,7 @@ class Login_model extends CI_Model
                 $mobileno = $responseDetails->Mobile;
                 
               // $query =1;
-                 if($query == 1){
+                 if($query == 1){	
                      $sms = $this->smssend($mobileno,$otp);
                      
                         $result['checkstudent'] = true;