Changeset 503 for pro-violet-viettel/sourcecode/application/modules/admin

Timestamp:

Nov 14, 2014 4:46:37 PM (11 years ago)

Author:

quyenla

Message:

dang ki dich vu

Location:

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

Files:

• controllers/report.php (modified) (2 diffs)
• controllers/reportAsistant.php (modified) (2 diffs)
• views/reportAsistant/listview_user.php (modified) (1 diff)

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

@@ -184 +184 @@
         $data['paging'] = pagging($data);
         foreach ($data['paidlogs'] as $index => $paidlog) {
-            $data['paidlogs'][$index]['username'] = @$this->get_username($paidlog['us_id']);
+            $data['paidlogs'][$index]['username'] = @$this->get_fullname($paidlog['us_id']); 
         }
 
@@ -193 +193 @@
     }
 
-    private function get_username($us_id) {
+    private function get_fullname($us_id) {
+        $fullname="";
         $src = 'violet';
         $token = md5($us_id . self::TOKENPW);
         $this->load->model('user_model');
         $data = $this->user_model->get_user_info($src, $us_id, $token);
-        if (strpos($data, '&')) {
-            $arr_users = explode("&", $data);
-            $str_username = $arr_users[1];
-            $arr_username = explode("=", $str_username);
-            return $arr_username[1];
-        } else {
-            return "";
-        }
+        parse_str($data,$data);
+        if (isset($data['fullname']))
+        {
+            $fullname=$data['fullname'];
+        }
+        return $fullname;
     }
 

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

@@ -184 +184 @@
         foreach ($data['paidlogs'] as $index=>$paidlog)
         {
-            $data['paidlogs'][$index]['username']=$this->get_username($paidlog['us_id']);
+            $data['paidlogs'][$index]['username']=$this->get_fullname($paidlog['us_id']);
         }
         $data['paging_url'] = base_url() . "/admin/thong_ke_cong_tac_vien/trang_ctv/" . $data['id'];
@@ -196 +196 @@
     }
 
-    private function get_username($us_id) {
+    private function get_fullname($us_id) {
+        $fullname="";
         $src = 'violet';
         $token = md5($us_id . self::TOKENPW);
         $this->load->model('user_model');
         $data = $this->user_model->get_user_info($src, $us_id, $token);
-        if (strpos($data, '&')) {
-            $arr_users = explode("&", $data);
-            $str_username = $arr_users[1];
-            $arr_username = explode("=", $str_username);
-            return $arr_username[1];
-        } else {
-            return "";
-        }
+        parse_str($data,$data);
+        if (isset($data['fullname']))
+        {
+            $fullname=$data['fullname'];
+        }
+        return $fullname;
     }
 

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

@@ -37 +37 @@
                             <tr role="row">
                                
-                                <th class="<?php if ($sorting_field == 'full_name') {echo $sorting_order;} else {echo "sorting";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số điện thoại: activate to sort column ascending">Tên người dùng</th>
+                                <th class="<?php if ($sorting_field == 'full_name') {echo $sorting_order;} else {echo "";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số điện thoại: activate to sort column ascending">Tên người dùng</th>
                                 <th class="<?php if ($sorting_field == 'collaborator_cellphone') {echo $sorting_order;} else {echo "sorting";}?>" id="collaborator_cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 283px;" aria-label="Họ tên: activate to sort column ascending">Số điện thoại người dùng</th>
                                 <th class="<?php if ($sorting_field == 'total_user') {echo $sorting_order;} else {echo "sorting";}?>" id="total_user" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số điện thoại: activate to sort column ascending">Ngà y giới thiệu</th>