Changeset 755 for pro-violet-viettel

Timestamp:

Feb 10, 2015 10:47:29 AM (10 years ago)

Author:

quyenla

Message:

report update

Location:

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

Files:

• controllers/reportpackage.php (modified) (1 diff)
• models/reportmodel.php (modified) (6 diffs)

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

@@ -90 +90 @@
         $chars = array("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L");
         $dem = 1;
+        $stt=1;
         foreach ($data['packages'] as $package) {
             $dem++;
-            $sheet->setCellValue($chars[$dem] . ($index + 4), $package['p_name']);
+            $sheet->setCellValue($chars[$dem] . ($stt + 4), $package['p_name']);
             $dem++;
-            $sheet->setCellValue($chars[$dem] . ($index + 4), "Tỉ lệ %");
+            $sheet->setCellValue($chars[$dem] . ($stt + 4), "Tỉ lệ %");
+        
+            $stt++;
         }
         $dem++;
         $sheet->setCellValue($chars[$dem] . ($index + 4), "Tổng TB");
 
-
+$stt=1;
         foreach ($data['provinces'] as $index => $provinces) {
 
-            $sheet->setCellValue('A' . ($index + 5), $provinces['stt']);
-            $sheet->setCellValue('B' . ($index + 5), $provinces['province']);
+            $sheet->setCellValue('A' . ($stt + 5), $provinces['stt']);
+            $sheet->setCellValue('B' . ($stt + 5), $provinces['province']);
             $dem = 1;
             foreach ($provinces['packages'] as $package) {
                 $dem++;
-                $sheet->setCellValue($chars[$dem] . ($index + 5), $package['total']);
+                $sheet->setCellValue($chars[$dem] . ($stt + 5), $package['total']);
                 $dem++;
-                $sheet->setCellValue($chars[$dem] . ($index + 5), $package['percent']);
+                $sheet->setCellValue($chars[$dem] . ($stt + 5), $package['percent']);
             }
             $dem++;
-            $sheet->setCellValue($chars[$dem] . ($index + 5), $provinces['total']);
+            
+            $sheet->setCellValue($chars[$dem] . ($stt + 5), $provinces['total']);
+            $stt++;
         }
         $writer = new PHPExcel_Writer_Excel5($this->phpexcel);

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

@@ -48 +48 @@
         
 
-
+        $dem=1;
         foreach ($provinces as $index2 => $province) {
-            $provinces[$index2] = array("stt" => ($index2 + 1), "province" => $province, "dtn" => 0, "dtt" => 0, "dtng" => 0, "tbn" => 0, "tbt" => 0, "tbng" => 0);
+            $provinces[$index2] = array("stt" => ($dem), "province" => $province, "dtn" => 0, "dtt" => 0, "dtng" => 0, "tbn" => 0, "tbt" => 0, "tbng" => 0);
             foreach ($dtns as $data) {
-                if ($province == $data['province']) {
+                if ($index2 == $data['province']) {
                     $provinces[$index2]['dtn'] = $data['total'];
                 }
             } 
             foreach ($dtng as $data) {
-                if ($province == $data['province']) {
+                if ($index2 == $data['province']) {
                     $provinces[$index2]['dtng'] = $data['total'];
                 }
             }
             foreach ($dtts as $data) {
-                if ($province == $data['province']) {
+                if ($index2 == $data['province']) {
                     $provinces[$index2]['dtt'] = $data['total'];
                     
@@ -71 +71 @@
 
             foreach ($tbns as $data) {
-                if ($province == $data['province']) {
+                if ($index2 == $data['province']) {
                     $provinces[$index2]['tbn'] = $data['total'];
                 }
             }
             foreach ($tbng as $data) {
-                if ($province == $data['province']) {
+                if ($index2 == $data['province']) {
                     $provinces[$index2]['tbng'] = $data['total'];
                 }
             }
             foreach ($tbts as $data) {
-                if ($province == $data['province']) {
+                if ($index2 == $data['province']) {
                     $provinces[$index2]['tbt'] = $data['total'];
                 }
             }
+            $dem++;
         }
        
@@ -114 +115 @@
             $provinces[$index] = array("province" => $province);
         }
-
+        $dem=1;
         foreach ($provinces as $index => $province) {
-            $provinces[$index]['stt'] = $index + 1;
+            $provinces[$index]['stt'] = $dem;
             $provinces[$index]['total'] = 0;
             $totaluser = 0;
@@ -124 +125 @@
                 $total = 0;
                 foreach ($package['users'] as $user) {
-                    if ($province['province'] == $user['province']) {
+                    if ($index == $user['province']) {
                         $total = $total + 1;
                         $totaluser = $totaluser + 1;
@@ -134 +135 @@
                 }
             }
+            $dem++;
         }
         foreach ($provinces as $index => $province) {
@@ -158 +160 @@
     {
        // $input['month']=1;
-       // $input['year']=2014;
+       //svn  $input['year']=2014;
         $data=$this->getPackages($input);
         return $data;