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

Timestamp:

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

Author:

namnd

Message:

 

Location:

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

Files:

• controllers/collaborator.php (modified) (3 diffs)
• controllers/reportAsistant.php (modified) (1 diff)
• models/admin_model.php (modified) (1 diff)
• models/collabolator_model.php (modified) (3 diffs)
• models/reportmodel.php (modified) (2 diffs)
• views/collaborator/listview.php (modified) (2 diffs)
• views/reportprovince/province.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);

pro-violet-viettel/sourcecode/application/modules/admin/models/admin_model.php

@@ -18 +18 @@
                 $result = $this->db->query($query, array($login_name, $hash_password));         
                 
-                if($result->num_rows() == 1){
-                    $admin = $result->row(0);
-                    $query="SELECT * FROM tbladminrole LEFT JOIN tblrole ON tbladminrole.role_id=tblrole.role_id WHERE tbladminrole.admin_id= ".$admin->admin_id;
-                    $result2 = $this->db->query($query);
-                    $admin->roles=$result2;
-                    return $admin; 
+                if($result->num_rows() == 1){
+                        $admin = $result->row(0);
+                        $query="SELECT * FROM tbladminrole LEFT JOIN tblrole ON tbladminrole.role_id=tblrole.role_id WHERE tbladminrole.admin_id= ".$admin->admin_id;
+                        $result2 = $this->db->query($query);
+                        $admin->roles=$result2;
+                        return $admin; 
                      
                 }else

pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php

@@ -17 +17 @@
             if ($data['search_field'] == "cellphone") {
                                 if(strlen($data['daterange_start'])>0){
-                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%') AND (created_time BETWEEN '".$data['daterange_start']."' AND '".$data['daterange_end']."')";
+                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR full_name LIKE '%".$data['keyword']."%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%') AND (created_time BETWEEN '".$data['daterange_start']."' AND '".$data['daterange_end']."')";
                                 }else{
-                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%')";
+                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR full_name LIKE '%".$data['keyword']."%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%')";
                                 }
             } else {
@@ -215 +215 @@
             if ($data['search_field'] == "cellphone") {
                                 if(strlen($data['daterange_start'])>0){
-                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%') AND (created_time BETWEEN '".$data['daterange_start']."' AND '".$data['daterange_end']."')";
+                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR full_name LIKE '%".$data['keyword']."%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%') AND (created_time BETWEEN '".$data['daterange_start']."' AND '".$data['daterange_end']."')";
                                 }else{
-                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%')";
+                                        $sql.=" WHERE (cellphone LIKE '%" . $data['keyword'] . "%' OR full_name LIKE '%".$data['keyword']."%' OR district LIKE '%".$data['keyword']."%' OR province LIKE '%".$data['keyword']."%')";
                                 }
             } else {
@@ -439 +439 @@
     }
 
+        function check_login($login_name, $password)
+        {
+                $hash_password = md5($password);
+                $query = "SELECT * FROM tblcollaborator WHERE  login_name = ? AND  passwd = ?";
+                $result = $this->db->query($query, array($login_name, $hash_password));         
+                        if($result->num_rows() == 1){
+                                $collaborator = $result->row(0);
+                                return $collaborator; 
+                     
+                }else
+                {
+                        return null;
+                }
+        }
+        
 }

pro-violet-viettel/sourcecode/application/modules/admin/models/reportmodel.php

@@ -33 +33 @@
                 
                 // tinh doanh thu theo thang
+                $from = "tblpaidlog.paid_time >= '" . $input ['year'] . "-" . $input ['month'] . "-01 00:00:00'";
                 $sql = "SELECT *,SUM(amount) as total FROM tblpaidlog LEFT JOIN tbluser ON tbluser.us_id=tblpaidlog.us_id WHERE $from AND $to  GROUP BY tbluser.province";
                 $query = $this->db->query ( $sql );
@@ -133 +134 @@
                 $data['totalDtn'] = $totalDtn;
                 
-                //return $provinces;
                 return $data;
         }

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

@@ -97 +97 @@
                                 }
                                 ?>" id="cellphone" 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">Số điện thoại</th>
+                                                                <th>Họ và tên</th>
                                 <th>Quận/Huyện</th>
                                 <th>Tỉnh/TP</th>
@@ -130 +131 @@
 
                                     <td class=" "><a href="<?php echo base_url(); ?>admin/thong_ke_cong_tac_vien/<?php echo $collaborator['id']; ?>"><?php echo $collaborator['cellphone']; ?></a></td>
+                                                                        <td class=" "><?php echo $collaborator['full_name']; ?></td>
                                     <td class=" "><?php echo $collaborator['district']; ?></td>
                                     <td class=" "><?php echo $collaborator['province']; ?></td>

pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php

@@ -109 +109 @@
                                                                 <td style="font-weight:bold;"><?php echo $totalTbn; ?></td>
                                                                 <td style="font-weight:bold;"><?php echo $totalDtng; ?></td>
-                                                                <td style="font-weight:bold;"><?php echo $totalDtng; ?></td>
+                                                                <td style="font-weight:bold;"><?php echo $totalDtth; ?></td>
                                                                 <td style="font-weight:bold;"><?php echo $totalDtn; ?></td>