Skip to content

Commit 5ab80b0

Browse files
martinydemartinyde
committed
Merge branch 'release/3.0.4'
2 parents d4e7b38 + b723f8f commit 5ab80b0

17 files changed

Lines changed: 3181 additions & 150 deletions

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ See [keep a changelog] for information about writing changes to this log.
88

99
## [Unreleased]
1010

11+
* [PR-38](https://github.com/itk-dev/sysstatus/pull/38)
12+
* Update importers
13+
* Add example data
14+
* Add fixtures
15+
1116
## [3.0.3] - 2025-07-29
1217

1318
* [PR-37](https://github.com/itk-dev/sysstatus/pull/37)

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ docker compose exec phpfpm bin/console itstyr:import:system <URL>
5555
docker compose exec phpfpm bin/console itstyr:import:report <URL>
5656
```
5757

58+
## Apply fixtures
59+
60+
```shell
61+
docker compose exec phpfpm bin/console doctrine:fixtures:load --group=imported_data --purge-exclusions=user
62+
```
63+
5864
### Flowchart
5965

6066
A helpful flowchart over the Entities, and Joinedtables.

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"twig/twig": "^2.12 || ^3.20"
3434
},
3535
"require-dev": {
36+
"doctrine/doctrine-fixtures-bundle": "^4.1",
3637
"ergebnis/composer-normalize": "^2.45",
3738
"friendsofphp/php-cs-fixer": "^3.73.1",
3839
"phpstan/extension-installer": "^1.4.3",

‎composer.lock‎

Lines changed: 170 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/bundles.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
1616
Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
1717
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
18+
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
1819
];

‎config/services.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Put parameters here that don't need to change on each machine where the app is deployed
55
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
66
parameters:
7-
7+
system_url: "%env(SYSTEM_URL)%"
88
services:
99
# default configuration for services in *this* file
1010
_defaults:

‎docker-compose.server.override.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
phpfpm:
3+
environment:
4+
- PHP_MAX_EXECUTION_TIME=60
5+
- PHP_MEMORY_LIMIT=256M

‎src/Controller/Admin/ReportCrudController.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public function configureFields(string $pageName): iterable
4141
case Crud::PAGE_INDEX:
4242
// Cf. https://github.com/itk-dev/sysstatus/blob/5383a3a566ce316c338441ed826ecf3fdcf98815/src/Controller/AdminController.php#L263-L288
4343
yield IdField::new('id')->setLabel('entity.report.sys_id');
44-
yield TextField::new('sysTitle')->setLabel('entity.report.sys_title');
44+
yield TextField::new('sysTitle')->setLabel('entity.report.sys_title')->renderAsHtml();
4545
yield CollectionField::new('groups')->setLabel('entity.report.groups')
4646
->renderExpanded();
47-
yield TextField::new('sysOwnerSub')->setLabel('entity.report.sys_owner_sub');
48-
yield TextField::new('sysSystemOwner')->setLabel('entity.report.sys_system_owner');
47+
yield TextField::new('sysOwnerSub')->setLabel('entity.report.sys_owner_sub')->renderAsHtml();
48+
yield TextField::new('sysSystemOwner')->setLabel('entity.report.sys_system_owner')->renderAsHtml();
4949
yield UrlField::new('sysLink')->setLabel('entity.report.sys_link')
5050
->formatValue(static fn ($value) => new TranslatableMessage('Link'));
5151
yield BooleanField::new('textSet')->setLabel('entity.report.text')
@@ -56,52 +56,52 @@ public function configureFields(string $pageName): iterable
5656

5757
case Crud::PAGE_DETAIL:
5858
// Cf. https://github.com/itk-dev/sysstatus/blob/5383a3a566ce316c338441ed826ecf3fdcf98815/config/packages/easy_admin.yaml#L100-L143
59-
yield TextField::new('sysTitle')->setLabel('entity.report.sys_title');
59+
yield TextField::new('sysTitle')->setLabel('entity.report.sys_title')->renderAsHtml();
6060
yield IdField::new('sysInternalId')->setLabel('entity.report.sys_internal_id');
6161
yield UrlField::new('eDocUrl')->setLabel('entity.report.edoc_url');
6262
yield UrlField::new('sysLink')->setLabel('entity.report.sys_link');
63-
yield TextField::new('name')->setLabel('entity.report.name');
63+
yield TextField::new('name')->setLabel('entity.report.name')->renderAsHtml();
6464
yield TextEditorField::new('text')->setLabel('entity.report.text')
6565
// Show raw value
6666
->setTemplatePath('admin/text_editor.raw.html.twig');
67-
yield TextField::new('sysSystemOwner')->setLabel('entity.report.sys_system_owner');
67+
yield TextField::new('sysSystemOwner')->setLabel('entity.report.sys_system_owner')->renderAsHtml();
6868
// @todo Add links to each group?
6969
yield CollectionField::new('groups')->setLabel('entity.report.groups');
7070
yield CollectionField::new('answerArea')->setLabel('entity.report.answers')
7171
->setTemplatePath('easy_admin_overrides/answers_show.html.twig');
72-
yield TextField::new('sysAlternativeTitle')->setLabel('entity.report.sys_alternative_title');
72+
yield TextField::new('sysAlternativeTitle')->setLabel('entity.report.sys_alternative_title')->renderAsHtml();
7373
yield DateTimeField::new('sysUpdated')->setLabel('entity.report.sys_updated');
74-
yield TextField::new('sysOwner')->setLabel('entity.report.sys_owner');
74+
yield TextField::new('sysOwner')->setLabel('entity.report.sys_owner')->renderAsHtml();
7575
yield BooleanField::new('sysConfidentialInformation')->setLabel('entity.report.sys_confidential_information');
76-
yield TextField::new('sysPurpose')->setLabel('entity.report.sys_purpose');
77-
yield TextField::new('sysClassification')->setLabel('entity.report.sys_classification');
76+
yield TextField::new('sysPurpose')->setLabel('entity.report.sys_purpose')->renderAsHtml();
77+
yield TextField::new('sysClassification')->setLabel('entity.report.sys_classification')->renderAsHtml();
7878
yield DateTimeField::new('sysDateForRevision')->setLabel('entity.report.sys_date_for_revision');
79-
yield TextField::new('sysPersons')->setLabel('entity.report.sys_persons');
80-
yield TextField::new('sysInformationTypes')->setLabel('entity.report.sys_information_types');
81-
yield TextField::new('sysDataSentTo')->setLabel('entity.report.sys_data_sent_to');
82-
yield TextField::new('sysDataComeFrom')->setLabel('entity.report.sys_data_come_from');
83-
yield TextField::new('sysDataLocation')->setLabel('entity.report.sys_data_location');
84-
yield TextField::new('sysLatestDeletionDate')->setLabel('entity.report.sys_latest_deletion_date');
85-
yield TextField::new('sysDataWorthSaving')->setLabel('entity.report.sys_data_worth_saving');
86-
yield TextField::new('sysDataProcessors')->setLabel('entity.report.sys_data_processors');
87-
yield TextField::new('sysDataProcessingAgreement')->setLabel('entity.report.sys_data_processing_agreement');
88-
yield TextField::new('sysDataProcessingAgreementLink')->setLabel('entity.report.sys_data_processing_agreement_link');
89-
yield TextField::new('sysAuditorStatement')->setLabel('entity.report.sys_auditor_statement');
90-
yield TextField::new('sysAuditorStatementLink')->setLabel('entity.report.sys_auditor_statement_link');
91-
yield TextField::new('sysDataToScience')->setLabel('entity.report.sys_data_to_science');
92-
yield TextField::new('sysUsage')->setLabel('entity.report.sys_usage');
93-
yield TextField::new('sysRequestForInsight')->setLabel('entity.report.sys_request_for_insight');
79+
yield TextField::new('sysPersons')->setLabel('entity.report.sys_persons')->renderAsHtml();
80+
yield TextField::new('sysInformationTypes')->setLabel('entity.report.sys_information_types')->renderAsHtml();
81+
yield TextField::new('sysDataSentTo')->setLabel('entity.report.sys_data_sent_to')->renderAsHtml();
82+
yield TextField::new('sysDataComeFrom')->setLabel('entity.report.sys_data_come_from')->renderAsHtml();
83+
yield TextField::new('sysDataLocation')->setLabel('entity.report.sys_data_location')->renderAsHtml();
84+
yield TextField::new('sysLatestDeletionDate')->setLabel('entity.report.sys_latest_deletion_date')->renderAsHtml();
85+
yield TextField::new('sysDataWorthSaving')->setLabel('entity.report.sys_data_worth_saving')->renderAsHtml();
86+
yield TextField::new('sysDataProcessors')->setLabel('entity.report.sys_data_processors')->renderAsHtml();
87+
yield TextField::new('sysDataProcessingAgreement')->setLabel('entity.report.sys_data_processing_agreement')->renderAsHtml();
88+
yield TextField::new('sysDataProcessingAgreementLink')->setLabel('entity.report.sys_data_processing_agreement_link')->renderAsHtml();
89+
yield TextField::new('sysAuditorStatement')->setLabel('entity.report.sys_auditor_statement')->renderAsHtml();
90+
yield TextField::new('sysAuditorStatementLink')->setLabel('entity.report.sys_auditor_statement_link')->renderAsHtml();
91+
yield TextField::new('sysDataToScience')->setLabel('entity.report.sys_data_to_science')->renderAsHtml();
92+
yield TextField::new('sysUsage')->setLabel('entity.report.sys_usage')->renderAsHtml();
93+
yield TextField::new('sysRequestForInsight')->setLabel('entity.report.sys_request_for_insight')->renderAsHtml();
9494
yield DateTimeField::new('sysDateUse')->setLabel('entity.report.sys_date_use');
95-
yield TextField::new('sysStatus')->setLabel('entity.report.sys_status');
96-
yield TextField::new('sysRemarks')->setLabel('entity.report.sys_remarks');
97-
yield TextField::new('sysInternalInformation')->setLabel('entity.report.sys_internal_information');
98-
yield TextField::new('sysObligationToInform')->setLabel('entity.report.sys_obligation_to_inform');
99-
yield TextField::new('sysLegalBasis')->setLabel('entity.report.sys_legal_basis');
100-
yield TextField::new('sysConsent')->setLabel('entity.report.sys_consent');
101-
yield TextField::new('sysImpactAnalysis')->setLabel('entity.report.sys_impact_analysis');
102-
yield TextField::new('sysImpactAnalysisLink')->setLabel('entity.report.sys_impact_analysis_link');
103-
yield TextField::new('sysAuthorizationProcedure')->setLabel('entity.report.sys_authorization_procedure');
104-
yield TextField::new('sysVersion')->setLabel('entity.report.sys_version');
95+
yield TextField::new('sysStatus')->setLabel('entity.report.sys_status')->renderAsHtml();
96+
yield TextField::new('sysRemarks')->setLabel('entity.report.sys_remarks')->renderAsHtml();
97+
yield TextField::new('sysInternalInformation')->setLabel('entity.report.sys_internal_information')->renderAsHtml();
98+
yield TextField::new('sysObligationToInform')->setLabel('entity.report.sys_obligation_to_inform')->renderAsHtml();
99+
yield TextField::new('sysLegalBasis')->setLabel('entity.report.sys_legal_basis')->renderAsHtml();
100+
yield TextField::new('sysConsent')->setLabel('entity.report.sys_consent')->renderAsHtml();
101+
yield TextField::new('sysImpactAnalysis')->setLabel('entity.report.sys_impact_analysis')->renderAsHtml();
102+
yield TextField::new('sysImpactAnalysisLink')->setLabel('entity.report.sys_impact_analysis_link')->renderAsHtml();
103+
yield TextField::new('sysAuthorizationProcedure')->setLabel('entity.report.sys_authorization_procedure')->renderAsHtml();
104+
yield TextField::new('sysVersion')->setLabel('entity.report.sys_version')->renderAsHtml();
105105

106106
return;
107107

0 commit comments

Comments
 (0)