Changeset 737


Ignore:
Timestamp:
Feb 3, 2015 4:54:25 PM (10 years ago)
Author:
dungnv
Message:
 
Location:
pro-violet-viettel/sourcecode/application
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • pro-violet-viettel/sourcecode/application/modules/admin/controllers/reportprovince.php

    r713 r737  
    100100        }
    101101        $writer = new PHPExcel_Writer_Excel5($this->phpexcel);
     102                header('Content-Type: application/vnd.ms-excel');
    102103        header('Content-Disposition: attachment; filename="thue_bao_' . $data['month'] . "_" . $data['year'] . '.xls"');
    103104        $writer->save('php://output');

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

    r736 r737  
    4646        return $this->db->query($sql . " " . $order . " LIMIT " . $data['start'] . ", " . $data['perpage'] . " ")->result_array();
    4747    }
     48
    4849    function getAllCollaboratorUser($from,$id=false)
    4950    {
    … …  
    5455            $where = " AND tbluser.collaborator = $id ";
    5556        }
    56         $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id WHERE tbluser.created_time > '".$from."'".$where."";
     57        //$sql="SELECT *,tblcollaborator.created_time as collaborator_created_time, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id WHERE tbluser.created_time > '".$from."'".$where."";
     58
     59                $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.cellphone WHERE tbluser.created_time > '".$from."'".$where."";
    5760
    5861        $result = $this->db->query($sql)->result_array();
    … …  
    8386        }
    8487       // $from = date("Y-m-d 00:00:00",$from);
    85         $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time, COUNT(tbluser.collaborator) as total_user  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." GROUP BY tblcollaborator.id ".$order." ";
     88        //$sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time, COUNT(tbluser.collaborator) as total_user  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." GROUP BY tblcollaborator.id ".$order." ";
     89
     90                $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time, COUNT(tbluser.collaborator) as total_user  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.cellphone ".$where." GROUP BY tblcollaborator.id ".$order." ";
    8691       
    8792        $result = $this->db->query($sql)->result_array();
    … …  
    112117               
    113118       // $from = date("Y-m-d 00:00:00",$from);
    114         $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time, COUNT(tbluser.collaborator) as total_user  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." GROUP BY tblcollaborator.id ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
     119        //$sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time, COUNT(tbluser.collaborator) as total_user  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." GROUP BY tblcollaborator.id ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
    115120       
     121                $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time, COUNT(tbluser.collaborator) as total_user  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.cellphone ".$where." GROUP BY tblcollaborator.id ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
     122
    116123        $result = $this->db->query($sql)->result_array();
    117124        foreach ($result as $index=>$paidlog)
    … …  
    141148        }
    142149       // $from = date("Y-m-d 00:00:00",$from);
    143         $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." AND tbluser.collaborator = ".$data['id']." ".$order."";
     150        //$sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." AND tbluser.collaborator = ".$data['id']." ".$order."";
    144151   
    145         $result = $this->db->query($sql)->result_array();
     152        $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.cellphone ".$where." AND tblcollaborator.id = ".$data['id']." ".$order."";
     153
     154                $result = $this->db->query($sql)->result_array();
    146155        foreach ($result as $index=>$paidlog)
    147156        {
    … …  
    169178        }
    170179       // $from = date("Y-m-d 00:00:00",$from);
    171         $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." AND tbluser.collaborator = ".$data['id']." ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
    172         $result = $this->db->query($sql)->result_array();
     180       // $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." AND tbluser.collaborator = ".$data['id']." ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
     181               
     182        $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.cellphone ".$where." AND tblcollaborator.id = ".$data['id']." ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
     183
     184                $result = $this->db->query($sql)->result_array();
    173185        foreach ($result as $index=>$paidlog)
    174186        {

  • pro-violet-viettel/sourcecode/application/modules/admin/views/reportAsistant/listview_user.php

    r573 r737  
    3535                    <table class="table table-striped table-bordered table-hover dataTable" id="sample-table-2" aria-describedby="sample-table-2_info">
    3636                        <thead>
    37                             <tr role="row">
    38                                
    39                                 <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>
     37                            <tr role="row">                               
     38                                <!--<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>-->
    4039                                <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ố điện thoại người dùng</th>
    4140                                <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> 
    42                                 <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>
     41                                <!--<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>-->
    4342                                 
    4443                        </thead>
    … …  
    5352                               
    5453
    55                                 <td class=" ">
    56 <?php echo $paidlog['username']; ?>
    57                                    
    58                                 </td>
    59                                 <td class=" "><?php echo $paidlog['user_cellphone']?></td>
    60                                
     54                                <!--<td class=" ">
     55                                                                        <?php echo $paidlog['username']; ?>                                   
     56                                </td>-->
     57                                <td class=" "><?php echo $paidlog['user_cellphone']?></td>                               
    6158                                <td class="hidden-480 "><?php echo $paidlog['user_created_time'];?></td>
    62                                 <td class="hidden-480 "><?php echo $paidlog['collaborator_created_time'];?></td>
    63                                
    64                                
    65 
    66                                
     59                                <!--<td class="hidden-480 "><?php echo $paidlog['collaborator_created_time'];?></td>-->
    6760                            </tr>
    6861                            <?php } ?>

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

    r728 r737  
    260260                           
    261261                                <div id="content-trade-histoty">
    262 
    263 
    264                
    265 
    266 
    267                                 </div>
    268                            
    269                            
     262                                </div>
     263                       
    270264                            </div>
    271265                        </div><!-- /.table-responsive -->

  • pro-violet-viettel/sourcecode/application/modules/frontend/views/lecture_editor.php

    r721 r737  
    113113        var url= "<?php echo base_url();?>";
    114114        var first_visit= "<?php echo $first_visit;?>";
    115         var p_period= "<?php echo $p_period;?>";
    116         var expire_date= "<?php echo $expire_date;?>";
     115    var p_period= "<?php echo $p_period;?>";
     116    var expire_date= "<?php echo $expire_date;?>";
    117117    var update_user_info="<?php echo $update_user_info;?>";
    118118    var us_id="<?php echo $us_id;?>";

  • pro-violet-viettel/sourcecode/application/views/layout/admin/sidebar.php

    r716 r737  
    6464                                                                                <i class="icon-double-angle-right"></i>
    6565                                                                                Người dùng
    66                                                                                 <b class="arrow icon-angle-down"></b>
     66                                                                                <!--<b class="arrow icon-angle-down"></b>-->
    6767                                                                        </a>
    6868
    69                                                                         <!--ul class="submenu">
     69                                                                        <!--<ul class="submenu">
    7070                                                                                <li class="<?php if(in_array($class,array("user"))) {echo "active";}?>"> <a href="<?php echo $base_url; ?>admin/nguoi_dung"> Kích hoạt/ Tạm ngÆ°ng </a> </li>
    7171                                                                                <li class="<?php if(in_array($class,array("user"))) {echo "active";}?>"> <a href="<?php echo $base_url; ?>admin/nguoi_dung"> Thống kê tài khoản </a> </li>
    72                                                                         </ul-->
     72                                                                        </ul>-->
    7373                                                                </li>
    7474
Note: See TracChangeset for help on using the changeset viewer.