Changeset 420 for pro-violet-viettel/sourcecode/application/modules

Timestamp:

Nov 5, 2014 3:19:27 PM (11 years ago)

Author:

quyenla

Message:

fix

Location:

pro-violet-viettel/sourcecode/application/modules/admin

Files:

• models/collabolator_model.php (modified) (1 diff)
• views/collaborator/listview.php (modified) (2 diffs)

pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php

@@ -24 +24 @@
         $order = "";
         if ($data['sorting_order'] != "sorting") {
-            if ($data['sorting_field'] != "money") {
+            
                 $sort = "DESC";
                 if ($data['sorting_order'] == "sorting_asc")
                     $sort = "ASC";
                 $order = "ORDER BY " . $data['sorting_field'] . " " . $sort;
-            }
+            
         }
        

pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/listview.php

@@ -86 +86 @@
                                 <th class="<?php if ($sorting_field == 'full_name') {echo $sorting_order;} else {echo "sorting";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 183px;" aria-label="Họ tên: activate to sort column ascending">Họ tê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="sorting" id="money" 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>
+                                
                                 <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: 209px;" 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=='activated') {echo $sorting_order;} else {echo "sorting";}?>" id="activated" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 158px;" aria-label="Trạng thái: activate to sort column ascending">Trạng thái</th><th class="sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 133px;" aria-label=""></th></tr>
+                                <th class="<?php if ($sorting_field=='activated') {echo $sorting_order;} else {echo "sorting";}?>" id="activated" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 158px;" aria-label="Trạng thái: activate to sort column ascending">Trạng thái</th>
+                                <th class="sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 133px;" aria-label="">Chức năng</th></tr>
                         </thead>
 
@@ -113 +114 @@
                                     <a href="#"><?php echo $collaborator['cellphone']?></a>
                                 </td>
-                                <td class="hidden-480 ">3,330 VND</td>
+                
                                 <td class=" "><?php echo $collaborator['created_time']?></td>