X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=ExcelToJson.php;h=e981d32901cb7910e25123b2dcd4a4f95dc6b694;hp=1339864cc094b168e57d1053b2c9d8c55684a6d3;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=c247de4be18ebb0331f2f2ea7c346287e5923245

diff --git a/ExcelToJson.php b/ExcelToJson.php
index 1339864c..e981d329 100644
--- a/ExcelToJson.php
+++ b/ExcelToJson.php
@@ -12,7 +12,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         return parent::getAuth();
     }
     
-    function post()
+    function post($v)
     {
         $this->transObj = DB_DataObject::Factory('invhist_transfer');
         
@@ -29,8 +29,13 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         
         require_once 'File/Convert.php';
         $fc = new File_Convert($img->getStoreName(), $img->mimetype );
-        $csv = $fc->convert('text/csv');
-        $this->importCsv($csv);
+         $csv = $fc->convert('text/csv');
+         $ret = $this->importCsv($csv);
+        
+       
+        
+        $this->jdata($ret['data'], false, isset($ret['extra']) ? $ret['extra'] : array() );
+        
     }
     
     function importCsv($csv)
@@ -42,22 +47,25 @@ class Pman_Core_ExcelToJson extends Pman_Roo
             $this->jerr("invalid file");
         }
         
-        $req = array(
-            'LINE', 'ITEM CODE', 'DESCRIPTION', 'QUANTITY'
-        );
-        
+         
         $cols = false;
-        $rows = array();
         $header = false;
+        $rows = array();
+        $extra = array();
         
         while(false !== ($n = fgetcsv($fh,10000, ',', '"'))) {
-            if(!array_filter($n)){
+          
+            
+            if(!strlen(trim(implode('', $n)))){ // blank line;
+                if ($header) {
+                    continue;
+                }
                 $header = true;
                 continue;
             }
             
             if(!$header){
-               $rows[strtoupper($n[0])] = $n[1];
+               $extra[preg_replace(array('/\s/', '/\:/'), '', $n[0])] = $n[1];
                continue;
             }
             
@@ -71,34 +79,20 @@ class Pman_Core_ExcelToJson extends Pman_Roo
                     continue;
                 }
                
-                foreach($req as $r) {
-                    if (!in_array($r,$cols)) {
-                        $cols = false;
-                        break;
-                    }
-                }
+           
                 continue;
             }
             
             foreach($cols as $i=>$k) {
                 $row[$k] = $n[$i];
             }
-            $rows['TRANSFER ITEMS'][] = $row;
+            $rows[] = $row;
             
         }
-        
-        if (empty($cols)) {
-            $this->jerr("could not find a row with " . implode(' / ', $req));
-        }
-        
         fclose($fh);
         
+     
         
-        
-        
-        
-        
-        exit;
+        return array('extra' => $extra, 'data' => $rows);;
     }
-    
-}
+}
\ No newline at end of file