A free open source IT asset/license management system
if label is null make room for value
Godfrey M3718ce9749b6
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.phpindex 46551bc84c..dc5e5ac3b7 100644--- a/app/Helpers/Helper.php+++ b/app/Helpers/Helper.php@@ -1794,6 +1794,12 @@ class Helper$maxLabelWidthPerUnit = 0;foreach ($fields as $field) {+ $rawLabel = $field['label'] ?? null;++ // If no label, do not include it in label-column sizing+ if (!is_string($rawLabel) || trim($rawLabel) === '') {+ continue;+ }$label = rtrim($field['label'], ':') . ':';$width = $pdf->GetStringWidth($label);$maxLabelWidthPerUnit = max($maxLabelWidthPerUnit, $width / $baseLabelSize);diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.phpindex 379ec8f326..edbdb99d9f 100644--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php@@ -139,6 +139,22 @@ class LabelWriter_11354 extends LabelWriter$currentY += $titleAdvance;}foreach ($fields as $field) {+ $rawLabel = $field['label'] ?? null;+ $value = (string)($field['value'] ?? '');++ // No label: value takes the whole row+ if (!is_string($rawLabel) || trim($rawLabel) === '') {+ static::writeText(+ $pdf, $value,+ $currentX, $currentY,+ 'freemono', 'B', $fieldSize, 'L',+ $usableWidth, $rowAdvance, true, 0, 0.01+ );++ $currentY += $rowAdvance;+ continue;+ }+$labelText = rtrim($field['label'], ':') . ':';static::writeText(diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.phpindex fd988a0f79..f69ba44889 100644--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php@@ -126,6 +126,22 @@ class LabelWriter_1933081 extends LabelWriter$currentY += $titleAdvance;}foreach ($fields as $field) {+ $rawLabel = $field['label'] ?? null;+ $value = (string)($field['value'] ?? '');++ // No label: value takes the whole row+ if (!is_string($rawLabel) || trim($rawLabel) === '') {+ static::writeText(+ $pdf, $value,+ $currentX, $currentY,+ 'freemono', 'B', $fieldSize, 'L',+ $usableWidth, $rowAdvance, true, 0, 0.01+ );++ $currentY += $rowAdvance;+ continue;+ }+$labelText = rtrim($field['label'], ':') . ':';static::writeText(diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.phpindex d7dde401b9..5a8d154461 100644--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php@@ -126,6 +126,22 @@ class LabelWriter_2112283 extends LabelWriter$currentY += $titleAdvance;}foreach ($fields as $field) {+ $rawLabel = $field['label'] ?? null;+ $value = (string)($field['value'] ?? '');++ // No label: value takes the whole row+ if (!is_string($rawLabel) || trim($rawLabel) === '') {+ static::writeText(+ $pdf, $value,+ $currentX, $currentY,+ 'freemono', 'B', $fieldSize, 'L',+ $usableWidth, $rowAdvance, true, 0, 0.01+ );++ $currentY += $rowAdvance;+ continue;+ }+$labelText = rtrim($field['label'], ':') . ':';static::writeText(