diff --git a/composer.json b/composer.json index 95b72ca66d..e7643bfa79 100755 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/main/admin/skills_import.php b/main/admin/skills_import.php index fc6baeded2..1591edb612 100755 --- a/main/admin/skills_import.php +++ b/main/admin/skills_import.php @@ -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; diff --git a/main/inc/lib/import.lib.php b/main/inc/lib/import.lib.php index 05ab4a27ed..a5f7721cda 100755 --- a/main/inc/lib/import.lib.php +++ b/main/inc/lib/import.lib.php @@ -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); } diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index 3d2c59fd34..87ed71da57 100755 --- a/main/inc/lib/skill.lib.php +++ b/main/inc/lib/skill.lib.php @@ -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); }