Index: pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/index.php	(revision 883)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/index.php	(revision 906)
@@ -134,88 +134,19 @@
             <div class="modal-body">
                 <form id="add_user" 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"> TÃªn Äáº§y Äá»§ </label>
-
-                        <div class="col-sm-9">
-                            <label class="block clearfix has-error">
-                            <span class="input-icon">
-                                <input name="full_name" type="text" id="form-field-1" placeholder="TÃªn cá»ng tÃ¡c viÃªn">
-                                <i class="icon-user blue"></i>
-                            </span>
-                            <div id="full_name" class="help-block error"></div>
-                            </label>
-                        </div>
-                        <div class="help-block"> </div>
+					 <div class="row">
+						<div class="col-sm-9">
+							<div class="form-group">
+								<label for="cellphone" class="col-sm-4 control-label no-padding-right">Sá» Äiá»n thoáº¡i</label>
+																	
+									<div class="col-sm-8">
+										<input type="text" name="cellphone" placeholder="Sá» Äiá»n thoáº¡i" id="cellphone" class="col-xs-12 col-sm-10">
+									</div>
+									<label class="block clearfix has-error">	
+										<small><div class="col-sm-8 help-block error" id="cellphone"> </div></small>
+									</label>
+							</div>
+						</div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label no-padding-right" for="form-field-1"> TÃªn ÄÄng nháº­p </label>
-
-                        <div class="col-sm-9">
-                            <label class="block clearfix has-error">
-                            <span class="input-icon">
-                                <input name="login_name" type="text" id="form-field-1" placeholder="TÃ i khoáº£n">
-                                <i class="icon-user blue"></i>
-                            </span>
-                            <div id="login_name" class="help-block error"></div>
-                            </label>
-                        </div>
-                        <div class="help-block"> </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label no-padding-right" for="form-field-1"> Sá» Äiá»n thoáº¡i</label>
-
-                        <div class="col-sm-9">
-                            <label class="block clearfix has-error">
-                            <span class="input-icon">
-                                <input name="cellphone" type="text" id="form-field-1" placeholder="Sá» Äiá»n thoáº¡i">
-                                <i class="icon-user blue"></i>
-                            </span>
-                            <div id="cellphone" class="help-block error"></div>
-                            </label>
-                        </div>
-                        <div class="help-block"> </div>
-                    </div>
-                    <div class="space-4"></div>
-
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label no-padding-right" for="form-field-2"> Máº­t kháº©u </label>
-
-                        <div class="col-sm-9">
-                            <label class="block clearfix has-error">
-                            <span class="input-icon">
-                                <input type="password" name="passwd" id="form-field-2" placeholder="Máº­t kháº©u">
-                                <i class="icon-lock blue"></i>
-                            </span>
-                            <div id="passwd" class="help-block error"></div>
-                            </label>
-                        </div>
-                        <div class="help-block"> </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label no-padding-right" for="form-field-2"> Máº­t kháº©u </label>
-
-                        <div class="col-sm-9">
-                            <span class="input-icon">
-                                <input type="password" name="passwd2" id="form-field-2" placeholder="Nháº­p láº¡i máº­t kháº©u">
-                                <i class="icon-lock blue"></i>
-                            </span>
-                        </div>
-                        <div class="help-block"> </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label no-padding-right" for="form-field-1"> KÃ­ch hoáº¡t</label>
-
-                        <div class="col-sm-9">
-                            <span class="input-icon">
-                                <input type='checkbox' name="activated" checked="checked" value="1"  />
-                            </span>
-                        </div>
-                        <div class="help-block"> </div>
-                    </div>
-
-                    <div class="space-4"></div>
-                    <div class="form-group errors" id="add_user"></div>
-                        
-                    </div>
+					
                     <div class="clearfix form-actions">
                         <div class="col-md-offset-3 col-md-9">
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php	(revision 883)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php	(revision 906)
@@ -1,5 +1,5 @@
 <?php
-$admin_info = $this->session->userdata('adminInfo');
-$role_id = $admin_info['role_id'];
+//$admin_info = $this->session->userdata('adminInfo');
+//$role_id = $admin_info['role_id'];
 ?>
 <div id="breadcrumbs" class="breadcrumbs">
