From 79c293ec93401a36e8c1a943ecdc9d666e890450 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 10 Jan 2024 12:50:01 +1100 Subject: [PATCH 1/3] Updates for delimiter detection --- app/Import/Providers/BaseImport.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php index ed84c71f0609..0af4625aa8d5 100644 --- a/app/Import/Providers/BaseImport.php +++ b/app/Import/Providers/BaseImport.php @@ -140,6 +140,10 @@ class BaseImport $delimiters = [',', '.', ';', '|']; $bestDelimiter = ','; $count = 0; + + // 10-01-2024 - A better way to resolve the csv file delimiter. + $csvfile = substr($csvfile, 0, strpos($csvfile, "\n")); + foreach ($delimiters as $delimiter) { if (substr_count(strstr($csvfile, "\n", true), $delimiter) >= $count) { From 146e6ebcbca83052f236f085b14b94755ae9b984 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 10 Jan 2024 12:52:21 +1100 Subject: [PATCH 2/3] Fixes for delimiter detection --- app/Import/Providers/BaseImport.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php index 0af4625aa8d5..9453719a5ebd 100644 --- a/app/Import/Providers/BaseImport.php +++ b/app/Import/Providers/BaseImport.php @@ -166,7 +166,6 @@ class BaseImport private function groupTasks($csvData, $key) { - nlog($csvData[0]); if (! $key || !is_array($csvData) || count($csvData) == 0 || !isset($csvData[0]['task.number']) || empty($csvData[0]['task.number'])) { return $csvData; From 6e05f08793968346125ac9e5367d21f09a27a9e5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 10 Jan 2024 13:06:11 +1100 Subject: [PATCH 3/3] Minor updates --- composer.json | 2 +- modules_statuses.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5448b4aa31be..8a48a1dfd65c 100644 --- a/composer.json +++ b/composer.json @@ -180,4 +180,4 @@ ], "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file diff --git a/modules_statuses.json b/modules_statuses.json index 1f5f99114c12..c5249869a55c 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -1,3 +1,4 @@ { - "Admin": true -} \ No newline at end of file + "Admin": true, + "Ronin": true +}