upd import

Author: aVadim483

README.md

@@ -1,4 +1,4 @@
-# FastExcelLaravel
+ FastExcelLaravel
 Lightweight and very fast XLSX Excel Spreadsheet Writer for Laravel 
 (wrapper for [FastExcelWriter](https://packagist.org/packages/avadim/fast-excel-writer))
 
@@ -100,7 +100,7 @@ $sheet->writeData(function () {
 
 ### Advanced Usage for Data Export
 
-See detailed documentation for avadim/fast-excel-laravel here: https://github.com/aVadim483/fast-excel-writer/tree/master#readme
+See detailed documentation for avadim/fast-excel-writer here: https://github.com/aVadim483/fast-excel-writer/tree/master#readme
 
 ```php
 $excel = \Excel::create('Users');
@@ -149,11 +149,65 @@ $excel->saveTo($testFileName);
 ## Import Data
 
 ### Import a Model
-To import models, you can use method ```importModel()```. By default, the first row is considered to contain the names of the fields
-```txt
-importModel(string $modelClass, $address = null, $columns = null)
+To import models, you can use method ```importModel()```. 
+By default, the first row is considered to contain the names of the fields
+![import.jpg](import.jpg)
+```php
+// Open XLSX-file 
+$excel = Excel::open($file);
+
+// Import row to User model
+$excel->importModel(User::class);
+
+// Done!!!
+```
+You can define the columns or cells from which you will import
+```php
+// Import row to User model from columns range B:E
+$excel->importModel(User::class, 'B:E');
+
+// Import from cells range
+$excel->importModel(User::class, 'B3:E8');
+
+// Define top left cell only
+$excel->importModel(User::class, 'B3');
+```
+In the last two examples, we also assume that the first row of imported data (row 3) 
+is the names of the fields.
+
+However, you can set the correspondence between columns and field names yourself. 
+Then the first line of the imported data will be records for the model.
+
+```php
+// Import row to User model from columns range B:E
+$excel->importModel(User::class, 'B:E', ['B' => 'name', 'C' => 'birthday', 'D' => 'random', 'E' => 'something']);
+
+// Define top left cell only
+$excel->importModel(User::class, 'B3', ['B' => 'name', 'C' => 'birthday', 'D' => 'random', 'E' => 'something']);
 ```
 
+### Advanced Usage for Data Import
+See detailed documentation for avadim/fast-excel-reader here: https://github.com/aVadim483/fast-excel-reader/tree/master#readme
+```php
+$excel = Excel::open($file);
+
+$sheet = $excel->getSheet('Articles');
+foreach ($sheet->nextRow() as $rowNum => $rowData) {
+    $user = User::create([
+        'name' => $rowData['B'],
+        'birthday' => new \Carbon($rowData['C']),
+        'password' => bcrypt($rowData['D']),
+    ]);
+    Article::create([
+        'user_id' => $user->id,
+        'title' => $rowData['E'],
+        'date' => new \Carbon($rowData['F']),
+        'public' => $rowData['G'] === 'yes',
+    ]);
+}
+```
+
+
 ## Do you want to support FastExcelLaravel?
 
 if you find this package useful you can support and donate to me for a cup of coffee:

composer.json

@@ -22,7 +22,7 @@
         "php": ">=7.4",
         "ext-json": "*",
         "avadim/fast-excel-writer": "^4.1",
-        "avadim/fast-excel-reader": "^2.3",
+        "avadim/fast-excel-reader": "main-dev",
         "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
         "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0"
     },

import.jpg

@@ -22,19 +22,17 @@ class SheetReader extends \avadim\FastExcelReader\Sheet
      */
     public function importModel($modelClass, $address = null, $columns = null): SheetReader
     {
-        $resultMode = 0;
-        if ($columns === true) {
-            $resultMode = \avadim\FastExcelReader\Excel::KEYS_FIRST_ROW;
+        $resultMode = \avadim\FastExcelReader\Excel::KEYS_FIRST_ROW;
+        if ($columns === false) {
+            $resultMode = 0;
             $columns = [];
         }
-        elseif ($columns === null && $address === true) {
-            $columns = [];
-            $resultMode = \avadim\FastExcelReader\Excel::KEYS_FIRST_ROW;
+        elseif ($columns) {
+            $resultMode = 0;
         }
         if ($address && is_string($address)) {
             $this->setReadArea($address);
         }
-        $tz = date_default_timezone_get();
         foreach ($this->nextRow($columns, $resultMode) as $rowData) {
             /** @var Model $model */
             $model = new $modelClass;

src/FastExcelLaravel/SheetReader.php

@@ -316,31 +316,31 @@ public function testLoadModel()
 
         FakeModel::$storage = [];
         $excel->importModel(FakeModel::class);
-        $this->assertCount(4, FakeModel::$storage);
-        $this->assertNull(FakeModel::$storage[0]->name);
-
-        FakeModel::$storage = [];
-        $excel->importModel(FakeModel::class, true);
         $this->assertCount(3, FakeModel::$storage);
         $this->assertEquals('James Bond', FakeModel::$storage[0]->name);
 
         FakeModel::$storage = [];
-        $excel->importModel(FakeModel::class, 'b2');
-        $this->assertCount(3, FakeModel::$storage);
-        $this->assertNull(FakeModel::$storage[0]->name);
+        $excel->setDateFormat('Y-m-d');
+        $excel->importModel(FakeModel::class, 'B4', ['A' => 'foo', 'B' => 'bar', 'C' => 'int']);
+        $this->assertEquals('1753-01-31', FakeModel::$storage[0]->bar);
+
+        $testFileName = 'test_model2.xlsx';
+        $excel = Excel::open(storage_path($testFileName));
 
         FakeModel::$storage = [];
-        $excel->importModel(FakeModel::class, 'b1', true);
+        $excel->importModel(FakeModel::class, 'b4');
         $this->assertCount(3, FakeModel::$storage);
         $this->assertEquals('James Bond', FakeModel::$storage[0]->name);
 
         FakeModel::$storage = [];
-        $excel->setDateFormat('Y-m-d');
-        $excel->importModel(FakeModel::class, 'c4', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
-        $this->assertEquals('1753-01-31', FakeModel::$storage[0]->bar);
+        $excel->importModel(FakeModel::class, 'b5:d5', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
+        $this->assertCount(1, FakeModel::$storage);
+        $this->assertEquals('James Bond', FakeModel::$storage[0]->foo);
+        $this->assertFalse(isset(FakeModel::$storage[1]));
 
         FakeModel::$storage = [];
-        $excel->importModel(FakeModel::class, 'b2', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
+        $excel->setDateFormat('Y-m-d');
+        $excel->importModel(FakeModel::class, 'b5', ['B' => 'foo', 'C' => 'bar', 'D' => 'int']);
         $this->assertCount(3, FakeModel::$storage);
         $this->assertEquals('Captain Jack Sparrow', FakeModel::$storage[2]->foo);
         $this->assertEquals('1753-01-31', FakeModel::$storage[2]->bar);