Fix CSV skill import see #2772

pull/2818/head
Julio Montoya 6 years ago
parent 4e4eea04b1
commit 0f0a56876a
  1. 3
      composer.json
  2. 3
      main/admin/skills_import.php
  3. 6
      main/inc/lib/import.lib.php
  4. 5
      main/inc/lib/skill.lib.php

@ -158,7 +158,8 @@
"firebase/php-jwt": "^5.0",
"simplethings/entity-audit-bundle": "^1.0",
"masterminds/html5": "2.*",
"jtsternberg/oauth1-php": "dev-master"
"jtsternberg/oauth1-php": "dev-master",
"league/csv": "^9.1"
},
"config": {
"component-dir": "public/assets"

@ -74,6 +74,9 @@ function save_data($skills)
$skill['a'] = 'add';
$saved_id = $skill['id'];
$skill['id'] = null;
$skill['short_code'] = '';
$skill['icon'] = '';
$skill['updated_at'] = api_get_utc_datetime();
$oskill = new Skill();
$skill_id = $oskill->add($skill);
$parents[$saved_id] = $skill_id;

@ -52,7 +52,7 @@ class Import
$reader = Reader::createFromPath($filename, 'r');
if ($reader) {
$reader->setDelimiter(';');
$reader->stripBom(true);
//$reader->stripBom(true);
/*$contents = $reader->__toString();
if (!Utf8::isUtf8($contents)) {
// If file is not in utf8 try converting to ISO-8859-15
@ -60,8 +60,8 @@ class Import
$reader->appendStreamFilter('convert.iconv.ISO-8859-15/UTF-8');
}
}*/
$iterator = $reader->fetchAssoc(0);
$reader->setHeaderOffset(0);
$iterator = $reader->getRecords();
return iterator_to_array($iterator);
}

@ -674,6 +674,7 @@ class Skill extends Model
'name',
'description',
'access_url_id',
'updated_at',
'short_code',
'icon',
'criteria',
@ -1121,8 +1122,8 @@ class Skill extends Model
$attributes = [
'skill_id' => $skill_id,
'parent_id' => $parent_id,
'relation_type' => (isset($params['relation_type']) ? $params['relation_type'] : 0),
//'level' => $params['level'],
'relation_type' => isset($params['relation_type']) ? $params['relation_type'] : 0,
'level' => isset($params['level']) ? $params['level'] : 0,
];
$skillRelSkill->save($attributes);
}

Loading…
Cancel
Save