kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Update ING description for #1015

Browse Source
This commit is contained in:
James Cole
2017-12-12 20:53:16 +01:00
parent 1b4edae4d9
commit bad889d450
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Support/Import/Configuration/Csv/Map.php
View File

@@ -60,8 +60,10 @@ class Map implements ConfigurationInterface
/** @var Reader $reader */
$reader = Reader::createFromString($content);
$reader->setDelimiter($this->configuration['delimiter']);
$offset = $this->configuration['has-headers'] ? 1 : 0;
$results = $reader->setOffset($offset)->fetch();
if($this->configuration['has-headers']) {
$reader->setHeaderOffset(0);
}
$results = $reader->getRecords();
$this->validSpecifics = array_keys(config('csv.import_specifics'));
$indexes = array_keys($this->data);
$rowIndex = 0;

14
app/Support/Import/Configuration/Csv/Roles.php
View File

@@ -26,6 +26,7 @@ use FireflyIII\Import\Specifics\SpecificInterface;
use FireflyIII\Models\ImportJob;
use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
use League\Csv\Reader;
use League\Csv\Statement;
use Log;
/**
@@ -53,9 +54,10 @@ class Roles implements ConfigurationInterface
// create CSV reader.
$reader = Reader::createFromString($content);
$reader->setDelimiter($config['delimiter']);
$start = $config['has-headers'] ? 1 : 0;
$end = $start + config('csv.example_rows');
if ($config['has-headers']) {
$reader->setHeaderOffset(0);
}
$stmt = (new Statement)->limit(intval(config('csv.example_rows', 5)));
// set data:
$roles = $this->getRoles();
asort($roles);
@@ -66,13 +68,13 @@ class Roles implements ConfigurationInterface
'headers' => $config['has-headers'] ? $reader->fetchOne(0) : [],
];
while ($start < $end) {
$row = $reader->fetchOne($start);
$records = $stmt->process($reader);
foreach ($records as $row) {
$row = $this->processSpecifics($row);
$count = count($row);
$this->data['total'] = $count > $this->data['total'] ? $count : $this->data['total'];
$this->processRow($row);
++$start;
}
$this->updateColumCount();