Skip to content
Snippets Groups Projects
Verified Commit cfe6971d authored by Damien's avatar Damien
Browse files

FEAT #9104 Export Head grey color

parent 8f8a2d5f
No related branches found
No related tags found
No related merge requests found
...@@ -149,6 +149,8 @@ class ExportController ...@@ -149,6 +149,8 @@ class ExportController
$leftJoinFunction[] = 'res_view_letterbox.fold_parent_id = folders.folders_system_id'; $leftJoinFunction[] = 'res_view_letterbox.fold_parent_id = folders.folders_system_id';
} elseif ($value['value'] == 'getCategory') { } elseif ($value['value'] == 'getCategory') {
$select[] = 'res_view_letterbox.category_id'; $select[] = 'res_view_letterbox.category_id';
} elseif ($value['value'] == 'getNature') {
$select[] = 'res_view_letterbox.nature_id';
} elseif ($value['value'] == 'getInitiatorEntity') { } elseif ($value['value'] == 'getInitiatorEntity') {
$select[] = 'enone.short_label AS "enone.short_label"'; $select[] = 'enone.short_label AS "enone.short_label"';
$tableFunction[] = 'entities enone'; $tableFunction[] = 'entities enone';
...@@ -235,6 +237,8 @@ class ExportController ...@@ -235,6 +237,8 @@ class ExportController
$csvContent[] = $resource['folders.folder_name']; $csvContent[] = $resource['folders.folder_name'];
} elseif ($value['value'] == 'getCategory') { } elseif ($value['value'] == 'getCategory') {
$csvContent[] = ResModel::getCategoryLabel(['categoryId' => $resource['category_id']]); $csvContent[] = ResModel::getCategoryLabel(['categoryId' => $resource['category_id']]);
} elseif ($value['value'] == 'getNature') {
$csvContent[] = ResModel::getNatureLabel(['natureId' => $resource['nature_id']]);
} elseif ($value['value'] == 'getInitiatorEntity') { } elseif ($value['value'] == 'getInitiatorEntity') {
$csvContent[] = $resource['enone.short_label']; $csvContent[] = $resource['enone.short_label'];
} elseif ($value['value'] == 'getDestinationEntity') { } elseif ($value['value'] == 'getDestinationEntity') {
...@@ -301,8 +305,9 @@ class ExportController ...@@ -301,8 +305,9 @@ class ExportController
$pdf->SetFont('', 'B', 12); $pdf->SetFont('', 'B', 12);
$labelHeight = ExportController::getMaximumHeight($pdf, ['data' => $labels, 'width' => $widthNoMargins / $columnsNumber]); $labelHeight = ExportController::getMaximumHeight($pdf, ['data' => $labels, 'width' => $widthNoMargins / $columnsNumber]);
$pdf->SetFillColor(230, 230, 230);
foreach ($aArgs['data'] as $value) { foreach ($aArgs['data'] as $value) {
$pdf->MultiCell($widthNoMargins / $columnsNumber, $labelHeight, $value['label'], 1, 'L', false, 0); $pdf->MultiCell($widthNoMargins / $columnsNumber, $labelHeight, $value['label'], 1, 'L', true, 0);
} }
$pdf->SetY($pdf->GetY() + $labelHeight); $pdf->SetY($pdf->GetY() + $labelHeight);
...@@ -327,6 +332,8 @@ class ExportController ...@@ -327,6 +332,8 @@ class ExportController
$content[] = $resource['folders.folder_name']; $content[] = $resource['folders.folder_name'];
} elseif ($value['value'] == 'getCategory') { } elseif ($value['value'] == 'getCategory') {
$content[] = ResModel::getCategoryLabel(['categoryId' => $resource['category_id']]); $content[] = ResModel::getCategoryLabel(['categoryId' => $resource['category_id']]);
} elseif ($value['value'] == 'getNature') {
$content[] = ResModel::getNatureLabel(['natureId' => $resource['nature_id']]);
} elseif ($value['value'] == 'getInitiatorEntity') { } elseif ($value['value'] == 'getInitiatorEntity') {
$content[] = $resource['enone.short_label']; $content[] = $resource['enone.short_label'];
} elseif ($value['value'] == 'getDestinationEntity') { } elseif ($value['value'] == 'getDestinationEntity') {
......
...@@ -96,11 +96,6 @@ export class ExportComponent implements OnInit { ...@@ -96,11 +96,6 @@ export class ExportComponent implements OnInit {
label: this.lang.confidentiality, label: this.lang.confidentiality,
isFunction: false isFunction: false
}, },
{
value: 'getNature',
label: this.lang.nature,
isFunction: true
},
{ {
value: 'alt_identifier', value: 'alt_identifier',
label: this.lang.chronoNumber, label: this.lang.chronoNumber,
...@@ -166,6 +161,11 @@ export class ExportComponent implements OnInit { ...@@ -166,6 +161,11 @@ export class ExportComponent implements OnInit {
label: this.lang.parentFolder, label: this.lang.parentFolder,
isFunction: true isFunction: true
}, },
{
value: 'getNature',
label: this.lang.nature,
isFunction: true
},
{ {
value: 'getCategory', value: 'getCategory',
label: this.lang.category_id, label: this.lang.category_id,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment