diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b186e70..a156c8e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret. ## [Under udvikling] +## [5.1.2] 2025-03-23 + +* Tilføjede mulighed for returadresse i digital post. + ## [5.1.1] 2026-03-09 * Sikrede at adresse påføres korrekt til både digital post og fjernprint. @@ -761,7 +765,9 @@ og [OS2Forms 3.7.0](https://github.com/OS2Forms/os2forms/releases/tag/3.7.0) * GO borgersager -[Under udvikling]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.1.0...HEAD +[Under udvikling]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.1.2...HEAD +[5.1.2]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.1.1...5.1.2 +[5.1.1]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.1.0...5.1.1 [5.1.0]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.0.4...5.1.0 [5.0.4]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.0.3...5.0.4 [5.0.3]: https://github.com/itk-dev/os2forms_selvbetjening/compare/5.0.2...5.0.3 diff --git a/composer.json b/composer.json index f6634a85..d99d1890 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "itk-dev/os2forms_nemlogin_openid_connect": "^2.2", "itk-dev/os2forms_user_field_lookup": "^1.1", "itk-dev/web_accessibility_statement": "^1.1", - "os2forms/os2forms": "dev-release/5.1.1 as 5.1.1", + "os2forms/os2forms": "dev-feature/sender-address-in-digital-post as 5.1.2", "os2forms/os2forms_forloeb_profile": "^1.15", "os2forms/os2forms_get_organized": "^2.0", "os2forms/os2forms_organisation": "^2.1", diff --git a/composer.lock b/composer.lock index 24267703..12f4f32e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "807b9bcf26a151f8cd8d817d647438bb", + "content-hash": "c0e2b8da0726b7dbf7e1c90e91688ee2", "packages": [ { "name": "asm89/stack-cors", @@ -9168,16 +9168,16 @@ }, { "name": "os2forms/os2forms", - "version": "dev-release/5.1.1", + "version": "dev-feature/sender-address-in-digital-post", "source": { "type": "git", "url": "https://github.com/itk-dev/os2forms.git", - "reference": "eeba74bcb5045682dada63be5650329c7897cb70" + "reference": "381f438bd856a0d9f25ac1410b7eec4f9873c5be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itk-dev/os2forms/zipball/eeba74bcb5045682dada63be5650329c7897cb70", - "reference": "eeba74bcb5045682dada63be5650329c7897cb70", + "url": "https://api.github.com/repos/itk-dev/os2forms/zipball/381f438bd856a0d9f25ac1410b7eec4f9873c5be", + "reference": "381f438bd856a0d9f25ac1410b7eec4f9873c5be", "shasum": "" }, "require": { @@ -9313,9 +9313,9 @@ ], "description": "Drupal 8 OS2Form module provides advanced webform functionality for Danish Municipalities", "support": { - "source": "https://github.com/itk-dev/os2forms/tree/feature/address-in-digital-post-pdfs" + "source": "https://github.com/itk-dev/os2forms/tree/feature/sender-address-in-digital-post" }, - "time": "2026-03-09T08:38:05+00:00" + "time": "2026-03-16T09:35:29+00:00" }, { "name": "os2forms/os2forms_forloeb_profile", @@ -22954,9 +22954,9 @@ "aliases": [ { "package": "os2forms/os2forms", - "version": "dev-release/5.1.1", - "alias": "5.1.1", - "alias_normalized": "5.1.1.0" + "version": "dev-feature/sender-address-in-digital-post", + "alias": "5.1.2", + "alias_normalized": "5.1.2.0" } ], "minimum-stability": "dev", diff --git a/web/themes/custom/os2forms_selvbetjening_theme/assets/pdf.scss b/web/themes/custom/os2forms_selvbetjening_theme/assets/pdf.scss index 176d7182..8c7ca0e7 100644 --- a/web/themes/custom/os2forms_selvbetjening_theme/assets/pdf.scss +++ b/web/themes/custom/os2forms_selvbetjening_theme/assets/pdf.scss @@ -62,7 +62,7 @@ footer { margin-top: $envelope-window-height; } -#envelope-window-digital-post > div { +#envelope-window-digital-post > .h-card { position: absolute; top: 16mm; left: 4mm; @@ -71,6 +71,18 @@ footer { width: $recipient-window-width; } +#envelope-window-digital-post > #sender-address-digital-post { + position: absolute; + top: 12mm; + left: 4mm; + font-size: 7px; + height: 4mm; + width: 71mm; + border-bottom: 1px solid black; + overflow: hidden; + white-space: nowrap; +} + .footer-content { width: 70%; display: inline-block; diff --git a/web/themes/custom/os2forms_selvbetjening_theme/build/pdf.css b/web/themes/custom/os2forms_selvbetjening_theme/build/pdf.css index 4cd861e6..237c888a 100644 --- a/web/themes/custom/os2forms_selvbetjening_theme/build/pdf.css +++ b/web/themes/custom/os2forms_selvbetjening_theme/build/pdf.css @@ -1 +1 @@ -@page{size:A4;margin:0}body,html{font-family:DejaVu Sans,Helvetica,Arial,sans-serif}body{margin:25mm 10mm 20mm 17mm}header{height:25mm;top:0}footer,header{font-size:12px;position:fixed;width:183mm}footer{bottom:0;height:20mm}#envelope-window-digital-post{background:#fff;height:89mm;left:17mm;position:absolute;top:25mm;width:115mm}#envelope-window-digital-post~* .webform-entity-print-body{margin-top:89mm}#envelope-window-digital-post>div{font-size:10px;height:21mm;left:4mm;position:absolute;top:16mm;width:59mm}.footer-content{display:inline-block;width:70%}details{border:1px solid #ccc;margin-bottom:1em;margin-top:1em}summary{font-size:20px!important;font-weight:700;padding:.5em .5em 0}summary::marker{display:none}.details-wrapper,fieldset,legend,summary{padding:0}fieldset{border:0;margin:0}.page img{height:auto;max-width:100%}.page td img{max-width:none}.details-wrapper{padding:0 1em}.form-item{margin-bottom:1em;margin-top:1em}label{display:block;font-weight:700}thead{border-bottom:1px solid #000}th{text-align:left}.strong-text{font-weight:700}.claro-details,details{border:none!important}.webform-submission-table{border-collapse:collapse;border-spacing:0;width:100%}.webform-submission-table th{min-width:100px;width:33%}.webform-submission-table td,.webform-submission-table th{font-size:12px;padding:10px 12px;text-align:left;vertical-align:top;word-break:break-word}.webform-submission-table tr{border-bottom:1px solid #ccc;border-top:1px solid #ccc;padding:.1em .6em}.webform-entity-print-body{font-size:14px;width:65%!important}.webform-element{break-inside:avoid;font-size:12px;margin:5px 0;padding:5px 0;page-break-inside:avoid}.webform-element-more--link{display:none}.webform-element-type-webform-table table{border:1px solid #d3d3d3;border-collapse:collapse;width:100%}.webform-element-type-webform-table table td,.webform-element-type-webform-table table th{border:1px solid #d3d3d3;overflow-wrap:anywhere;padding:.25em}.webform-entity-print-colophon{font-size:12px}.webform-section-title{font-size:14px!important}.table{width:100%}.page-numbers{bottom:0;display:inline-block;position:absolute;right:0;text-align:right;width:27%}.page-numbers .page-number:after{content:counter(page)} \ No newline at end of file +@page{size:A4;margin:0}body,html{font-family:DejaVu Sans,Helvetica,Arial,sans-serif}body{margin:25mm 10mm 20mm 17mm}header{height:25mm;top:0}footer,header{font-size:12px;position:fixed;width:183mm}footer{bottom:0;height:20mm}#envelope-window-digital-post{background:#fff;height:89mm;left:17mm;position:absolute;top:25mm;width:115mm}#envelope-window-digital-post~* .webform-entity-print-body{margin-top:89mm}#envelope-window-digital-post>.h-card{font-size:10px;height:21mm;left:4mm;position:absolute;top:16mm;width:59mm}#envelope-window-digital-post>#sender-address-digital-post{border-bottom:1px solid #000;font-size:7px;height:4mm;left:4mm;overflow:hidden;position:absolute;top:12mm;white-space:nowrap;width:71mm}.footer-content{display:inline-block;width:70%}details{border:1px solid #ccc;margin-bottom:1em;margin-top:1em}summary{font-size:20px!important;font-weight:700;padding:.5em .5em 0}summary::marker{display:none}.details-wrapper,fieldset,legend,summary{padding:0}fieldset{border:0;margin:0}.page img{height:auto;max-width:100%}.page td img{max-width:none}.details-wrapper{padding:0 1em}.form-item{margin-bottom:1em;margin-top:1em}label{display:block;font-weight:700}thead{border-bottom:1px solid #000}th{text-align:left}.strong-text{font-weight:700}.claro-details,details{border:none!important}.webform-submission-table{border-collapse:collapse;border-spacing:0;width:100%}.webform-submission-table th{min-width:100px;width:33%}.webform-submission-table td,.webform-submission-table th{font-size:12px;padding:10px 12px;text-align:left;vertical-align:top;word-break:break-word}.webform-submission-table tr{border-bottom:1px solid #ccc;border-top:1px solid #ccc;padding:.1em .6em}.webform-entity-print-body{font-size:14px;width:65%!important}.webform-element{break-inside:avoid;font-size:12px;margin:5px 0;padding:5px 0;page-break-inside:avoid}.webform-element-more--link{display:none}.webform-element-type-webform-table table{border:1px solid #d3d3d3;border-collapse:collapse;width:100%}.webform-element-type-webform-table table td,.webform-element-type-webform-table table th{border:1px solid #d3d3d3;overflow-wrap:anywhere;padding:.25em}.webform-entity-print-colophon{font-size:12px}.webform-section-title{font-size:14px!important}.table{width:100%}.page-numbers{bottom:0;display:inline-block;position:absolute;right:0;text-align:right;width:27%}.page-numbers .page-number:after{content:counter(page)} \ No newline at end of file