kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-15 06:08:16 +00:00
Code Issues Projects Releases Wiki Activity

Bread crumbs and fine tuning.

Browse Source
This commit is contained in:
James Cole
2015-07-06 08:33:39 +02:00
parent 13bda0a264
commit 5b50abb2c7
4 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/CsvController.php
View File

@@ -65,7 +65,7 @@ class CsvController extends Controller
return Redirect::route('csv.index');
}
$subTitle = trans('firefly.csv_process');
$subTitle = trans('firefly.csv_define_column_roles');
$firstRow = $this->data->getReader()->fetchOne();
$count = count($firstRow);
$headers = [];
@@ -131,7 +131,9 @@ class CsvController extends Controller
*/
public function downloadConfigPage()
{
return view('csv.download-config');
$subTitle = trans('firefly.csv_download_config_title');
return view('csv.download-config', compact('subTitle'));
}
/**
@@ -277,8 +279,9 @@ class CsvController extends Controller
$values = $this->wizard->getMappableValues($reader, $map, $hasHeaders);
$map = $this->data->getMap();
$mapped = $this->data->getMapped();
$subTitle = trans('firefly.csv_map_values');
return view('csv.map', compact('map', 'options', 'values', 'mapped'));
return view('csv.map', compact('map', 'options', 'values', 'mapped', 'subTitle'));
}
/**
@@ -316,7 +319,9 @@ class CsvController extends Controller
Preferences::mark();
return view('csv.process', compact('rows', 'errors', 'imported'));
$subTitle = trans('firefly.csv_process_title');
return view('csv.process', compact('rows', 'errors', 'imported', 'subTitle'));
}
@@ -348,7 +353,9 @@ class CsvController extends Controller
foreach (Input::get('mapping') as $index => $data) {
$mapped[$index] = [];
foreach ($data as $value => $mapping) {
$mapped[$index][$value] = $mapping;
if (intval($mapping) !== 0) {
$mapped[$index][$value] = $mapping;
}
}
}
Session::put('csv-mapped', $mapped);