DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle blank labels on asset label fields

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-03-10 14:03:21 +00:00
parent 37dfecf098
commit cde5502f94
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/Models/Labels/DefaultLabel.php
View file

@ -160,24 +160,31 @@ class DefaultLabel extends RectangleSheet
$textY += $this->textSize + self::TEXT_MARGIN;
}
// Fields
// Render the selected fields with their labels
$fieldsDone = 0;
if ($fieldsDone < $this->getSupportFields()) {
foreach ($record->get('fields') as $field) {
if ((array_key_exists('label', $field)) && (is_array($field['label']))) {
static::writeText(
$pdf, $field['label'][0]. ': ' . $field['value'],
$textX1, $textY,
'freesans', '', $this->textSize, 'L',
$textW, $this->textSize,
true, 0
);
$textY += $this->textSize + self::TEXT_MARGIN;
$fieldsDone++;
$field_label = $field['label'];
// If the label field in the visible fields on the asset label is NOT blank,
// set the label to that value.
if ($field_label!='') {
$field_label = $field_label.': ';
}
// Actually write the selected fields and their matching values
static::writeText(
$pdf, $field_label . $field['value'],
$textX1, $textY,
'freesans', '', $this->textSize, 'L',
$textW, $this->textSize,
true, 0
);
$textY += $this->textSize + self::TEXT_MARGIN;
$fieldsDone++;
}
}
}