Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -5180,6 +5180,7 @@ print_r(date('H:i',$ms));exit();*/
 					$start = 0;
 					$page_no = 0;
 				}
+				$total_data = $this->Webservice_model->get_doctor_notification_list($authtoken->doctor_id,0,0);
 				$result = $this->Webservice_model->get_doctor_notification_list($authtoken->doctor_id,$start,$per_page);
 				$count = $this->Webservice_model->get_doctor_notification_list_unread_count($authtoken->doctor_id);
 				if($count){
@@ -5189,7 +5190,7 @@ print_r(date('H:i',$ms));exit();*/
 				}
 					$notifArray = array();
 					if($result != false){
-						$total = count($result);
+						$total = count($total_data);
 					}else{
 						$total = 0;
 					}

admin/application/models/Webservice_model.php

@@ -3242,9 +3242,9 @@ class Webservice_model extends CI_Model {
 		//SELECT IIF(Obsolete = 'N' or InStock = 'Y', 1, 0) as Saleable, * FROM Product
 		$this->db->select("read_status,id,type,message");
 		$this->db->order_by('tbl_doctor_notifications.id','DESC');
-	//	if($start!=0 && $per_page!=0){
+		if($start!=0 && $per_page!=0){
 			$this->db->limit($per_page,$start);
-		//}
+		}
 		$result = $this->db->get_where('tbl_doctor_notifications',array('doctor_id'=>$doctorid))->result();
 		//echo $this->db->last_query();exit();
 		if(count($result) > 0){