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

Timestamp:

Jan 9, 2015 10:35:30 AM (10 years ago)

Author:

namnd

Message:

 

Location:

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

Files:

• collaborator.php (modified) (1 diff)
• report.php (modified) (1 diff)
• user.php (modified) (5 diffs)

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

@@ -53 +53 @@
             
         }
-        
+                $data['daterange_start'] = "";
+                $data['daterange_end'] = "";
+        if ($this->input->post('daterange')){
+                        $daterange = explode(" - ", $this->input->post('daterange'));
+                        $data['daterange_start'] = date('Y-m-d H:i:s', strtotime($daterange[0]));
+                        $data['daterange_end'] = date('Y-m-d H:is:s', strtotime($daterange[1].' + 1 day'));
+                }
         $data['start'] = ($data['current_page'] - 1) * $data['perpage'];
         $data['total'] = $this->collabolator_model->countCollaborator($data);  

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

@@ -59 +59 @@
             }
         }
-
+                $data['daterange_start'] = "";
+                $data['daterange_end'] = "";
+                if ($this->input->post('daterange')){
+                        $daterange = explode(" - ", $this->input->post('daterange'));
+                        $data['daterange_start'] = date('Y-m-d H:i:s', strtotime($daterange[0]));
+                        $data['daterange_end'] = date('Y-m-d 23:59:59', strtotime($daterange[1]));
+                }
         $data['start'] = ($data['current_page'] - 1) * $data['perpage'];
         $data['total'] = $this->paidlog_model->countPaidlog($data);

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

@@ -55 +55 @@
             $data['keyword'] = $this->input->post('keyword');
         }
+                $data['daterange_start'] = "";
+                $data['daterange_end'] = "";
+                if ($this->input->post('daterange')){
+                        $daterange = explode(" - ", $this->input->post('daterange'));
+                        $data['daterange_start'] = date('Y-m-d H:i:s', strtotime($daterange[0]));
+                        $data['daterange_end'] = date('Y-m-d H:is:s', strtotime($daterange[1].' + 1 day'));
+                }
                 $data['start'] = ($data['current_page'] - 1) * $data['perpage'];
                 $data['total'] = $this->user_model->get_total_users($data);
@@ -62 +69 @@
                 foreach($us as $u) {
                         $id = $u['us_id'];
-                        $username = $this->get_username($id);
-                        $u['username'] = $username;
-                        array_push($users, $u);
+                        //$username = $this->get_username($id);
+                        $userinfo = $this->get_userinfo($id);
+                        if($userinfo){
+                                $u['username'] = $userinfo['username'];
+                                $u['province'] = $userinfo['province'];
+                                array_push($users, $u);
+                        }
                 }
                 
@@ -151 +162 @@
         }
         
-        private function get_username($us_id)
+        private function get_userinfo($us_id)
         {
                 $src = 'violet';
@@ -158 +169 @@
                 $data = $this->user_model->get_user_info($src, $us_id, $token);
                 //var_dump($data);
+                $result = array();
+                parse_str($data, $result);
+                return $result;
+                /*
                 if (strpos($data, '&')){
                         $arr_users = explode("&", $data);
@@ -166 +181 @@
                 {
                         return "";
-                }
+                }*/
 
         }