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

Timestamp:

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

Author:

namnd

Message:

 

Location:

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

Files:

• admin_model.php (modified) (1 diff)
• collabolator_model.php (modified) (3 diffs)
• reportmodel.php (modified) (2 diffs)

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;
         }