Changeset 906 for pro-violet-viettel/sourcecode/application/modules/collaborator/controllers/user.php

Timestamp:

Apr 23, 2015 12:00:06 PM (10 years ago)

Author:

namnd

Message:

 

File:

• pro-violet-viettel/sourcecode/application/modules/collaborator/controllers/user.php (modified) (7 diffs)

pro-violet-viettel/sourcecode/application/modules/collaborator/controllers/user.php

@@ -22 +22 @@
                         $this->load->view('collaborator/user/index', $data);
                 }else{
-                        show_404();
+                        $this->load->view(login);
                 }
         }
@@ -32 +32 @@
                         $collaborator = $collaborator_info['login_name'];
                         $config['upload_path'] = './upload/uploads/';
-                        $config['allowed_types'] = 'xls|xlsx';
-                        /*$config['max_size']   = '100';
-                        $config['max_width']  = '1024';
-                        $config['max_height']  = '768';*/
-                        
+                        $config['allowed_types'] = '*';
                         $this->load->library('upload', $config);
                         
@@ -43 +39 @@
                                 $error = array('error' => $this->upload->display_errors('', ''));
                                 $data['success'] = 0;
-                                $data['process'] = $error;
+                                $data['upload_error'] = $error;
                         }
                         else
@@ -49 +45 @@
                                 $data = array('upload_data' => $this->upload->data());
                                 $file = $data['upload_data']['full_path'];
-                                //$result = $this->processData($file);
                                 $process = $this->processData($file, $collaborator);
                                 if ($process){
                                         $data['process'] = $process;
-                                        
                                 }else{
-                                        $data['process'] = null;
+                                        $data['process'] = null;                                
                                 }
                                 $data['success'] = 1;
@@ -61 +55 @@
                         $result = $this->load->view('collaborator/user/result', $data, true);
                         echo json_encode($result);
+
                 }else{
-                        show_404();
+                        $this->load->view('login');
                 }
         }
@@ -93 +88 @@
                 $this->load->model('collaborator_model');
                 $data = $this->readExcelFile($file);
+
                 $result = array();
                 $user = array();
@@ -104 +100 @@
                                 $user['district'] = $arrPD['district'];
                                 $user['school'] = $value['E'];
-                                $user['username'] = $this->services_model->formatPhoneNumber($value['F'], 2);
+                                $user['username'] = $this->services_model->formatPhoneNumber((string)$value['F'], 2);
                                 $user['service'] = $value['G'];
                                 $user['amount'] = $value['H'];
                                 $user['collboratorId'] = $value['I'];
                                 
+                                
                                 if ($user['username']){
         
                                         if (!preg_match('/^([0-9]{10,11}$)$/', $user['username'])) {
-                                                $result[$index]['success'] = 0;
-                                                $result[$index]['error'] = lang('_SBG_MO_PHONENUM_WRONG_FORMAT_MSG');
-                                                $result[$index]['user'] = $user;
+                                                $result[$index-1]['success'] = 0;
+                                                $result[$index-1]['error'] = lang('_SBG_MO_PHONENUM_WRONG_FORMAT_MSG');
+                                                $result[$index-1]['user'] = $user;
                                         }else{
-                                                $result[$index] = $this->collaborator_model->processUser($user, $sentNumber);
-                                                
-                                                
+                                                $result[$index-1] = $this->collaborator_model->processUser($user, $sentNumber);
                                         }
-                                        $result[$index]['date'] = date('d-m-Y H:i:s');
                                 }
                                 
                         endforeach;
                 }
-                
                 return $result;
         }