1) Fixed issue related to "Approve" in "list of approvals" >> "view"

2) Query optimization of "Patient uploaded files" listing in "list of approvals" Signed-off-by: Teny <teny@zhservices.com>
PFWilliams · Mar 27, 2013 · 6c38858 · 6c38858
1 parent d56d58f
commit 6c38858
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/myportal/soap_service/server_oemruser.php b/myportal/soap_service/server_oemruser.php
@@ -76,13 +76,13 @@ public function query_formation($data){
 
             // Entries pending  for approval for  documents only (no demo change).            
             case 'U5':
-            $pid = $this->getPid($data[1]);
+            $pid = $this->getPid($data[1][0]);
 						if($pid){
 								$query = " select * from  audit_master  where pid=? and  approval_status='1' and  type='3' ";
 								return array($query,array($pid));
 						}else{
 								$query = " select * from  audit_master where id=? and approval_status='1' and type='3'";
-								return array($query,array($data[1]));
+		return array($query,array($data[1][0]));
 						}
             break;
 
@@ -238,13 +238,13 @@ public function query_formation($data){
 
             case 'F8':
             //signing
-            $pid = $this->getPid($data[1]);
+            $pid = $this->getPid($data[1][0]);
 						if($pid){
 								$query = " select * from  audit_master  where pid=? and  approval_status='1' and  (type='1' or type='2' or type='3')";
 								return array($query,array($pid));
 						}else{
 								$query = " select * from  audit_master where id=? and approval_status='1' and (type='1' or type='2' or type='3')";
-								return array($query,array($data[1]));
+		return array($query,array($data[1][0]));
 						}
             break;
 

diff --git a/myportal/soap_service/server_side.php b/myportal/soap_service/server_side.php
@@ -232,6 +232,16 @@ public function userslistportal($data){
                     AND dld.dld_id IS NOT NULL 
                     AND dld.dld_signed IN (1,2,4) 
                     AND dld.dld_moved = 0 
+          AND dlm_subcategory NOT IN
+          (
+            SELECT
+              dlc_id
+            FROM
+              documents_legal_categories
+            WHERE
+              dlc_category_name = 'Layout Signed' 
+              AND dlc_category_type = 2
+          )
                   ORDER BY dld.dld_pid ASC ";
 
       $res = sqlStatement($query);