Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 644)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 690)
@@ -16,4 +16,5 @@
                     $("#content").html(data);
                     init_page();
+					$('.daterangepicker').daterangepicker();
                 },
                 error: function (jqXHR, textStatus, errorThrown)
@@ -24,5 +25,23 @@
             return false;
         });
-		$('#keyword').bind('input', function(){
+		$('#keyword').keyup(function (event) {
+            if (event.keyCode == '13') {
+                filter();
+            }
+            return false;
+        });
+		/*$('#keyword').bind('input', function(){
+			filter();
+		});*/
+		$('#daterange').keyup(function (event) {
+            if (event.keyCode == '13') {
+                filter();
+            }
+            return false;
+        });
+		
+		$(document).on('click', '.applyBtn', function(){
+			$('#loading').css('display', 'block');
+			$('#table_content').hide();
 			filter();
 		});
@@ -59,4 +78,5 @@
 	function filter()
 	{
+		daterange = $('input[name="daterange"]').val();
 		$.ajax({
 			url: '<?php echo base_url();?>admin/nguoi_dung/trang/1',
@@ -65,9 +85,12 @@
 			success: function (data, textStatus, jqXHR)
 			{
+				$('#loading').css('display', 'none');
+				$('#table_content').show();
 				$("#content").html(data);
 				init_page();
 				$("#keyword").focus();
 				$("#keyword").setCursorToTextEnd();
-
+				$('.daterangepicker').daterangepicker();
+				$('input[name="daterange"]').val(daterange);
 			},
 			error: function (jqXHR, textStatus, errorThrown)
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 644)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 690)
@@ -66,12 +66,20 @@
                                 <div class="dataTables_filter" id="sample-table-2_filter">
                                     <label>TÃ¬m kiáº¿m: 
-                                        <input type="text" name="keyword" id="keyword" value='<?php echo $keyword;?>' aria-controls="sample-table-2"></label>
+                                        <input type="text" name="keyword" id="keyword" value='<?php echo $keyword;?>' style="width: 162px; height: 18px;" aria-controls="sample-table-2"></label>
                                 </div>
 								<div class="dataTables_status" style="float: right;" id="sample-table-2_status"><label>Lá»c:
-									<select onchange="filter();" name="status" size="1" style="width: 139px; height: 28px;" aria-controls="sample-table-2" class="">                                      
+									<select onchange="filter();" name="status" size="1" style="width: 176px; height: 28px;">                                      
 										<?php foreach ($statusoptions as $key=>$option):?>
 										<option <?php if ($key == $status) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $option; ?></option>
 										<?php endforeach; ?>
 									</select>
+								</div>
+								<div style="clear: both;"></div>
+								<div id="daterangepicker" class="selectbox pull-right">
+									<i class="icon-calendar"></i>
+									<input id="daterange" type="text" name="daterange" class="daterangepicker" style="background: #ffffff; width: 176px; height: 28px; position: inherit;">
+										
+									</span>
+								</div>
 								</div>
                             </div>
@@ -82,4 +90,7 @@
 						<input type="hidden" name="sorting_field" id="sorting_field" value="<?php echo $sorting_field;?>"/>
                     </form>
+					<!-- Table Content -->
+					<center><div id="loading" style="display:none;"><img src="<?php echo base_url();?>/assets/img/loading.gif"/></div></center>
+					<div id="table_content">
                     <table class="table table-striped table-bordered table-hover dataTable" id="sample-table-2" aria-describedby="sample-table-2_info">
                         <thead>
@@ -91,16 +102,18 @@
                                     </label>
                                 </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: 176px;" aria-label="TÃ i khoáº£n: activate to sort column ascending">Username</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: 176px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">Sá» Äiá»n thoáº¡i</th>
-                                <th class="<?php if ($sorting_field == 'acc_balanced') {echo $sorting_order;} else {echo "sorting";}?>" id="acc_balanced" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Tiá»n: activate to sort column ascending">TÃ i khoáº£n (VNÄ)</th>
-                                <th class="<?php if ($sorting_field == 'created_time') {echo $sorting_order;} else {echo "sorting";}?>" id="created_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 150px;" aria-label="NgÃ y ÄÄng kÃœ: activate to sort column ascending">
+								<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="TÃ i khoáº£n: activate to sort column ascending">Username</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">Sá» Äiá»n thoáº¡i</th>
+                                <th class="<?php if ($sorting_field == 'acc_balanced') {echo $sorting_order;} else {echo "sorting";}?>" id="acc_balanced" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="Tiá»n: activate to sort column ascending">TÃ i khoáº£n (VNÄ)</th>
+								<th style="width: 140px;">Quáº­n/Huyá»n</th>
+								<th style="width: 140px;">Tá»nh/TP</th>
+                                <th class="<?php if ($sorting_field == 'created_time') {echo $sorting_order;} else {echo "sorting";}?>" id="created_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="NgÃ y ÄÄng kÃœ: activate to sort column ascending">
                                     <i class="icon-time bigger-110 hidden-480"></i>
                                     NgÃ y ÄÄng kÃœ
                                 </th>
-								<th class="<?php if ($sorting_field == 'expire_date') {echo $sorting_order;} else {echo "sorting";}?>" id="expire_date" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 150px;" aria-label="NgÃ y háº¿t háº¡n: activate to sort column ascending">
+								<th class="<?php if ($sorting_field == 'expire_date') {echo $sorting_order;} else {echo "sorting";}?>" id="expire_date" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 140px;" aria-label="NgÃ y háº¿t háº¡n: activate to sort column ascending">
                                     <i class="icon-time bigger-110 hidden-480"></i>
                                     NgÃ y háº¿t háº¡n
                                 </th>
-								<th class="sorting_disabled" id="status" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;">TÃ¬nh tráº¡ng</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>
                         </thead>
@@ -119,5 +132,5 @@
                                 </td>
 								<td class=" ">
-                                    <a onclick="getUserHistory(<?php echo $user['us_id']; ?>, 1);" data-toggle="modal"><?php echo @$user['username']; ?></a>
+                                    <a onclick="getUserHistory(<?php echo $user['us_id']; ?>, 1);" data-toggle="modal"><?php echo $user['username']; ?></a>
 									 <!--<a href="#user-history" data-toggle="modal"><?php echo @$user['username']; ?></a>-->
                                 </td>
@@ -126,6 +139,9 @@
                                 </td>
                                 <td class="hidden-480 "><?php echo number_format($user['acc_balanced'], 0); ?></td>
+								<td><?php echo $user['district']; ?></td>
+								<td><?php echo $user['province']; ?></td>
                                 <td class=" "><?php echo $user['created_time']; ?></td>
 								<td class=" "><?php echo isset($user['expire_date']) && strtotime($user['expire_date'])>0 ? date('d/m/Y', strtotime($user['expire_date'])) : '';?></td>
+
 								<td class=" ">
 								<?php  if(strtotime($user['expire_date'])>time()){ ?>
@@ -151,4 +167,5 @@
 								</div>
 							</div>
+						</div>
 						</div>
 
@@ -249,4 +266,3 @@
     }
 
-
 </script>
