Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 883)
@@ -90,11 +90,11 @@
 				$('#table_content').show();
 				$("#content").html(data);
-				$("#keyword").focus();
-				$("#keyword").setCursorToTextEnd();
 				$('.daterangepicker').daterangepicker({
 					format: 'DD/MM/YYYY'
 				});
+				$("#keyword").focus();
+				$("#keyword").setCursorToTextEnd();
+				init_page();
 				$('input[name="daterange"]').val(daterange);
-				init_page();
 			},
 			error: function (jqXHR, textStatus, errorThrown)
@@ -104,4 +104,8 @@
         });
 	}
+	//$(document).ready(function(){
+		
+	//});
+	
 		
 </script>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 818)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 883)
@@ -45,4 +45,9 @@
                     ThÃªm ngÆ°á»i dÃ¹ng
                 </button-->
+				<div class="pull-right" style="margin:5px;">
+                    
+					<a style="color:#fff" href="<?php echo base_url();?>admin/user/export/<?php echo $current_page; ?>/<?php echo $perpage; ?>/<?php echo ($keyword)?$keyword:'default'; ?>/<?php echo $status; ?>/<?php echo ($province)?$povince:'default'; ?>/<?php echo ($district)?$district:'default';?>/<?php echo ($daterange)?$daterange:'default'; ?>/<?php echo $sorting_order; ?>/<?php echo $sorting_field;?>">Xuáº¥t ra Excel</a>
+					
+                </div>
 
             </div>
@@ -76,10 +81,22 @@
                                 </div>
 								<div style="clear: both;"></div>
-								<div class="dataTables_status" style="float: right;" id="sample-table-2_status"><label>Lá»c theo Tá»nh/TP:
-									<select onchange="filter();" name="province-code" size="1" style="width: 176px; height: 28px;">
+								<div class="dataTables_province" style="float: right;" id="sample-table-2_status"><label>Lá»c theo Tá»nh/TP:
+									<select onchange="filter();" name="province" class="form-field-province" size="1" style="width: 176px; height: 28px;">
 										<option value=''></option>
+						
 										<?php foreach ($provinces as $key => $pro): ?>
-											<option <?php if ($key == $province_code) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $pro; ?></option>
+											<option <?php if ($key == $province) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $pro; ?></option>
 										<?php endforeach; ?>
+									</select>
+                                </div>
+								
+								<div class="dataTables_district" style="float: right;" id="sample-table-2_status"><label>Lá»c theo Quáº­n/Huyá»n:
+									<select onchange="filter();" name="district" id="form-field-district" class="form-field-district" size="1" style="width: 176px; height: 28px;">
+										<?php if ($districts):?>
+											<option value=''></option>
+											<?php foreach ($districts as $key => $dist): ?>
+												<option <?php if ($dist['district_id'] == $district) echo "selected"; ?> value="<?php echo $dist['district_id']; ?>"><?php echo $dist['district_name']; ?></option>
+											<?php endforeach; ?>
+											<?php endif;?>
 									</select>
                                 </div>
@@ -92,9 +109,8 @@
                             </div>
                         </div>
-
+						<input type="hidden" name="sorting_order" id="sorting_order" value="<?php echo $sorting_order; ?>" />
+						<input type="hidden" name="sorting_field" id="sorting_field" value="<?php echo $sorting_field; ?>"/>
                 </div>
 
-                <input type="hidden" name="sorting_order" id="sorting_order" value="<?php echo $sorting_order; ?>" />
-                <input type="hidden" name="sorting_field" id="sorting_field" value="<?php echo $sorting_field; ?>"/>
                 </form>
                 <!-- Table Content -->
@@ -104,10 +120,10 @@
                         <thead>
                             <tr role="row">
-                                <th class="center sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 44px;" aria-label="">
+                                <!--<th class="center sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 44px;" aria-label="">
                                     <label>
                                         <input type="checkbox" class="ace">
                                         <span class="lbl"></span>
                                     </label>
-                                </th>
+                                </th>-->
                                 <th class="<?php
                                 if ($sorting_field == 'cellphone') {
@@ -117,11 +133,5 @@
                                 }
                                 ?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="TÃ i khoáº£n: activate to sort column ascending">Sá» Äiá»n thoáº¡i</th>
-                                <th class="<?php
-                                if ($sorting_field == 'cellphone') {
-                                    echo $sorting_order;
-                                } else {
-                                    echo "sorting";
-                                }
-                                ?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">Há» tÃªn</th>
+                                <th style="width: 156px;">Há» tÃªn</th>
 								
                                 <th class="<?php
@@ -152,5 +162,6 @@
                                     NgÃ y háº¿t háº¡n
                                 </th>
-                                <th style="width: 140px;">Tá»nh/TP</th>
+                                <th style="width: 130px;">Tá»nh/TP</th>
+								 <th style="width: 150px;">Quáº­n/Huyá»n</th>
                                 <th class="sorting_disabled" id="status" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;">TÃ¬nh tráº¡ng</th>
                             </tr>
@@ -163,4 +174,5 @@
 							?>
                                 <tr class="odd">
+								<!--
                                     <td class="center  sorting_1">
                                         <label>
@@ -168,5 +180,5 @@
                                             <span class="lbl"></span>
                                         </label>
-                                    </td>
+                                    </td>-->
                                     <td class=" ">
                                         <a onclick="getUserHistory(<?php echo $user['us_id']; ?>, 1);" data-toggle="modal"><?php echo $user['username']; ?></a>
@@ -180,4 +192,5 @@
                                     <td class=" "><?php echo isset($user['expire_date']) && strtotime($user['expire_date']) > 0 ? date('d/m/Y', strtotime($user['expire_date'])) : ''; ?></td>
                                     <td><?php echo $user['province']; ?></td>
+									<td><?php echo $user['district_name']; ?></td>
 									<td class=" ">
 									<?php if (strtotime($user['expire_date']) > time() && $user['p_id'] != 5 ): ?>
@@ -242,5 +255,5 @@
                 <div class="tab-content history-tab-content">
                     <div class="tab-pane in active" id="regis">
-						<div class="col-sm-12">
+						<div>
 							<h5>TÃ i khoáº£n SBG Online: <b><span class="blue"><span id="topup-money"><?php echo number_format($acc_balanced, 0); ?></span> VNÄ <span></b></h5>
 						</div>
