sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sipo:80948d29440af9d34b1782798625c6a95daa8f29
Branches Tags
sipo:master
sipo:Development
sipo:production
sipo:previous
sipo:main
sipo:prerelease
sipo:release
..
compare: sipo:c7164be3230b78cbf98ef78ef7ba717c8b5b1578
Branches Tags
sipo:Development
sipo:master
sipo:production
sipo:previous
sipo:main
sipo:prerelease
sipo:release

5 Commits
80948d2944 ... c7164be323

Author SHA1 Message Date
Simon Pocrnjič
c7164be323 Merge branch 'master' into Development 2025-12-14 20:58:17 +01:00
Simon Pocrnjič
aa40ebed5c Again contract format problem in excel export fixed now! 2025-12-10 21:36:17 +01:00
Simon Pocrnjič
79de54eef0 Contract reference text format inside exported excel 2025-12-10 21:15:53 +01:00
Simon Pocrnjič
53941c054e add maatwebsite/excel to composer.json as required package 2025-12-10 21:05:22 +01:00
Simon Pocrnjič
1a7d2793b0 removed csrf from blade 2025-12-10 20:52:31 +01:00
3 changed files with 50 additions and 5 deletions
Show Stats Expand all files Collapse all files

51
app/Exports/SegmentContractsExport.php
View File

@ -8,14 +8,26 @@
use Maatwebsite\Excel\Concerns\FromQuery;
use Maatwebsite\Excel\Concerns\ShouldAutoSize;
use Maatwebsite\Excel\Concerns\WithColumnFormatting;
use Maatwebsite\Excel\Concerns\WithCustomValueBinder;
use Maatwebsite\Excel\Concerns\WithHeadings;
use Maatwebsite\Excel\Concerns\WithMapping;
use PhpOffice\PhpSpreadsheet\Cell\Cell;
use PhpOffice\PhpSpreadsheet\Cell\DataType;
use PhpOffice\PhpSpreadsheet\Cell\DefaultValueBinder;
use PhpOffice\PhpSpreadsheet\Shared\Date as ExcelDate;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
class SegmentContractsExport implements FromQuery, ShouldAutoSize, WithColumnFormatting, WithHeadings, WithMapping
class SegmentContractsExport extends DefaultValueBinder implements FromQuery, ShouldAutoSize, WithColumnFormatting, WithCustomValueBinder, WithHeadings, WithMapping
{
public const DATE_EXCEL_FORMAT = 'dd"."mm"."yyyy';
public const TEXT_EXCEL_FORMAT = NumberFormat::FORMAT_TEXT;
/**
* @var array<string, string>
*/
private array $columnLetterMap = [];
/**
* @var array<string, array{label: string}>
*/
@ -75,9 +87,15 @@ public function columnFormats(): array
{
$formats = [];
foreach ($this->columns as $index => $column) {
foreach ($this->getColumnLetterMap() as $letter => $column) {
if ($column === 'reference') {
$formats[$letter] = self::TEXT_EXCEL_FORMAT;
continue;
}
if (in_array($column, ['start_date', 'end_date'], true)) {
$formats[$this->columnLetter($index)] = self::DATE_EXCEL_FORMAT;
$formats[$letter] = self::DATE_EXCEL_FORMAT;
}
}
@ -122,4 +140,31 @@ private function columnLetter(int $index): string
return $letter;
}
public function bindValue(Cell $cell, $value): bool
{
$columnKey = $this->getColumnLetterMap()[$cell->getColumn()] ?? null;
if ($columnKey === 'reference') {
$cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
return true;
}
return parent::bindValue($cell, $value);
}
/**
* @return array<string, string>
*/
private function getColumnLetterMap(): array
{
if ($this->columnLetterMap === []) {
foreach ($this->columns as $index => $column) {
$this->columnLetterMap[$this->columnLetter($index)] = $column;
}
}
return $this->columnLetterMap;
}
}

1
resources/views/app.blade.php
View File

@ -3,7 +3,6 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<title inertia>{{ config('app.name', 'Laravel') }}</title>

3
tests/Feature/SegmentExportTest.php
View File

@ -141,7 +141,7 @@ public function test_export_filename_includes_client_name_when_filtered(): void
});
}
public function test_column_formats_apply_to_date_columns(): void
public function test_column_formats_apply_to_reference_and_date_columns(): void
{
$export = new SegmentContractsExport(
Contract::query(),
@ -150,6 +150,7 @@ public function test_column_formats_apply_to_date_columns(): void
$this->assertSame(
[
'A' => SegmentContractsExport::TEXT_EXCEL_FORMAT,
'B' => SegmentContractsExport::DATE_EXCEL_FORMAT,
'D' => SegmentContractsExport::DATE_EXCEL_FORMAT,
],