added end column for XLS in template and import

2026-06-18 16:50:38 +02:00
7 changed files with 247 additions and 78 deletions
@@ -207,6 +207,21 @@ if (!array_key_exists($currentButtonTextColor, array_change_key_case($buttonText
                                    <input type="text" name="start_column" id="startColumn" class="form-control" value="<?php echo htmlspecialchars($template['start_column'] ?? ''); ?>">
                                </div>

+                                <div class="mb-3" id="xlsEndColumnWrapper">
+                                    <label class="form-label">Last Column included</label>
+                                    <input
+                                        type="text"
+                                        name="xls_end_column"
+                                        id="xlsEndColumn"
+                                        class="form-control"
+                                        value="<?php echo htmlspecialchars($template['xls_end_column'] ?? '', ENT_QUOTES, 'UTF-8'); ?>"
+                                        placeholder="Example: AN">
+                                    <small class="text-danger fw-semibold">
+                                        Attention: if left empty, the system will read the entire XLS/XLSX sheet.
+                                        Dirty Excel files may cause memory errors or timeout.
+                                    </small>
+                                </div>
+
                                <div class="mb-3" id="xlsSheetNumberWrapper">
                                    <label class="form-label">XLS Sheet Number</label>
                                    <input
@@ -404,11 +419,13 @@ if (!array_key_exists($currentButtonTextColor, array_change_key_case($buttonText

            const headerRowWrapper = document.getElementById("headerRowWrapper");
            const startColumnWrapper = document.getElementById("startColumnWrapper");
+            const xlsEndColumnWrapper = document.getElementById("xlsEndColumnWrapper");
            const xlsSheetNumberWrapper = document.getElementById("xlsSheetNumberWrapper");
            const apiConfigWrapper = document.getElementById("apiConfigWrapper");

            const headerRow = document.getElementById("headerRow");
            const startColumn = document.getElementById("startColumn");
+            const xlsEndColumn = document.getElementById("xlsEndColumn");
            const xlsSheetIndex = document.getElementById("xlsSheetIndex");
            const apiConfigSelect = document.getElementById("apiConfigSelect");

@@ -444,13 +461,16 @@ if (!array_key_exists($currentButtonTextColor, array_change_key_case($buttonText
                if (isXls) {
                    headerRowWrapper.style.display = 'block';
                    startColumnWrapper.style.display = 'block';
+                    xlsEndColumnWrapper.style.display = 'block';
                    xlsSheetNumberWrapper.style.display = 'block';

                    headerRow.required = true;
                    startColumn.required = true;
+                    xlsEndColumn.required = false;

                    headerRow.disabled = false;
                    startColumn.disabled = false;
+                    xlsEndColumn.disabled = false;
                    xlsSheetIndex.disabled = false;

                    apiConfigWrapper.style.display = 'none';
@@ -460,13 +480,16 @@ if (!array_key_exists($currentButtonTextColor, array_change_key_case($buttonText
                } else {
                    headerRowWrapper.style.display = 'none';
                    startColumnWrapper.style.display = 'none';
+                    xlsEndColumnWrapper.style.display = 'none';
                    xlsSheetNumberWrapper.style.display = 'none';

                    headerRow.required = false;
                    startColumn.required = false;
+                    xlsEndColumn.required = false;

                    headerRow.disabled = true;
                    startColumn.disabled = true;
+                    xlsEndColumn.disabled = true;
                    xlsSheetIndex.disabled = true;

                    if (isApiOrJson) {
@@ -726,6 +749,22 @@ if (!array_key_exists($currentButtonTextColor, array_change_key_case($buttonText
                    return;
                }

+                if (selectedSource === 'XLS' && xlsEndColumn.value.trim() !== '') {
+                    const lastColumnValue = xlsEndColumn.value.trim().toUpperCase();
+
+                    if (!/^[A-Z]+$|^[1-9][0-9]*$/.test(lastColumnValue)) {
+                        Swal.fire({
+                            title: "Error!",
+                            text: "Last Column must be an Excel column like AN or a positive number like 40.",
+                            icon: "error",
+                            confirmButtonText: "OK"
+                        });
+                        return;
+                    }
+
+                    xlsEndColumn.value = lastColumnValue;
+                }
+
                fetch("process_edit_template_xls.php", {
                        method: "POST",
                        body: formData
@@ -679,7 +679,9 @@
        div.style.position = "relative";

        let html = "";
-        html += `<button type="button" class="export-lims-btn action-btn" data-row="${rowIndex}" data-iddatadb="${row.iddatadb}" title="${isExported ? "Already exported" : "Export to LIMS"}" style="background:${isExported ? "#ccc" : "#eb0b0b"}; color:white; border:none; border-radius:5px; cursor:${isExported ? "not-allowed" : "pointer"}; ${isExported ? "opacity:0.5;" : ""}" ${isExported ? "disabled" : ""}><i class="fas fa-upload"></i></button>`;
+        if (meta.isAdmin) {
+            html += `<button type="button" class="export-lims-btn action-btn" data-row="${rowIndex}" data-iddatadb="${row.iddatadb}" title="${isExported ? "Already exported" : "Export to LIMS"}" style="background:${isExported ? "#ccc" : "#eb0b0b"}; color:white; border:none; border-radius:5px; cursor:${isExported ? "not-allowed" : "pointer"}; ${isExported ? "opacity:0.5;" : ""}" ${isExported ? "disabled" : ""}><i class="fas fa-upload"></i></button>`;
+        }
        html += `<button type="button" class="save-btn action-btn" data-row="${rowIndex}" title="Save" style="background:#28a745; color:white; border:none; border-radius:5px; cursor:pointer;"><i class="fas fa-save"></i></button>`;
        html += `<button type="button" class="photos-btn action-btn" data-row="${rowIndex}" data-iddatadb="${row.iddatadb}" title="Photos" style="background:#007bff; color:white; border:none; border-radius:5px; cursor:pointer;"><i class="fas fa-camera"></i></button>`;
        html += `<button type="button" class="parts-btn action-btn" data-row="${rowIndex}" data-iddatadb="${row.iddatadb}" title="Parts" style="background:#ffc107; color:white; border:none; border-radius:5px; cursor:pointer;"><i class="fas fa-puzzle-piece"></i></button>`;
@@ -95,6 +95,21 @@ $apiConfigurations = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                    <input type="text" name="start_column" id="startColumn" class="form-control" value="A" required>
                                </div>

+                                <div class="mb-3" id="xlsEndColumnWrapper">
+                                    <label class="form-label">Last Column included</label>
+                                    <input
+                                        type="text"
+                                        name="xls_end_column"
+                                        id="xlsEndColumn"
+                                        class="form-control"
+                                        value=""
+                                        placeholder="Example: AN">
+                                    <small class="text-danger fw-semibold">
+                                        Attention: if left empty, the system will read the entire XLS/XLSX sheet.
+                                        Dirty Excel files may cause memory errors or timeout.
+                                    </small>
+                                </div>
+
                                <div class="mb-3" id="xlsSheetNumberWrapper">
                                    <label class="form-label">XLS Sheet Number</label>
                                    <input
@@ -253,11 +268,13 @@ $apiConfigurations = $stmt->fetchAll(PDO::FETCH_ASSOC);

            const headerRowWrapper = document.getElementById("headerRowWrapper");
            const startColumnWrapper = document.getElementById("startColumnWrapper");
+            const xlsEndColumnWrapper = document.getElementById("xlsEndColumnWrapper");
            const xlsSheetNumberWrapper = document.getElementById("xlsSheetNumberWrapper");
            const apiConfigWrapper = document.getElementById("apiConfigWrapper");

            const headerRow = document.getElementById("headerRow");
            const startColumn = document.getElementById("startColumn");
+            const xlsEndColumn = document.getElementById("xlsEndColumn");
            const xlsSheetIndex = document.getElementById("xlsSheetIndex");
            const apiConfigSelect = document.getElementById("apiConfigSelect");

@@ -295,14 +312,20 @@ $apiConfigurations = $stmt->fetchAll(PDO::FETCH_ASSOC);
                if (isXls) {
                    headerRowWrapper.style.display = 'block';
                    startColumnWrapper.style.display = 'block';
+                    xlsEndColumnWrapper.style.display = 'block';
                    xlsSheetNumberWrapper.style.display = 'block';

                    headerRow.required = true;
                    startColumn.required = true;
                    xlsSheetIndex.required = true;

+                    // Last Column is optional.
+                    // If empty, the import will read the entire sheet.
+                    xlsEndColumn.required = false;
+
                    headerRow.disabled = false;
                    startColumn.disabled = false;
+                    xlsEndColumn.disabled = false;
                    xlsSheetIndex.disabled = false;

                    apiConfigWrapper.style.display = 'none';
@@ -312,16 +335,21 @@ $apiConfigurations = $stmt->fetchAll(PDO::FETCH_ASSOC);
                } else {
                    headerRowWrapper.style.display = 'none';
                    startColumnWrapper.style.display = 'none';
+                    xlsEndColumnWrapper.style.display = 'none';
                    xlsSheetNumberWrapper.style.display = 'none';

                    headerRow.required = false;
                    startColumn.required = false;
+                    xlsEndColumn.required = false;
                    xlsSheetIndex.required = false;

                    headerRow.disabled = true;
                    startColumn.disabled = true;
+                    xlsEndColumn.disabled = true;
                    xlsSheetIndex.disabled = true;

+                    xlsEndColumn.value = '';
+
                    if (isApiJson) {
                        apiConfigWrapper.style.display = 'block';
                        apiConfigSelect.required = true;
@@ -4,6 +4,35 @@ require_once 'class/db-functions.php';

 $response = ["success" => false, "message" => ""];

+function excelColumnToIndex($column)
+{
+    $column = strtoupper(trim((string)$column));
+
+    if ($column === '') {
+        return null;
+    }
+
+    // Numeric column index, example: 40
+    if (ctype_digit($column)) {
+        $index = (int)$column;
+        return $index > 0 ? $index : null;
+    }
+
+    // Excel column letters, example: A, AN, XFC
+    if (!preg_match('/^[A-Z]+$/', $column)) {
+        return null;
+    }
+
+    $index = 0;
+    $length = strlen($column);
+
+    for ($i = 0; $i < $length; $i++) {
+        $index = ($index * 26) + (ord($column[$i]) - ord('A') + 1);
+    }
+
+    return $index;
+}
+
 try {
    if ($_SERVER["REQUEST_METHOD"] !== "POST") {
        throw new Exception("Invalid request method.");
@@ -19,6 +48,8 @@ try {
        : null;

    $start_column = trim($_POST['start_column'] ?? '');
+    $xls_end_column = strtoupper(trim($_POST['xls_end_column'] ?? ''));
+    $xls_end_column = $xls_end_column !== '' ? $xls_end_column : null;

    $xls_sheet_index = isset($_POST['xls_sheet_index']) && $_POST['xls_sheet_index'] !== ''
        ? intval($_POST['xls_sheet_index'])
@@ -60,6 +91,24 @@ try {
            throw new Exception("XLS Sheet Number cannot be negative.");
        }

+        $startColumnIndex = excelColumnToIndex($start_column);
+
+        if ($startColumnIndex === null) {
+            throw new Exception("Start Column is not valid. Use Excel column letters like A, AN or a positive number.");
+        }
+
+        if ($xls_end_column !== null) {
+            $endColumnIndex = excelColumnToIndex($xls_end_column);
+
+            if ($endColumnIndex === null) {
+                throw new Exception("Last Column is not valid. Use Excel column letters like AN or a positive number.");
+            }
+
+            if ($endColumnIndex < $startColumnIndex) {
+                throw new Exception("Last Column cannot be before Start Column.");
+            }
+        }
+
        $api_config_id = null;
    }

@@ -71,6 +120,7 @@ try {

        $header_row = null;
        $start_column = null;
+        $xls_end_column = null;
        $xls_sheet_index = null;
    }

@@ -78,6 +128,7 @@ try {
    if ($source_type === 'PDF') {
        $header_row = null;
        $start_column = null;
+        $xls_end_column = null;
        $xls_sheet_index = null;
        $api_config_id = null;
    }
@@ -109,6 +160,7 @@ try {
            source_type = ?,
            header_row = ?,
            start_column = ?,
+            xls_end_column = ?,
            xls_sheet_index = ?,
            api_config_id = ?,
            description = ?,
@@ -131,6 +183,7 @@ try {
        $source_type,
        $header_row,
        $start_column,
+        $xls_end_column,
        $xls_sheet_index,
        $api_config_id,
        $description,
@@ -53,44 +53,7 @@ function normalizeColumnIndex($value): int
    return 1;
 }

-/**
- * Trim a cell value treating invisible/Unicode spaces as empty.
- * PHP's native trim() strips only ASCII whitespace (" \t\n\r\0\x0B"), so a cell
- * that contains only a non-breaking space (U+00A0), zero-width space (U+200B),
- * BOM (U+FEFF) or another Unicode space looks blank to a human but would still
- * count as "filled" — pulling a ghost column into the import or retaining a
- * visually-empty row. Normalize those to a real space before trimming.
- */
-function cleanCellText($value): string
-{
-    $raw = (string)$value;
-    $cleaned = preg_replace(
-        '/[\x{00A0}\x{200B}\x{FEFF}\x{2000}-\x{200A}\x{202F}\x{205F}\x{3000}]+/u',
-        ' ',
-        $raw
-    );
-
-    // preg_replace returns null on malformed UTF-8; fall back to the raw value.
-    return trim($cleaned ?? $raw);
-}
-
 try {
-    // Quando il body POST supera post_max_size, PHP scarta $_POST e $_FILES
-    // (warning "Content-Length exceeds the limit ... in Unknown on line 0") e lo
-    // script riceve una richiesta vuota. Lo intercettiamo per dare un messaggio
-    // chiaro invece di "Richiesta non valida".
-    if (
-        $_SERVER['REQUEST_METHOD'] === 'POST'
-        && empty($_POST) && empty($_FILES)
-        && (int)($_SERVER['CONTENT_LENGTH'] ?? 0) > 0
-    ) {
-        $postMax = ini_get('post_max_size');
-        throw new Exception(
-            "Il file caricato supera il limite di upload del server (post_max_size = {$postMax}). " .
-                "Chiedi all'amministratore di aumentare post_max_size e upload_max_filesize."
-        );
-    }
-
    if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_FILES['excel_file'])) {
        $template_id = isset($_POST['template_id']) ? intval($_POST['template_id']) : 0;

@@ -111,6 +74,7 @@ try {
                id,
                header_row,
                start_column,
+                xls_end_column,
                xls_sheet_index,
                idroutine,
                idclient
@@ -130,6 +94,12 @@ try {

        $start_column_raw = $template['start_column'] ?? 'A';
        $start_column = normalizeColumnIndex($start_column_raw);
+        $xls_end_column_raw = trim((string)($template['xls_end_column'] ?? ''));
+        $xls_end_column = $xls_end_column_raw !== '' ? normalizeColumnIndex($xls_end_column_raw) : 0;
+
+        if ($xls_end_column > 0 && $xls_end_column < $start_column) {
+            throw new Exception("Last Column cannot be before Start Column.");
+        }

        $xlsSheetIndex = isset($template['xls_sheet_index']) && $template['xls_sheet_index'] !== null
            ? (int)$template['xls_sheet_index']
@@ -146,7 +116,15 @@ try {
        // Debug del template_id ricevuto
        error_log("Received template_id from POST: " . print_r($_POST['template_id'], true));
        error_log("Converted template_id: $template_id");
-        error_log("Template XLS settings - header_row: $header_row, start_column_raw: $start_column_raw, start_column_index: $start_column, xls_sheet_index: $xlsSheetIndex");
+        error_log(
+            "Template XLS settings - " .
+                "header_row: $header_row, " .
+                "start_column_raw: $start_column_raw, " .
+                "start_column_index: $start_column, " .
+                "xls_end_column_raw: " . ($xls_end_column_raw !== '' ? $xls_end_column_raw : '[empty = read all]') . ", " .
+                "xls_end_column_index: " . ($xls_end_column > 0 ? $xls_end_column : '[no limit]') . ", " .
+                "xls_sheet_index: $xlsSheetIndex"
+        );

        $file = $_FILES['excel_file'];
        $fileError = $file['error'];
@@ -198,9 +176,32 @@ try {
            if (empty($mappings)) {
                $response['error'] = "Nessun mapping trovato per il template con ID $template_id";
            } else {
-                // Carica il file rinominato con PHPSpreadsheet
+                // Load the XLS/XLSX file.
+                // If Last Column is configured in the template, load only the configured column range.
+                // If Last Column is empty, keep the original behavior and read the entire sheet.
                $reader = IOFactory::createReaderForFile($destination);
-                $reader->setReadEmptyCells(false);
+                $reader->setReadDataOnly(true);
+
+                if ($xls_end_column > 0) {
+                    $reader->setReadFilter(new class($start_column, $xls_end_column) implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter {
+                        private int $startColumn;
+                        private int $endColumn;
+
+                        public function __construct(int $startColumn, int $endColumn)
+                        {
+                            $this->startColumn = $startColumn;
+                            $this->endColumn = $endColumn;
+                        }
+
+                        public function readCell($columnAddress, $row, $worksheetName = ''): bool
+                        {
+                            $columnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($columnAddress);
+
+                            return $columnIndex >= $this->startColumn && $columnIndex <= $this->endColumn;
+                        }
+                    });
+                }
+
                $spreadsheet = $reader->load($destination);

                $sheetCount = $spreadsheet->getSheetCount();
@@ -228,17 +229,23 @@ try {

                error_log("Selected XLS sheet - index: {$xlsSheetIndex}, name: {$selectedSheetName}");

-                $highestRow = $worksheet->getHighestDataRow();
-                $highestColumn = $worksheet->getHighestDataColumn();
+                $highestRow = $worksheet->getHighestRow();
+                $highestColumn = $worksheet->getHighestColumn();
                $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);

+                // Force the effective highest column to Last Column, if configured.
+                if ($xls_end_column > 0) {
+                    $highestColumnIndex = $xls_end_column;
+                    $highestColumn = Coordinate::stringFromColumnIndex($highestColumnIndex);
+                }
+
                $startRow = max(1, $header_row);
                $startColumn = max(1, $start_column);

                // Advance startColumn to first non-empty cell in header row, matching JS behavior
                for ($sc = $startColumn; $sc <= $highestColumnIndex; $sc++) {
                    $cl = Coordinate::stringFromColumnIndex($sc);
-                    $cv = cleanCellText($worksheet->getCell($cl . $header_row)->getCalculatedValue() ?? '');
+                    $cv = trim((string)($worksheet->getCell($cl . $header_row)->getCalculatedValue() ?? ''));

                    if ($cv !== '') {
                        $startColumn = $sc;
@@ -246,19 +253,6 @@ try {
                    }
                }

-                $lastHeaderCol = $startColumn;
-                for ($hc = $startColumn; $hc <= $highestColumnIndex; $hc++) {
-                    $hl = Coordinate::stringFromColumnIndex($hc);
-                    $hv = cleanCellText($worksheet->getCell($hl . $header_row)->getCalculatedValue() ?? '');
-
-                    if ($hv !== '') {
-                        $lastHeaderCol = $hc;
-                    }
-                }
-
-                $highestColumnIndex = $lastHeaderCol;
-                $highestColumn = Coordinate::stringFromColumnIndex($highestColumnIndex);
-
                // Debug dei parametri
                error_log(
                    "Processing - template_id: $template_id, " .
@@ -321,7 +315,7 @@ try {

                        $columnLetter = Coordinate::stringFromColumnIndex($physCol);
                        $cell = $worksheet->getCell($columnLetter . $header_row);
-                        $cellValue = cleanCellText($cell ? $cell->getCalculatedValue() : '');
+                        $cellValue = trim((string)($cell ? $cell->getCalculatedValue() : ''));
                        $cellValue = preg_replace('/[\r\n\t]+/', ' ', $cellValue);

                        // Empty headers get __empty_N__ to match mapping page
@@ -358,7 +352,7 @@ try {
                        $filledCount = 0;

                        foreach ($headerFilledIndices as $idx) {
-                            if (isset($rowData[$idx]) && cleanCellText($rowData[$idx]) !== '') {
+                            if (isset($rowData[$idx]) && trim((string)$rowData[$idx]) !== '') {
                                $filledCount++;
                            }
                        }
@@ -4,6 +4,35 @@ require_once 'class/db-functions.php';

 $response = ["success" => false, "message" => ""];

+function excelColumnToIndex($column)
+{
+    $column = strtoupper(trim((string)$column));
+
+    if ($column === '') {
+        return null;
+    }
+
+    // Numeric column index, example: 40
+    if (ctype_digit($column)) {
+        $index = (int)$column;
+        return $index > 0 ? $index : null;
+    }
+
+    // Excel column letters, example: A, AN, XFC
+    if (!preg_match('/^[A-Z]+$/', $column)) {
+        return null;
+    }
+
+    $index = 0;
+    $length = strlen($column);
+
+    for ($i = 0; $i < $length; $i++) {
+        $index = ($index * 26) + (ord($column[$i]) - ord('A') + 1);
+    }
+
+    return $index;
+}
+
 try {
    if ($_SERVER["REQUEST_METHOD"] !== "POST") {
        throw new Exception("Invalid request method.");
@@ -18,6 +47,8 @@ try {
        : null;

    $start_column = trim($_POST['start_column'] ?? '');
+    $xls_end_column = strtoupper(trim($_POST['xls_end_column'] ?? ''));
+    $xls_end_column = $xls_end_column !== '' ? $xls_end_column : null;

    $xls_sheet_index = isset($_POST['xls_sheet_index']) && $_POST['xls_sheet_index'] !== ''
        ? intval($_POST['xls_sheet_index'])
@@ -63,6 +94,24 @@ try {
            throw new Exception("XLS Sheet Number cannot be negative.");
        }

+        $startColumnIndex = excelColumnToIndex($start_column);
+
+        if ($startColumnIndex === null) {
+            throw new Exception("Start Column is not valid. Use Excel column letters like A, AN or a positive number.");
+        }
+
+        if ($xls_end_column !== null) {
+            $endColumnIndex = excelColumnToIndex($xls_end_column);
+
+            if ($endColumnIndex === null) {
+                throw new Exception("Last Column is not valid. Use Excel column letters like AN or a positive number.");
+            }
+
+            if ($endColumnIndex < $startColumnIndex) {
+                throw new Exception("Last Column cannot be before Start Column.");
+            }
+        }
+
        $api_config_id = null;
    }

@@ -75,6 +124,7 @@ try {
        $header_row = null;
        $start_column = null;
        $xls_sheet_index = null;
+        $xls_end_column = null;
    }

    // PDF currently does not require XLS coordinates or API configuration
@@ -82,6 +132,7 @@ try {
        $header_row = null;
        $start_column = null;
        $xls_sheet_index = null;
+        $xls_end_column = null;
        $api_config_id = null;
    }

@@ -112,6 +163,7 @@ try {
            source_type,
            header_row,
            start_column,
+            xls_end_column,
            xls_sheet_index,
            api_config_id,
            description,
@@ -130,7 +182,7 @@ try {
        )
        VALUES
        (
-            ?, ?, ?, ?, ?, ?,
+            ?, ?, ?, ?, ?, ?,?,
            ?, ?, ?, ?, ?, ?,
            ?, ?, ?, ?, ?,
            NOW(), NOW()
@@ -142,6 +194,7 @@ try {
        $source_type,
        $header_row,
        $start_column,
+        $xls_end_column,
        $xls_sheet_index,
        $api_config_id,
        $description,
@@ -730,8 +730,8 @@
        {
            "IdSchemaCustomFields": 177,
            "ConteggioClienti": 0,
-            "Nome": "Phoebe philo ACC",
-            "Descrizione": "(scarpe, borse, cinture, occhiali, gioielleria)\r\n"
+            "Nome": "Phoebe Philo ",
+            "Descrizione": "\r\n\r\n"
        },
        {
            "IdSchemaCustomFields": 178,