Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -79,26 +79,39 @@ class Webservice extends CI_Controller {
 		$data['dob'] = $data['dob'];
 		$new = array();
 		
-		if((isset($data['bystander_name']) && strlen(trim($data['bystander_name']," ")) > 0) || (isset($data['bystander_relation']) && strlen(trim($data['bystander_relation']," ")) > 0 ) || (isset($data['bystander_cpf']) &&  strlen(trim($data['bystander_cpf']," ")) > 0 ) || (isset($data['bystander_dob']) &&  strlen(trim($data['bystander_dob']," ")) > 0 )) {
-			if(isset($data['bystander_name'])){	
+		if(isset($data['bystander_name']) || isset($data['bystander_relation'])  || isset($data['bystander_cpf']) || isset($data['bystander_dob']) ){
+			if(isset($data['bystander_name']) &&  strlen(trim($data['bystander_name']," ")) > 0){	
 				$new['dependent_name'] = $data['bystander_name'];
 				unset($data['bystander_name']);
+			}else{
+				unset($data['bystander_name']);
 			}
-			if(isset($data['bystander_relation'])){	
+
+			if(isset($data['bystander_relation']) &&  strlen(trim($data['bystander_relation']," ")) > 0){	
 				$new['relation'] = $data['bystander_relation'];
 				unset($data['bystander_relation']);
+			}else{
+				unset($data['bystander_relation']);
 			}
-			if(isset($data['bystander_cpf'])){	
+
+			if(isset($data['bystander_cpf']) &&  strlen(trim($data['bystander_cpf']," ")) > 0){	
 				$new['cpf'] = $data['bystander_cpf'];
 				unset($data['bystander_cpf']);
+			}else{
+				unset($data['bystander_cpf']);
 			}
-			if(isset($data['bystander_dob'])){	
+			
+			if(isset($data['bystander_dob']) &&  strlen(trim($data['bystander_dob']," ")) > 0){	
 				$new['dob'] = strtotime($data['bystander_dob']);
 				unset($data['bystander_dob']);
+			}else{
+				unset($data['bystander_dob']);
 			}
 	
 			$result = $this->Webservice_model->registration($data,$type);
+			if(!empty($new)){
 				$this->Webservice_model->insert_bystander_registration($new,$result);
+			}
 		}else{
 			$result = $this->Webservice_model->registration($data,$type);
 		}