museum-digital/csvxml
museum-digital/csvxml
32
0
Fork 0
Code Issues 3 Pull Requests Releases Activity

using oop instead of array access

Browse Source
This commit is contained in:
Nathan Eikermann 2021-05-07 20:34:45 +02:00
parent 014b723939
commit 69d10cf8d0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/csv.php
View File

@ -53,10 +53,10 @@ foreach ($availableFields as $headline => $fields) {
if ($i !== 0) $tLine1[] = "";
$tLine2[] = $fieldName;
$tLine3[] = $field['name_human_readable'];
# $tLine4[] = $field['remark'];
if (!empty($field['allowedValues'])) $tLine4[] = end($field['allowedValues']);
else $tLine4[] = $field['name_human_readable'];
$tLine3[] = $field->name_human_readable;
# $tLine4[] = $field->remark;
if (!empty($field->allowedValues)) $tLine4[] = end($field->allowedValues);
else $tLine4[] = $field->name_human_readable;
$i++;
}
@ -76,5 +76,5 @@ else
header("Content-Disposition: attachment; filename=csvxml_museum-digital_template-{$lang}.csv");
for ($i = 2; $i <= 4; $i++) {
echo mb_convert_encoding('"' . implode("\";\"", ${"line$i"}) . '"' . PHP_EOL, 'utf-16', 'utf-8');;
echo mb_convert_encoding('"' . implode("\";\"", ${"line$i"}) . '"' . PHP_EOL, 'utf-16', 'utf-8');
}

14
public/index.php
View File

@ -84,22 +84,22 @@ foreach ($availableFields as $headline => $fields) {
foreach($fields as $fieldName => $field) {
if (!empty($field['remark']) or !empty($field['explica'])) $hasTooltip = true;
if (!empty($field->remark) or !empty($field->explica)) $hasTooltip = true;
else $hasTooltip = false;
echo "
<li id='{$fieldName}' data-alt='{$field['name_human_readable']}' data-value='{$fieldName}' data-for='{$fieldName}' class='";
<li id='{$fieldName}' data-alt='{$field->name_human_readable}' data-value='{$fieldName}' data-for='{$fieldName}' class='";
if ($hasTooltip === true) echo " newToolTipTag";
if (!empty($field['required']) and $field['required'] === true) echo " requiredField";
if (!empty($field->required) and $field->required === true) echo " requiredField";
echo "'";
if (!empty($field['dependsOn'])) {
echo " data-dependencies='" . htmlspecialchars(implode(";", $field['dependsOn'])) . "'";
if (!empty($field->dependsOn)) {
echo " data-dependencies='" . htmlspecialchars(implode(";", $field->dependsOn)) . "'";
}
echo ">{$fieldName}";
if (!empty($field['explica'])) $toolTipExplica = "</p><h5>General</h5><p>" . $field['explica'];
if (!empty($field->explica)) $toolTipExplica = "</p><h5>General</h5><p>" . $field->explica;
else $toolTipExplica = "";
$toolTip = generateHelpTooltip($fieldName, $field['name_human_readable'], "{$field['remark']}{$toolTipExplica}");
$toolTip = generateHelpTooltip($fieldName, "{$field->name_human_readable}", "{$field->remark}{$toolTipExplica}");
if ($hasTooltip) $tooltips[] = $toolTip[0];
echo "</li>";
}