Skip to content

A free open source IT asset/license management system

update LW 11354

Godfrey M2e122fa8d890
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php
index f913acac3a..379ec8f326 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php
@@ -96,17 +96,19 @@ class LabelWriter_11354 extends LabelWriter
}
// Right column
- if ($record->has('title')) {
- static::writeText(
- $pdf, $record->get('title'),
- $currentX, $currentY,
- 'freesans', 'b', self::TITLE_SIZE, 'L',
- $usableWidth, self::TITLE_SIZE, true, 0
- );
- $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+ $title = $record->has('title') ? $record->get('title') : null;
+ $fields = $record->get('fields');
+ $maxFields = $this->getSupportFields();
+ $fields = collect($fields);
+ if ($title) {
+ $maxFields = max(0, $maxFields - 1); // title consumes one row’s worth of space
}
- $fields = $record->get('fields');
+ $fields = $fields->take($maxFields)->values();
+
+ $usableHeight = $pa->h
+ - self::TAG_SIZE // bottom tag text
+ - self::BARCODE_MARGIN; // gap between fields and 1D
$field_layout = Helper::labelFieldLayoutScaling(
pdf: $pdf,
@@ -117,27 +119,42 @@ class LabelWriter_11354 extends LabelWriter
baseLabelSize: self::LABEL_SIZE,
baseFieldSize: self::FIELD_SIZE,
baseFieldMargin: self::FIELD_MARGIN,
+ title: $title,
+ baseTitleSize: self::TITLE_SIZE,
+ baseTitleMargin: self::TITLE_MARGIN,
baseLabelPadding: 1.5,
baseGap: 1.5,
maxScale: 1.8,
labelFont: 'freesans',
);
+ extract($field_layout);
+ if ($hasTitle) {
+ static::writeText(
+ $pdf, $title,
+ $currentX, $currentY,
+ 'freesans', 'b', $titleSize, 'L',
+ $usableWidth, $titleSize, true, 0
+ );
+ $currentY += $titleAdvance;
+ }
foreach ($fields as $field) {
+ $labelText = rtrim($field['label'], ':') . ':';
+
static::writeText(
- $pdf, $field['label'],
+ $pdf, $labelText,
$currentX, $currentY,
- 'freesans', '', $field_layout['labelSize'], 'L',
- $field_layout['labelWidth'], $field_layout['rowAdvance'], true, 0
+ 'freesans', '', $labelSize, 'L',
+ $labelWidth, $rowAdvance, true, 0
);
static::writeText(
$pdf, $field['value'],
$field_layout['valueX'], $currentY,
- 'freemono', 'B', $field_layout['fieldSize'], 'L',
- $field_layout['valueWidth'], $field_layout['rowAdvance'], true, 0, 0.01
+ 'freemono', 'B', $fieldSize, 'L',
+ $valueWidth, $rowAdvance, true, 0, 0.01
);
- $currentY += $field_layout['rowAdvance'];
+ $currentY += $rowAdvance;
}
}