Changeset 756 for pro-violet-viettel/sourcecode/application/modules/admin

Timestamp:

Feb 10, 2015 1:05:53 PM (10 years ago)

Author:

quyenla

Message:

report update

Location:

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

Files:

• reportpackage.php (modified) (2 diffs)
• reportprovince.php (modified) (1 diff)

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

@@ -87 +87 @@
         $sheet->setCellValue('A2', "Thời gian: " . $data['month'] . " - " . $data['year']);
         $sheet->setCellValue('A4', "STT");
-        $sheet->setCellValue('B4', "Tỉnh/Thà nh phố");
+        $sheet->setCellValue('B4', "Mã Tỉnh/Thà nh phố");
+        $sheet->setCellValue('C4', "Tỉnh/Thà nh phố");
         $chars = array("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L");
-        $dem = 1;
+        $dem = 2;
         $stt=1;
         foreach ($data['packages'] as $package) {
             $dem++;
-            $sheet->setCellValue($chars[$dem] . ($stt + 4), $package['p_name']);
+            $sheet->setCellValue($chars[$dem] . "4", $package['p_name']);
             $dem++;
-            $sheet->setCellValue($chars[$dem] . ($stt + 4), "Tỉ lệ %");
+            $sheet->setCellValue($chars[$dem] . "4", "Tỉ lệ %");
         
             $stt++;
@@ -106 +107 @@
 
             $sheet->setCellValue('A' . ($stt + 5), $provinces['stt']);
-            $sheet->setCellValue('B' . ($stt + 5), $provinces['province']);
-            $dem = 1;
+            $sheet->setCellValue('B' . ($stt + 5), $index);
+            $sheet->setCellValue('C' . ($stt + 5), $provinces['province']);
+            $dem = 2;
             foreach ($provinces['packages'] as $package) {
                 $dem++;

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

@@ -58 +58 @@
         $sheet->getColumnDimension('A')->setWidth(10);
         $sheet->getColumnDimension('B')->setWidth(25);
-        $sheet->getColumnDimension('C')->setWidth(15);
+        $sheet->getColumnDimension('C')->setWidth(25);
         $sheet->getColumnDimension('D')->setWidth(15);
         $sheet->getColumnDimension('E')->setWidth(15);
         $sheet->getColumnDimension('F')->setWidth(15);
         $sheet->getColumnDimension('G')->setWidth(15);
-        $sheet->getColumnDimension('H')->setWidth(15);
+        $sheet->getColumnDimension('H')->setWidth(15); 
+        $sheet->getColumnDimension('I')->setWidth(20);
         $sheet->setCellValue('A1', "Báo cáo thuê bao theo tỉnh");
         $sheet->setCellValue('A2', "Tháng: " . $data['month'] . " - " . $data['year']);
         $sheet->setCellValue('C2', "Ngà y: ".date('d')." - ".date('m')." - ". date('Y').""); 
         $sheet->setCellValue('A4', "STT");
-        $sheet->setCellValue('B4', "Tỉnh/Thà nh phố");
-        $sheet->setCellValue('C4', "TB Ngà y");
-        $sheet->setCellValue('D4', "Lũy kế TB tháng");
-        $sheet->setCellValue('E4', "Tổng TB Ngà y");
-        $sheet->setCellValue('F4', "DT Ngà y");
-        $sheet->setCellValue('G4', "Lũy kế DT tháng");
-        $sheet->setCellValue('H4', "Tổng DT năm");
+        $sheet->setCellValue('B4', "Mã Tỉnh/Thà nh Phố");
+        $sheet->setCellValue('C4', "Tỉnh/Thà nh phố");
+        $sheet->setCellValue('D4', "TB Ngà y");
+        $sheet->setCellValue('E4', "Lũy kế TB tháng");
+        $sheet->setCellValue('F4', "Tổng TB Ngà y");
+        $sheet->setCellValue('G4', "DT Ngà y");
+        $sheet->setCellValue('H4', "Lũy kế DT tháng");
+        $sheet->setCellValue('I4', "Tổng DT năm");
         $dem=0;
         foreach ($data['provinces'] as $index => $provinces) {
             $sheet->setCellValue('A' . ($dem + 5), $provinces['stt']);
-            $sheet->setCellValue('B' . ($dem + 5), $provinces['province']);
-            $sheet->setCellValue('C' . ($dem + 5), $provinces['tbng']);
-            $sheet->setCellValue('D' . ($dem + 5), $provinces['tbt']);
-            $sheet->setCellValue('E' . ($dem + 5), $provinces['tbn']);
-            $sheet->setCellValue('F' . ($dem + 5), $provinces['dtng']);
-            $sheet->setCellValue('G' . ($dem + 5), $provinces['dtt']);
-            $sheet->setCellValue('H' . ($dem + 5), $provinces['dtn']);
+            $sheet->setCellValue('B' . ($dem + 5), $index);
+            $sheet->setCellValue('C' . ($dem + 5), $provinces['province']);
+            $sheet->setCellValue('D' . ($dem + 5), $provinces['tbng']);
+            $sheet->setCellValue('E' . ($dem + 5), $provinces['tbt']);
+            $sheet->setCellValue('F' . ($dem + 5), $provinces['tbn']);
+            $sheet->setCellValue('G' . ($dem + 5), $provinces['dtng']);
+            $sheet->setCellValue('H' . ($dem + 5), $provinces['dtt']);
+            $sheet->setCellValue('I' . ($dem + 5), $provinces['dtn']);
             $dem++;
         }