Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php	(revision 838)
@@ -9,4 +9,6 @@
         parent::__construct();
         $this->load->helper('cookie');
+		$this->load->helper('language');
+		$this->lang->load('messages', 'message');
     }
 
@@ -25,4 +27,5 @@
         $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,5 +65,11 @@
         $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/";
Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/reportAsistant.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/reportAsistant.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/reportAsistant.php	(revision 838)
@@ -199,5 +199,5 @@
         $data['num_links'] = 2;
         $data['paging'] = pagging($data);
-
+		
         if ($this->input->is_ajax_request()) {
             return $this->load->view('reportAsistant/listview_user', $data);
Index: pro-violet-viettel/sourcecode/application/modules/admin/models/admin_model.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/models/admin_model.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/models/admin_model.php	(revision 838)
@@ -18,10 +18,10 @@
 		$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
Index: pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php	(revision 838)
@@ -17,7 +17,7 @@
             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,7 +215,7 @@
             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,3 +439,18 @@
     }
 
+	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;
+		}
+	}
+	
 }
Index: pro-violet-viettel/sourcecode/application/modules/admin/models/reportmodel.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/models/reportmodel.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/models/reportmodel.php	(revision 838)
@@ -33,4 +33,5 @@
 		
 		// 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,5 +134,4 @@
 		$data['totalDtn'] = $totalDtn;
 		
-		//return $provinces;
 		return $data;
 	}
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php	(revision 838)
@@ -97,4 +97,5 @@
                                 }
                                 ?>" 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,4 +131,5 @@
 
                                     <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>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php	(revision 838)
@@ -109,5 +109,5 @@
 								<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>
 								
