diff --git a/application/YoshiKan/Application/Query/Member/ExportSubscriptions.php b/application/YoshiKan/Application/Query/Member/ExportSubscriptions.php
index f417320..bac342e 100644
--- a/application/YoshiKan/Application/Query/Member/ExportSubscriptions.php
+++ b/application/YoshiKan/Application/Query/Member/ExportSubscriptions.php
@@ -110,6 +110,8 @@ public function exportMembersForLocation(int $locationId): Spreadsheet
$sheet->setCellValue([7, $rowCounter], 'Adres');
$sheet->setCellValue([8, $rowCounter], 'Postcode');
$sheet->setCellValue([9, $rowCounter], 'Gemeente');
+ $sheet->setCellValue([10, $rowCounter], 'Email');
+ $sheet->setCellValue([11, $rowCounter], 'Telefoon');
// -- data -----------------------------------------------------------------
++$rowCounter;
@@ -126,6 +128,9 @@ public function exportMembersForLocation(int $locationId): Spreadsheet
$sheet->setCellValue([7, $rowCounter], $member->getAddressStreet().' '.$member->getAddressNumber().' '.$member->getAddressBox());
$sheet->setCellValue([8, $rowCounter], $member->getAddressZip());
$sheet->setCellValue([9, $rowCounter], $member->getAddressCity());
+ $sheet->setCellValue([10, $rowCounter], $member->getContactEmail());
+ $sheet->setCellValue([11, $rowCounter], $member->getContactPhone());
+
++$rowCounter;
}
@@ -154,6 +159,7 @@ public function renderMembersForLocation(int $locationId): bool
'members' => $members,
'generatedOn' => $generatedOn,
'locationName' => $location->getName(),
+ 'locationCode' => $location->getCode(),
]);
$options = new Options();
@@ -164,7 +170,7 @@ public function renderMembersForLocation(int $locationId): bool
$dompdf->setPaper('A4', 'landscape');
$dompdf->render();
- $fileName = $generatedOn->format('YmdHis').'_YoshiKan_Leden_'.$locationCode.'.pdf';
+ $fileName = $generatedOn->format('Ymd').'_YoshiKan_Leden_'.$locationCode.'.pdf';
$dompdf->stream($fileName, ['Attachment' => false]);
exit;
diff --git a/application/YoshiKan/Infrastructure/Templates/pdf/list_member.html.twig b/application/YoshiKan/Infrastructure/Templates/pdf/list_member.html.twig
index 55a3ee8..29f4728 100644
--- a/application/YoshiKan/Infrastructure/Templates/pdf/list_member.html.twig
+++ b/application/YoshiKan/Infrastructure/Templates/pdf/list_member.html.twig
@@ -16,7 +16,7 @@
}
@page {
- margin: 20mm;
+ margin: 10mm;
}
pre {
@@ -110,10 +110,10 @@
{# ------------------------------------------------------------------------------------------------------------------ #}
- Leden lijst Yoshi-Kan vzw - {{ locationName }}
+ Leden lijst Yoshi-Kan - {{ locationName }}
{# ------------------------------------------------------------------------------------------------------------------ #}
@@ -126,12 +126,17 @@
Ref. |
Naam |
Voornaam |
- Geslacht |
+ {% if locationCode !== 'HEIST-OP-DEN-BERG' %}
+ Geslacht |
+ {% endif %}
Geboortedatum |
Leeftijd |
Adres |
Postcode |
Gemeente |
+ {% if locationCode === 'HEIST-OP-DEN-BERG' %}
+ Telefoon |
+ {% endif %}
@@ -142,10 +147,15 @@
{% set dateDiffYears = dateDiff / (60 * 60 * 24 * 365.25) %}
- YK-{{ member.id }} |
+
+ {% if locationCode !== 'HEIST-OP-DEN-BERG' %}YK-{% endif %}
+ {{ member.id }}
+ |
{{ member.lastname }} |
{{ member.firstname }} |
- {{ member.gender.value }} |
+ {% if locationCode !== 'HEIST-OP-DEN-BERG' %}
+ {{ member.gender.value }} |
+ {% endif %}
{{ dateOfBirth | date('d / m / Y') }} |
{% if dateDiffYears > 18 %}
@@ -157,6 +167,9 @@
| {{ member.addressStreet }} {{ member.addressNumber }} {{ member.addressBox }} |
{{ member.addressZip }} |
{{ member.addressCity }} |
+ {% if locationCode === 'HEIST-OP-DEN-BERG' %}
+ {{ member.contactPhone }} |
+ {% endif %}
{% endfor %}
diff --git a/composer.lock b/composer.lock
index 6d5f7bd..38bb2f5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6106,16 +6106,16 @@
},
{
"name": "mollie/mollie-api-php",
- "version": "v2.64.0",
+ "version": "v2.65.0",
"source": {
"type": "git",
"url": "https://github.com/mollie/mollie-api-php.git",
- "reference": "b54e0b05b98e15233d89724933c42c249d4b13d4"
+ "reference": "3920816c311ec785f47f160204296d1b7f918da5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/b54e0b05b98e15233d89724933c42c249d4b13d4",
- "reference": "b54e0b05b98e15233d89724933c42c249d4b13d4",
+ "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/3920816c311ec785f47f160204296d1b7f918da5",
+ "reference": "3920816c311ec785f47f160204296d1b7f918da5",
"shasum": ""
},
"require": {
@@ -6192,9 +6192,9 @@
],
"support": {
"issues": "https://github.com/mollie/mollie-api-php/issues",
- "source": "https://github.com/mollie/mollie-api-php/tree/v2.64.0"
+ "source": "https://github.com/mollie/mollie-api-php/tree/v2.65.0"
},
- "time": "2023-12-19T16:06:39+00:00"
+ "time": "2024-01-23T12:39:48+00:00"
},
{
"name": "monolog/monolog",
@@ -6503,16 +6503,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.72.1",
+ "version": "2.72.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"
+ "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
- "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130",
+ "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130",
"shasum": ""
},
"require": {
@@ -6606,7 +6606,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-08T23:47:49+00:00"
+ "time": "2024-01-19T00:21:53+00:00"
},
{
"name": "nette/utils",
@@ -8681,16 +8681,16 @@
},
{
"name": "resend/resend-php",
- "version": "v0.10.0",
+ "version": "v0.10.1",
"source": {
"type": "git",
"url": "https://github.com/resend/resend-php.git",
- "reference": "f9452a8db7d471c9a774c7c0d5b198bb58b74823"
+ "reference": "e3ffb2bbcf8dcd498f507e67307b3ca7e3858bca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/resend/resend-php/zipball/f9452a8db7d471c9a774c7c0d5b198bb58b74823",
- "reference": "f9452a8db7d471c9a774c7c0d5b198bb58b74823",
+ "url": "https://api.github.com/repos/resend/resend-php/zipball/e3ffb2bbcf8dcd498f507e67307b3ca7e3858bca",
+ "reference": "e3ffb2bbcf8dcd498f507e67307b3ca7e3858bca",
"shasum": ""
},
"require": {
@@ -8732,9 +8732,9 @@
],
"support": {
"issues": "https://github.com/resend/resend-php/issues",
- "source": "https://github.com/resend/resend-php/tree/v0.10.0"
+ "source": "https://github.com/resend/resend-php/tree/v0.10.1"
},
- "time": "2024-01-02T19:17:07+00:00"
+ "time": "2024-01-25T05:41:45+00:00"
},
{
"name": "sabberworm/php-css-parser",
@@ -15461,16 +15461,16 @@
},
{
"name": "symfonycasts/reset-password-bundle",
- "version": "v1.20.1",
+ "version": "v1.20.2",
"source": {
"type": "git",
"url": "https://github.com/SymfonyCasts/reset-password-bundle.git",
- "reference": "aaf9477d0aa3a28e9c4ef7d3eb6b917f1e11f9f8"
+ "reference": "b79a28c975d72b5ac7febeebe139de436add26c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SymfonyCasts/reset-password-bundle/zipball/aaf9477d0aa3a28e9c4ef7d3eb6b917f1e11f9f8",
- "reference": "aaf9477d0aa3a28e9c4ef7d3eb6b917f1e11f9f8",
+ "url": "https://api.github.com/repos/SymfonyCasts/reset-password-bundle/zipball/b79a28c975d72b5ac7febeebe139de436add26c4",
+ "reference": "b79a28c975d72b5ac7febeebe139de436add26c4",
"shasum": ""
},
"require": {
@@ -15501,9 +15501,9 @@
"description": "Symfony bundle that adds password reset functionality.",
"support": {
"issues": "https://github.com/SymfonyCasts/reset-password-bundle/issues",
- "source": "https://github.com/SymfonyCasts/reset-password-bundle/tree/v1.20.1"
+ "source": "https://github.com/SymfonyCasts/reset-password-bundle/tree/v1.20.2"
},
- "time": "2024-01-02T16:46:54+00:00"
+ "time": "2024-01-22T12:46:34+00:00"
},
{
"name": "tightenco/collect",
@@ -16985,16 +16985,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.47.1",
+ "version": "v3.48.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "173c60d1eff911c9c54322704623a45561d3241d"
+ "reference": "a92472c6fb66349de25211f31c77eceae3df024e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/173c60d1eff911c9c54322704623a45561d3241d",
- "reference": "173c60d1eff911c9c54322704623a45561d3241d",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a92472c6fb66349de25211f31c77eceae3df024e",
+ "reference": "a92472c6fb66349de25211f31c77eceae3df024e",
"shasum": ""
},
"require": {
@@ -17064,7 +17064,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.47.1"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.48.0"
},
"funding": [
{
@@ -17072,7 +17072,7 @@
"type": "github"
}
],
- "time": "2024-01-16T18:54:21+00:00"
+ "time": "2024-01-19T21:44:39+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -17549,16 +17549,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.56",
+ "version": "1.10.57",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "27816a01aea996191ee14d010f325434c0ee76fa"
+ "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/27816a01aea996191ee14d010f325434c0ee76fa",
- "reference": "27816a01aea996191ee14d010f325434c0ee76fa",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
+ "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
"shasum": ""
},
"require": {
@@ -17607,20 +17607,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-15T10:43:00+00:00"
+ "time": "2024-01-24T11:51:34+00:00"
},
{
"name": "phpstan/phpstan-doctrine",
- "version": "1.3.57",
+ "version": "1.3.59",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-doctrine.git",
- "reference": "b3e7d2d45edf5e423132901a5563f30c391990a0"
+ "reference": "9534fcd0b6906c62594146b506acadeabd3a99b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/b3e7d2d45edf5e423132901a5563f30c391990a0",
- "reference": "b3e7d2d45edf5e423132901a5563f30c391990a0",
+ "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/9534fcd0b6906c62594146b506acadeabd3a99b3",
+ "reference": "9534fcd0b6906c62594146b506acadeabd3a99b3",
"shasum": ""
},
"require": {
@@ -17675,9 +17675,9 @@
"description": "Doctrine extensions for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-doctrine/issues",
- "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.57"
+ "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.59"
},
- "time": "2024-01-16T12:26:37+00:00"
+ "time": "2024-01-18T09:41:35+00:00"
},
{
"name": "phpstan/phpstan-symfony",
@@ -18072,16 +18072,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.15",
+ "version": "9.6.16",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
+ "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f",
+ "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f",
"shasum": ""
},
"require": {
@@ -18155,7 +18155,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16"
},
"funding": [
{
@@ -18171,7 +18171,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-01T16:55:19+00:00"
+ "time": "2024-01-19T07:03:14+00:00"
},
{
"name": "psalm/plugin-symfony",
@@ -19508,16 +19508,16 @@
},
{
"name": "vimeo/psalm",
- "version": "5.19.0",
+ "version": "5.20.0",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b"
+ "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/06b71be009a6bd6d81b9811855d6629b9fe90e1b",
- "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/3f284e96c9d9be6fe6b15c79416e1d1903dcfef4",
+ "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4",
"shasum": ""
},
"require": {
@@ -19614,7 +19614,7 @@
"issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm"
},
- "time": "2024-01-09T21:02:43+00:00"
+ "time": "2024-01-18T12:15:06+00:00"
},
{
"name": "weirdan/doctrine-psalm-plugin",
diff --git a/psalm.xml b/psalm.xml
index 2fabcbc..64ee303 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -44,5 +44,6 @@
+