Changeset 838 for pro-violet-viettel/sourcecode/application/modules/admin/controllers

Timestamp:

Mar 27, 2015 9:49:55 AM (10 years ago)

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/admin/controllers

Files:

• collaborator.php (modified) (3 diffs)
• reportAsistant.php (modified) (1 diff)

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

@@ -9 +9 @@
         parent::__construct();
         $this->load->helper('cookie');
+                $this->load->helper('language');
+                $this->lang->load('messages', 'message');
     }
 
@@ -25 +27 @@
         $this->load->helper('pagging');
         $this->load->model('collabolator_model');
+                $provinces = lang('_PROVINCES_');
         $data['current_page'] = $this->uri->segment(4, 1);
         $data['itemsoptions'] = array(10, 25, 50, 100);
@@ -62 +65 @@
         $data['start'] = ($data['current_page'] - 1) * $data['perpage'];
         $data['total'] = $this->collabolator_model->countCollaborator($data);  
-        $data['collaborators'] = $this->collabolator_model->getCollaborators($data);
+                
+                $collaborators = $this->collabolator_model->getCollaborators($data);
+                foreach ($collaborators as $index => $collaborator){
+                        $collaborator ['province'] = isset($provinces[$collaborator ['province']]) ? $provinces[$collaborator ['province']] : $collaborator ['province'];
+                        $collaborators[$index] = $collaborator;
+                }
+        $data['collaborators'] = $collaborators;
 
         $data['paging_url'] = base_url() . "/admin/cong_tac_vien/trang/";

pro-violet-viettel/sourcecode/application/modules/admin/controllers/reportAsistant.php

@@ -199 +199 @@
         $data['num_links'] = 2;
         $data['paging'] = pagging($data);
-
+                
         if ($this->input->is_ajax_request()) {
             return $this->load->view('reportAsistant/listview_user', $data);