@@ -45,11 +45,15 @@
             <div style="padding-bottom:4px" class="table-header">
                 Thá»ng kÃª tÃ i khoáº£n
-                <?php if ($role_id == 1): ?>
-                    <button href="#addUser" data-toggle="modal" class="btn btn-success pull-right">
-                        <i class="icon-plus"></i>
-                        ThÃªm cá»ng tÃ¡c viÃªn
-                    </button>
-                <?php endif; ?>
-
+				<?php if (in_array("editUserInfo", $roles)) { ?>
+					<div class="col-xs-12 pull-right" style="margin:5px;">
+						<div class="form-group">
+							<!--<input  class="btn btn-primary pull-right " type="button" value="ThÃªm cá»ng tÃ¡c viÃªn" onclick="admin_update_user();"/>-->
+							<button href="#addUser" data-toggle="modal" class="btn btn-success pull-right">
+							<i class="icon-plus"></i>
+								ThÃªm cá»ng tÃ¡c viÃªn
+							</button>
+						</div>
+					</div>
+				<?php } ?>
             </div>
 
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/reportAsistant/listview_user.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/reportAsistant/listview_user.php	(revision 883)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/reportAsistant/listview_user.php	(revision 906)
@@ -44,5 +44,5 @@
                                 <th class="<?php if ($sorting_field == 'full_name') {echo $sorting_order;} else {echo "";}?>" id="full_name" 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">TÃªn ngÆ°á»i dÃ¹ng</th>
                                 <th class="<?php if ($sorting_field == 'collaborator_cellphone') {echo $sorting_order;} else {echo "sorting";}?>" id="collaborator_cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 283px;" aria-label="Há» tÃªn: activate to sort column ascending">Sá» thuÃª bao</th>
-                                <th class="<?php if ($sorting_field == 'total_user') {echo $sorting_order;} else {echo "sorting";}?>" id="total_user" 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">NgÃ y giá»i thiá»u</th>  
+                                <th class="<?php if ($sorting_field == 'user_created_time') {echo $sorting_order;} else {echo "sorting";}?>" id="user_created_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="NgÃ y giá»i thiá»u: activate to sort column ascending">NgÃ y giá»i thiá»u</th>  
                                 <!--<th class="<?php if ($sorting_field == 'collaborator_created_time') {echo $sorting_order;} else {echo "sorting";}?>" id="collaborator_created_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="NgÃ y ÄÄng kÃœ: activate to sort column ascending">NgÃ y ÄÄng kÃœ</th>-->
                                   
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php	(revision 883)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php	(revision 906)
@@ -10,5 +10,5 @@
                 <div class="pull-right" style="margin:5px;">
                     <!--<a style="color:#fff" href="<?php echo base_url();?>admin/reportprovince/export/<?php echo $month;?>/<?php echo $year;?>">Xuáº¥t ra Excel</a>-->
-					<a style="color:#fff" href="<?php echo base_url();?>admin/reportprovince/exportProvince/<?php echo $month;?>/<?php echo $year;?>">Xuáº¥t ra Excel</a>
+					<a style="color:#fff" href="<?php echo base_url();?>admin/reportprovince/exportProvince/<?php echo $to_date; ?>/<?php echo $month;?>/<?php echo $year;?>">Xuáº¥t ra Excel</a>
                 </div>
             </div>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 883)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 906)
@@ -47,5 +47,5 @@
 				<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>
+					<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)?$province:'default'; ?>/<?php echo ($district)?$district:'default';?>/<?php echo ($date_start)?$date_start:'default'; ?>/<?php echo ($date_end)?$date_end:'default'; ?>/<?php echo $sorting_order; ?>/<?php echo $sorting_field;?>">Xuáº¥t ra Excel</a>
 					
                 </div>
@@ -83,5 +83,5 @@
 								<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>
+										<option value=''>Táº¥t cáº£</option>
 						
 										<?php foreach ($provinces as $key => $pro): ?>
@@ -94,5 +94,5 @@
 									<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>
+											<option value=''>Táº¥t cáº£</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>
