From c1cb8439c416eaa845d0cc65d5ede378a0e344d9 Mon Sep 17 00:00:00 2001 From: Marcel Diegelmann Date: Thu, 24 Jul 2025 10:31:19 +0200 Subject: [PATCH] Tabs und BOMImporter: Verbesserte Anzeige und Validierung Die Standardanzeige des Tabs "Details" wurde korrigiert. Im BOMImporter wurden nichtnumerische Spalten kategorisch ausgeschlossen und eine Validation-message angepasst. --- src/Services/ImportExportSystem/BOMImporter.php | 4 ++-- templates/assemblies/info/info.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Services/ImportExportSystem/BOMImporter.php b/src/Services/ImportExportSystem/BOMImporter.php index f022fb5e..ddad0558 100644 --- a/src/Services/ImportExportSystem/BOMImporter.php +++ b/src/Services/ImportExportSystem/BOMImporter.php @@ -529,7 +529,7 @@ class BOMImporter //If there is no value, skip if (isset($values[$index]) && $values[$index] !== '') { //Check whether the value is numerical - if (is_numeric($values[$index])) { + if (is_numeric($values[$index]) && !in_array($column, ['name','description','manufacturer','designator'])) { //Convert to integer or float $temp = (str_contains($values[$index], '.')) ? floatval($values[$index]) @@ -560,7 +560,7 @@ class BOMImporter if (isset($entry['name']) && !is_string($entry['name'])) { $result->addViolation($this->buildJsonViolation( - 'validator.bom_importer.csv.parameter.string.notEmpty', + 'validator.bom_importer.json_csv.parameter.string.notEmpty', "row[$key].name", $entry['name'] )); diff --git a/templates/assemblies/info/info.html.twig b/templates/assemblies/info/info.html.twig index 09817386..5a419e36 100644 --- a/templates/assemblies/info/info.html.twig +++ b/templates/assemblies/info/info.html.twig @@ -98,10 +98,10 @@
-
+
{% include "assemblies/info/_info.html.twig" %}
-
+
{% include "assemblies/info/_part.html.twig" %}