Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix import and export of csv contacts where mixed datas or no datas

This commit is contained in:
osaajani 2021-02-20 17:58:35 +01:00
parent d944a2cb38
commit e01f444322
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
controllers/internals/Contact.php
View File

@ -133,6 +133,10 @@ namespace controllers\internals;
continue; continue;
} }
//Padding line with '' entries to make sure its same length as head
//this allow to mix users with data with users without data
$line = array_pad($line, count($head), '');
$line = array_combine($head, $line); $line = array_combine($head, $line);
if (false === $line) if (false === $line)
{ {
@ -278,14 +282,16 @@ namespace controllers\internals;
$data = json_decode($contact['data'], true); $data = json_decode($contact['data'], true);
$line = [$contact['name'], $contact['number']]; $line = [$contact['name'], $contact['number']];
foreach ($columns as $column) foreach (array_slice($columns, 2) as $column) //ignore first two columns as it's alway name & number
{ {
if (isset($data[$column])) //If their is no data for this column key, we set '' to ignore
if (!isset($data[$column]))
{ {
$line[] = $data[$column]; $line[] = '';
continue; continue;
} }
$line[] = $data[$column];
} }
$lines[] = $line; $lines[] = $line;
} }