Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/report.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/report.php	(revision 442)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/report.php	(revision 444)
@@ -6,5 +6,6 @@
 class Report extends MX_Controller {
 
-    const TOKENPW = 'violet';
+const TOKENPW = 'violet';
+
     public function __construct() {
         parent::__construct();
@@ -16,5 +17,5 @@
         $admin_info = $this->session->userdata('adminInfo');
         if ($admin_info) {
-            $data['statistics'] = $this->getStatistics();           
+            $data['statistics'] = $this->getStatistics();
             $data['content'] = $this->getPaidlogs();
             $this->load->view('report/index', $data);
@@ -23,84 +24,128 @@
         }
     }
-    public function getStatistics()
-    {
-        $data=array();
-        
-        $last_month['start']= strtotime(date("Y-m-d", strtotime("first day of previous month"))." 00:00:00");
-        $last_month['end']= strtotime(date("Y-m-d", strtotime("last day of previous month"))." 23:59:59");
-        
-        $last_week['start']= strtotime(date("Y-m-d", strtotime("first day of previous week"))." 00:00:00");
-        $last_week['end']= strtotime(date("Y-m-d", strtotime("last day of previous week"))." 23:59:59");
-        
-        $last_week['end']=strtotime('last sunday')+(24*60*60-1);
-        $last_week['start']=($last_week['end']-7*24*60*60+1);
-        
-        $last_year['start']=  strtotime((date("Y")-1)."-01-01 00:00:00");
-        $last_year['end']=  strtotime((date("Y")-1)."-12-31 23:59:59");
-        
-        
-        
-        $last_quarter=$this->getLastquarter();
-        $last_quarter['start']=  $last_quarter['start'];
-        $last_quarter['end']=  $last_quarter['end'];
-        
-        
+
+    public function getStatistics() {
+        $data = array();
+
+        $last_month['start'] = strtotime(date("Y-m-d", strtotime("first day of previous month")) . " 00:00:00");
+        $last_month['end'] = strtotime(date("Y-m-d", strtotime("last day of previous month")) . " 23:59:59");
+
+        $last_week['start'] = strtotime(date("Y-m-d", strtotime("first day of previous week")) . " 00:00:00");
+        $last_week['end'] = strtotime(date("Y-m-d", strtotime("last day of previous week")) . " 23:59:59");
+
+        $last_week['end'] = strtotime('last sunday') + (24 * 60 * 60 - 1);
+        $last_week['start'] = ($last_week['end'] - 7 * 24 * 60 * 60 + 1);
+
+        $last_year['start'] = strtotime((date("Y") - 1) . "-01-01 00:00:00");
+        $last_year['end'] = strtotime((date("Y") - 1) . "-12-31 23:59:59");
+
+
+
+        $last_quarter = $this->getLastquarter();
+        $last_quarter['start'] = $last_quarter['start'];
+        $last_quarter['end'] = $last_quarter['end'];
+
+
         $this->load->model('paidlog_model');
         $paidlogs = $this->paidlog_model->getAllPaidlogs($last_year['start']);
-        
-        $revenue['last_week']=0;
-        $revenue['last_month']=0;
-        $revenue['last_quarter']=0;
-        $revenue['last_year']=0;
-        foreach ($paidlogs as $paidlog)
-        {
-            
-            if (($paidlog['time'] < $last_week['end'])&&($paidlog['time'] > $last_week['start']))
-            {
+
+        $revenue['last_week'] = 0;
+        $revenue['last_month'] = 0;
+        $revenue['last_quarter'] = 0;
+        $revenue['last_year'] = 0;
+
+        $lastmonth = strtotime("first day of previous month");
+        $thismonth = strtotime("first day of this month");
+        $charts['last_month'] = array(0 => 0, 1 => 0, 2 => 0, 3 => 0, 4 => 0);
+        $charts['this_month'] = array(0 => 0, 1 => 0, 2 => 0, 3 => 0, 4 => 0);
+        foreach ($paidlogs as $paidlog) {
+
+            if (($paidlog['time'] < $last_week['end']) && ($paidlog['time'] > $last_week['start'])) {
                 $revenue['last_week']+=$paidlog['amount'];
             }
-            if (($paidlog['time'] < $last_month['end'])&&($paidlog['time'] > $last_month['start']))
-            {
+            if (($paidlog['time'] < $last_month['end']) && ($paidlog['time'] > $last_month['start'])) {
                 $revenue['last_month']+=$paidlog['amount'];
             }
-            if (($paidlog['time'] < $last_quarter['end'])&&($paidlog['time'] > $last_quarter['start']))
-            {
+            if (($paidlog['time'] < $last_quarter['end']) && ($paidlog['time'] > $last_quarter['start'])) {
                 $revenue['last_quarter']+=$paidlog['amount'];
             }
-            if (($paidlog['time'] < $last_year['end'])&&($paidlog['time'] > $last_year['start']))
-            {
+            if (($paidlog['time'] < $last_year['end']) && ($paidlog['time'] > $last_year['start'])) {
                 $revenue['last_year']+=$paidlog['amount'];
             }
-        }
-        $data['revenue']=$revenue;
+            if (($paidlog['time'] < $lastmonth + (7 * 24 * 60 * 60)) && ($paidlog['time'] > $lastmonth)) {
+                $charts['last_month'][0]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $lastmonth + (14 * 24 * 60 * 60)) && ($paidlog['time'] > $lastmonth + (7 * 24 * 60 * 60))) {
+                $charts['last_month'][1]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $lastmonth + (21 * 24 * 60 * 60)) && ($paidlog['time'] > $lastmonth + (14 * 24 * 60 * 60))) {
+                $charts['last_month'][2]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $lastmonth + (28 * 24 * 60 * 60)) && ($paidlog['time'] > $lastmonth + (21 * 24 * 60 * 60))) {
+                $charts['last_month'][3]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $thismonth) && ($paidlog['time'] > $lastmonth + (28 * 24 * 60 * 60))) {
+                $charts['last_month'][3]+=$paidlog['amount'];
+            }
+
+            if (($paidlog['time'] < $thismonth + (7 * 24 * 60 * 60)) && ($paidlog['time'] > $thismonth)) {
+                $charts['this_month'][0]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $thismonth + (14 * 24 * 60 * 60)) && ($paidlog['time'] > $thismonth + (7 * 24 * 60 * 60))) {
+                $charts['this_month'][1]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $thismonth + (21 * 24 * 60 * 60)) && ($paidlog['time'] > $thismonth + (14 * 24 * 60 * 60))) {
+                $charts['this_month'][2]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $thismonth + (28 * 24 * 60 * 60)) && ($paidlog['time'] > $thismonth + (21 * 24 * 60 * 60))) {
+                $charts['this_month'][3]+=$paidlog['amount'];
+            }
+            if (($paidlog['time'] < $thismonth + (31 * 24 * 60 * 60)) && ($paidlog['time'] > $thismonth + (28 * 24 * 60 * 60))) {
+                $charts['this_month'][3]+=$paidlog['amount'];
+            }
+        }
+        $max = 0;
+        foreach ($charts['last_month'] as $index => $total) {
+            if ($total > $max) {
+                $max = $total;
+            }
+            $chart_last_month[] = array($index, $total);
+        }
+        foreach ($charts['this_month'] as $index => $total) {
+            if ($total > $max) {
+                $max = $total;
+            }
+            $chart_this_month[] = array($index, $total);
+        }
+
+        $data['revenue'] = $revenue;
+        $data['max'] = $max;
+        $chard[] = array("color" => "#1abc9c", "label" => "ThÃ¡ng hiá»n táº¡i", "data" => $chart_this_month);
+        $chard[] = array("color" => "#3498db", "label" => "ThÃ¡ng trÆ°á»c", "data" => $chart_last_month);
+        $data['chard'] = $chard;
+
         return $this->load->view('report/statistics', $data, true);
     }
