Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 396)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 408)
@@ -51,5 +51,4 @@
                 }
             }
-			console.log($( this ).attr('class'));
             $("#sorting_field").val($(this).attr("id"));
             $("#sorting_order").val($(this).attr("class"));
@@ -104,5 +103,5 @@
 
             <div class="modal-body">
-                <form id="add_user" onsubmit="return false;" class="form-horizontal" role="form">
+                <form id="add_frm" onsubmit="return false;" class="form-horizontal" role="form">
                     <div class="form-group">
                         <label class="col-sm-3 control-label no-padding-right" for="form-field-1"> Sá» Äiá»n thoáº¡i </label>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 396)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 408)
@@ -41,5 +41,4 @@
             <div style="padding-bottom:4px" class="table-header">
                 Danh sÃ¡ch
-
                 <button href="#addUser" data-toggle="modal" class="btn btn-success pull-right">
                     <i class="icon-plus"></i>
@@ -55,5 +54,5 @@
                             <div class="col-sm-6">
                                 <div id="sample-table-2_length" class="dataTables_length"><label>Hiá»n thá» 
-                                        <select onchange="filter();" name="items" size="1" aria-controls="sample-table-2">                                      
+                                        <select onchange="filter();" name="items" size="1" aria-controls="sample-table-2">
                                             <?php foreach ($itemsoptions as $option) { ?>
                                             <option <?php if($option == $perpage) echo "selected"; ?> value="<?=$option?>"><?=$option?></option>
@@ -63,5 +62,5 @@
                                 </div>
                             </div>
-
+								
                             <div class="col-sm-6">
                                 <div class="dataTables_filter" id="sample-table-2_filter">
@@ -70,5 +69,15 @@
                                 </div>
                             </div>
+							<div class="col-sm-6">
+                                <div class="dataTables_status" id="sample-table-2_status"><label>Lá»c
+									<select onchange="filter();" name="status" size="1" aria-controls="sample-table-2" class="">                                      
+										<?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>
                         </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;?>"/>
@@ -83,4 +92,5 @@
                                     </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">TÃ i khoáº£n</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: 122px;" aria-label="Tiá»n: activate to sort column ascending">Tiá»n</th>
@@ -93,5 +103,6 @@
                                     NgÃ y háº¿t háº¡n
                                 </th>
-                                <th class="sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 133px;" aria-label=""></th></tr>
+								<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>
+                            </tr>
                         </thead>
 
@@ -108,69 +119,23 @@
                                     </label>
                                 </td>
-
+								<td class=" ">
+                                    <a href="#"><?php echo $user['username']; ?></a>
+                                </td>
                                 <td class=" ">
-                                    <a href="#"><?php echo $user['cellphone']; ?></a>
+                                    <?php echo $user['cellphone']; ?>
                                 </td>
-                                <td class="hidden-480 "><?php echo $user['acc_balanced']; ?></td>
+                                <td class="hidden-480 "><?php echo $user['acc_balanced']. " VNÄ"; ?></td>
                                 <td class=" "><?php echo $user['created_time']; ?></td>
 								<td class=" "><?php echo $user['expire_date']; ?></td>
+								<td class=" ">
+								<?php  if(strtotime($user['expire_date'])>time()){ ?>
+									<span class="label label-sm label-success">ÄÃ£ kÃ­ch hoáº¡t</span>
+								<?php }else{ ?>
+									<span class="label label-sm label-warning">Táº¡m ngÆ°ng</span>
+								<?php } ?>
+								</td>
 
-                                <td class=" ">
-                                    <div class="visible-md visible-lg hidden-sm hidden-xs action-buttons">
-                                        <a href="#" class="blue">
-                                            <i class="icon-zoom-in bigger-130"></i>
-                                        </a>
-
-                                        <a href="#editUser" data-toggle="modal" data-us-id=<?php echo $user['us_id']; ?> class="green">
-                                            <i class="icon-pencil bigger-130"></i>
-                                        </a>
-
-                                        <a href="#deleteUser" data-toggle="modal" data-us-id=<?php echo $user['us_id']; ?> class="red">
-                                            <i class="icon-trash bigger-130"></i>
-                                        </a>
-                                    </div>
-
-                                    <div class="visible-xs visible-sm hidden-md hidden-lg">
-                                        <div class="inline position-relative">
-                                            <button data-toggle="dropdown" class="btn btn-minier btn-yellow dropdown-toggle">
-                                                <i class="icon-caret-down icon-only bigger-120"></i>
-                                            </button>
-
-                                            <ul class="dropdown-menu dropdown-only-icon dropdown-yellow pull-right dropdown-caret dropdown-close">
-                                                <li>
-                                                    <a title="" data-rel="tooltip" class="tooltip-info" href="#" data-original-title="View">
-                                                        <span class="blue">
-                                                            <i class="icon-zoom-in bigger-120"></i>
-                                                        </span>
-                                                    </a>
-                                                </li>
-
-                                                <li>
-                                                    <a title="" data-rel="tooltip" class="tooltip-success" href="#" data-original-title="Edit">
-                                                        <span class="green">
-                                                            <i class="icon-edit bigger-120"></i>
-                                                        </span>
-                                                    </a>
-                                                </li>
-
-                                                <li>
-                                                    <a title="" data-rel="tooltip" class="tooltip-error" href="#" data-original-title="Delete">
-                                                        <span class="red">
-                                                            <i class="icon-trash bigger-120"></i>
-                                                        </span>
-                                                    </a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </td>
                             </tr>
                             <?php } ?>
-
-
-
-
-
-
 
                         </tbody></table><div class="row"><div class="col-sm-6">