-    public function getLastquarter()
-    {
+
+    public function getLastquarter() {
         $current_month = date('m');
-          $current_year = date('Y');
-
-          if($current_month>=1 && $current_month<=3)
-          {
-            $start_date = strtotime('1-October-'.($current_year-1));  // timestamp or 1-October Last Year 12:00:00 AM
-            $end_date = strtotime('1-Janauary-'.$current_year);  // // timestamp or 1-January  12:00:00 AM means end of 31 December Last year
-          } 
-          else if($current_month>=4 && $current_month<=6)
-          {
-            $start_date = strtotime('1-January-'.$current_year);  // timestamp or 1-Janauray 12:00:00 AM
-            $end_date = strtotime('1-April-'.$current_year);  // timestamp or 1-April 12:00:00 AM means end of 31 March
-          }
-          else  if($current_month>=7 && $current_month<=9)
-          {
-            $start_date = strtotime('1-April-'.$current_year);  // timestamp or 1-April 12:00:00 AM
-            $end_date = strtotime('1-July-'.$current_year);  // timestamp or 1-July 12:00:00 AM means end of 30 June
-          }
-          else  if($current_month>=10 && $current_month<=12)
-          {
-            $start_date = strtotime('1-July-'.$current_year);  // timestamp or 1-July 12:00:00 AM
-            $end_date = strtotime('1-October-'.$current_year);  // timestamp or 1-October 12:00:00 AM means end of 30 September
-          }
-          return array("start"=>$start_date,"end"=>$end_date);
-    }
+        $current_year = date('Y');
+
+        if ($current_month >= 1 && $current_month <= 3) {
+            $start_date = strtotime('1-October-' . ($current_year - 1));  // timestamp or 1-October Last Year 12:00:00 AM
+            $end_date = strtotime('1-Janauary-' . $current_year);  // // timestamp or 1-January  12:00:00 AM means end of 31 December Last year
+        } else if ($current_month >= 4 && $current_month <= 6) {
+            $start_date = strtotime('1-January-' . $current_year);  // timestamp or 1-Janauray 12:00:00 AM
+            $end_date = strtotime('1-April-' . $current_year);  // timestamp or 1-April 12:00:00 AM means end of 31 March
+        } else if ($current_month >= 7 && $current_month <= 9) {
+            $start_date = strtotime('1-April-' . $current_year);  // timestamp or 1-April 12:00:00 AM
+            $end_date = strtotime('1-July-' . $current_year);  // timestamp or 1-July 12:00:00 AM means end of 30 June
+        } else if ($current_month >= 10 && $current_month <= 12) {
+            $start_date = strtotime('1-July-' . $current_year);  // timestamp or 1-July 12:00:00 AM
+            $end_date = strtotime('1-October-' . $current_year);  // timestamp or 1-October 12:00:00 AM means end of 30 September
+        }
+        return array("start" => $start_date, "end" => $end_date);
+    }
+
     public function getPaidlogs($filters = array()) {
         $this->load->helper('pagging');
@@ -110,12 +155,11 @@
         $data['perpage'] = 10;
         $data['keyword'] = "";
-        $data['sorting_order']="sorting_desc";
-        $data['sorting_field']="paid_id";
-        
+        $data['sorting_order'] = "sorting_desc";
+        $data['sorting_field'] = "paid_id";
+
         if ($this->input->post('sorting_order')) {
-            if ($this->input->post('sorting_order') != "sorting")
-            {
-               $data['sorting_order']=$this->input->post('sorting_order');
-               $data['sorting_field']=$this->input->post('sorting_field'); 
+            if ($this->input->post('sorting_order') != "sorting") {
+                $data['sorting_order'] = $this->input->post('sorting_order');
+                $data['sorting_field'] = $this->input->post('sorting_field');
             }
         }
@@ -124,16 +168,14 @@
         }
         if ($this->input->post('keyword')) {
-            $data['search_field']="";
+            $data['search_field'] = "";
             $data['keyword'] = $this->input->post('keyword');
-            
-            if (preg_match("/[0-9]/", $data['keyword']))
-            {
-               $data['search_field']="cellphone"; 
-            }
-            
-        }
-        
-        $data['start'] = ($data['current_page'] - 1) * $data['perpage'];    
-        $data['total'] = $this->paidlog_model->countPaidlog($data);  
+
+            if (preg_match("/[0-9]/", $data['keyword'])) {
+                $data['search_field'] = "cellphone";
+            }
+        }
+
+        $data['start'] = ($data['current_page'] - 1) * $data['perpage'];
+        $data['total'] = $this->paidlog_model->countPaidlog($data);
         $data['paidlogs'] = $this->paidlog_model->getPaidlogs($data);
 
@@ -141,9 +183,8 @@
         $data['num_links'] = 2;
         $data['paging'] = pagging($data);
-        foreach ($data['paidlogs'] as $index=>$paidlog)
-        {
-        $data['paidlogs'][$index]['username']= @$this->get_username($paidlog['us_id']);
-        }
-      
+        foreach ($data['paidlogs'] as $index => $paidlog) {
+            $data['paidlogs'][$index]['username'] = $this->get_username($paidlog['us_id']);
+        }
+
         if ($this->input->is_ajax_request()) {
             return $this->load->view('report/listview', $data);
@@ -151,169 +192,43 @@
         return $this->load->view('report/listview', $data, true);
     }
-    public function get_username($us_id)
-	{
-        $us_id=33;
-		$src = 'violet';
-		$token = md5($us_id.self::TOKENPW);
-		$this->load->model('user_model');
-		$data = $this->user_model->get_user_info($src, $us_id, $token);
-		if (strlen($data) > 0){
-			$arr_users = explode("&", $data);
-			$str_username = $arr_users[1];
-			$arr_username = explode("=", $str_username);
-			return $arr_username[1];
-		}else
-		{
-			return "";
-		}
-
-	}
-
-    public function addPaidlog() {
-        $result['success'] = 0;
-        $result = array();
-        $input = $this->input->post();
-        $this->load->model('paidlog_model');
-        if (strlen($input['sms_content'])==0)
-        {
-            $result['errors'][]="Ná»i dung tin nháº¯n khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        if (strlen($input['sms_reply'])==0)
-        {
-            $result['errors'][]="Tin nháº¯n tráº£ vá» khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        else
-        {
-            /*
-            if ($this->paidlog_model->isExist(array('field'=>'login_name','value'=>$input['login_name'],'id'=>$input['id'])))
-            {
-                $result['errors'][]="TÃªn ÄÄng nháº­p ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng";
-            }
-             * 
-             */
-        }
-        if (strlen($input['service_id'])==0)
-        {
-            $result['errors'][]="MÃ£ dá»ch vá»¥ khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        else
-        {
-            /*
-            if ($this->paidlog_model->isExist(array('field'=>'cellphone','value'=>$input['cellphone'],'id'=>$input['id'])))
-            {
-                $result['errors'][]="Sá» Äiá»n thoáº¡i ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng";
-            }
-             * 
-             */
-        }
-        if (!isset($result['errors']))
-        {
+
+    public function get_username($us_id) {
+        $src = 'violet';
+        $token = md5($us_id . self::TOKENPW);
+        $this->load->model('user_model');
+        $data = $this->user_model->get_user_info($src, $us_id, $token);
+        if (strlen($data) > 0) {
+            $arr_users = explode("&", $data);
+            $str_username = $arr_users[1];
+            $arr_username = explode("=", $str_username);
+            return $arr_username[1];
+        } else {
+            return "";
+        }
+    }
+
+    public function test() {
+
+
+        for ($i = 1; $i <= 5000; $i++) {
+            $input['us_id'] = rand(1, 100);
+            $input['paid_type'] = rand(1, 2);
+            $input['amount'] = rand(3, 10) * 1000;
+            $time = (rand((time() - (12 * 30 * 24 * 60 * 60)), time()));
+            $input['paid_time'] = date("Y-m-d H:i:s", $time);
             $this->load->model('paidlog_model');
             $this->paidlog_model->insert($input);
-            $result['success'] = 1;
-        }
-
-        
-        echo json_encode($result);
-    }
-    public function viewSms()
-    {
-        $id=$this->uri->segment(4);
-        $this->load->model('paidlog_model');
-        $data=$this->paidlog_model->getPaidlog($id);
-        $this->load->view('report/viewSms',$data);
-    }
-    public function editSms()
-    {
-        $id=$this->uri->segment(4);
-        $this->load->model('paidlog_model');
-        $data=$this->paidlog_model->getPaidlog($id);
-        $this->load->view('report/editSms',$data);
-    }
-    public function dodeleteSms()
-    {
-        $input=$this->input->post();
-        $id=$input['sms_id'];
-        $this->load->model('paidlog_model');
-        $data=$this->paidlog_model->delete($id);
-        $result['success']=1;
-        echo json_encode($result);
-    }
-    public function deleteSms()
-    {
-        $id=$this->uri->segment(4);
-        $this->load->model('paidlog_model');
-        $data=$this->paidlog_model->getPaidlog($id);
-        $this->load->view('report/deleteSms',$data);
-    }
-    public function updateSms()
-    {
-       
-        $input=  $this->input->post();
-        $this->load->model('paidlog_model');
-        if (strlen($input['sms_content'])==0)
-        {
-            $result['errors'][]="Ná»i dung tin nháº¯n khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        if (strlen($input['sms_reply'])==0)
-        {
-            $result['errors'][]="Tin nháº¯n tráº£ vá» khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        else
-        {
-            /*
-            if ($this->paidlog_model->isExist(array('field'=>'login_name','value'=>$input['login_name'],'id'=>$input['id'])))
-            {
-                $result['errors'][]="TÃªn ÄÄng nháº­p ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng";
-            }
-             * 
-             */
-        }
-        if (strlen($input['service_id'])==0)
-        {
-            $result['errors'][]="MÃ£ dá»ch vá»¥ khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        else
-        {
-            /*
-            if ($this->paidlog_model->isExist(array('field'=>'cellphone','value'=>$input['cellphone'],'id'=>$input['id'])))
-            {
-                $result['errors'][]="Sá» Äiá»n thoáº¡i ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng";
-            }
-             * 
-             */
-        }
-        
-        if (!isset($result['errors']))
-        { 
-            $this->load->model('paidlog_model');
-            $this->paidlog_model->update($input['sms_id'],$input);
-            $result['success'] = 1;
-        }
-        echo json_encode($result);
-    }
-    public function test() {
-        
-      
-        for ($i = 1; $i <= 5000; $i++) {
-            $input['us_id']=rand(1,100);
-            $input['paid_type']=rand(1,2);
-            $input['amount']=rand(3,10)*1000;
-            $time=(rand((time()-(12*30*24*60*60)),time()));
-            $input['paid_time']= date("Y-m-d H:i:s",$time);
-            $this->load->model('paidlog_model');
-            $this->paidlog_model->insert($input);
-        }
-        
-       die(); 
-      
+        }
+
+        die();
+
         for ($i = 1; $i <= 100; $i++) {
-            $input['us_id']=$i;
-            $input['cellphone']="01234567".(100+$i);
-            $input['collaborator']=rand(1,100);
-            $input['acc_balanced']=rand(100000,1000000);
-            $input['expire_date']=date("Y-m-d H:i:s",time());
-            $input['created_time']=date("Y-m-d H:i:s",time());
-            $input['updated_time']=date("Y-m-d H:i:s",time());
+            $input['us_id'] = $i;
+            $input['cellphone'] = "01234567" . (100 + $i);
+            $input['collaborator'] = rand(1, 100);
+            $input['acc_balanced'] = rand(100000, 1000000);
+            $input['expire_date'] = date("Y-m-d H:i:s", time());
+            $input['created_time'] = date("Y-m-d H:i:s", time());
+            $input['updated_time'] = date("Y-m-d H:i:s", time());
             $this->load->model('user_model');
             $this->user_model->insert($input);
