Merge pull request #49 from OS2Forms/develop

Pull request

Author: skifter

CHANGELOG.md

@@ -11,12 +11,18 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [OSF-25] added modules/os2forms_forloeb
+- [OSF-25] added modules/os2forms_permissions_by_term
+- [OSF-25] added modules/os2forms_webform_list
+
 ## [3.5.0] 2023-04-25
 
 - Added SessionDynamicValue webform element
 - Fixed `Undefined array key` in os2forms_attachment module
 - Added Maps element (<https://github.com/OS2Forms/os2forms/pull/39>).
 - Added missing dependency
+- Added changes to Map element after external review
+- Fixed non-existent service "entity.manager" in webform_embed module
 
 ## [3.4.0] 2023-02-15
 

composer.json

@@ -17,38 +17,86 @@
     },
     "require": {
         "cweagans/composer-patches": "^1.6.5",
+        "dompdf/dompdf": "^2.0",
+        "drupal/admin_toolbar": "^3.0",
+        "drupal/chosen": "^2.10",
+        "drupal/ckeditor_a11ychecker": "^2.0@alpha",
+        "drupal/clientside_validation": "^3.0",
+        "drupal/coc_forms_auto_export": "^2.0@alpha",
+        "drupal/config_entity_revisions": "^1.7.0",
+        "drupal/diff": "^1.0",
+        "drupal/embed": "^1.4",
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
+        "drupal/events_logging": "^1.5",
+        "drupal/header_and_footer_scripts": "^3.0",
         "drupal/honeypot": "^2.0",
+        "drupal/image_widget_crop": "^2.3",
+        "drupal/ldap": "^4.2",
+        "drupal/ldap_auth": "^1.17",
+        "drupal/leaflet": "^10.0",
+        "drupal/leaflet_layers": "^1.1",
+        "drupal/libraries": "^3.0@beta",
+        "drupal/linkit": "^5.0",
+        "drupal/logging_alerts": "^2.0",
+        "drupal/maestro": "^3.0",
         "drupal/mailsystem": "^4.1",
+        "drupal/masquerade": "^2.0@RC",
         "drupal/pathauto": "^1.5",
         "drupal/permissions_by_term": "^3.1 || ^2.25",
+        "drupal/queue_mail": "^1.4",
+        "drupal/queue_ui": "^2.1",
+        "drupal/r4032login": "^2.1",
         "drupal/redirect": "^1.4",
+        "drupal/simple_ldap": "^1.0@alpha",
+        "drupal/simplesamlphp_auth": "^3.2",
         "drupal/smtp": "^1.0@beta",
+        "drupal/switch_page_theme": "^4.0",
+        "drupal/telephone_validation": "^2.2",
         "drupal/token": "^1.5",
+        "drupal/ultimate_cron": "^2.0.0",
+        "drupal/user_default_page": "^2.1",
         "drupal/webform": "^6.1",
+        "drupal/webform_composite": "^1.0@RC",
         "drupal/webform_migrate": "^1.1",
+        "drupal/webform_node_element": "^1.2",
+        "drupal/webform_remote_handlers": "^1.6.0",
         "drupal/webform_remote_select": "^1.0.6",
+        "drupal/webform_rest": "^4.0.0-beta2",
+        "drupal/webform_scheduled_tasks": "^2.0",
         "drupal/webform_validation": "^2.0",
+        "drupal/webform_views": "^5.0@alpha",
+        "drupal/workflow_participants": "^2.4",
         "os2web/os2web_datalookup": "^1.0",
         "os2web/os2web_nemlogin": "^1.0",
         "phpoffice/phpword": "^0.18.2",
-        "tecnickcom/tcpdf": "~6"
+        "tecnickcom/tcpdf": "~6",
+        "webmozart/path-util": "^2.3",
+        "zaporylie/composer-drupal-optimizations": "^1.2"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "drupal/coder": "^8.3",
         "drupal/maillog": "^1.0"
     },
     "extra" : {
-        "composer-exit-on-patch-failure": true,
+        "composer-exit-on-patch-failure": false,
         "enable-patching" : true,
         "patches": {
             "drupal/entity_print": {
                 "2733781 - Add Export to Word Support": "https://www.drupal.org/files/issues/2019-11-22/2733781-47.patch"
             },
             "drupal/webform": {
                 "Unlock possibility of using Entity print module export to Word": "https://www.drupal.org/files/issues/2020-02-29/3096552-6.patch"
+            },
+            "drupal/user_default_page": {
+                "Warning: in_array() expects parameter 2 to be array, null given in user_default_page_user_logout() (https://www.drupal.org/node/3246986)": "https://www.drupal.org/files/issues/2021-11-01/user_default_page-3246986-2.patch"
+            },
+            "drupal/coc_forms_auto_export": {
+                "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"
+            },
+            "drupal/dynamic_entity_reference": {
+                "entityQuery reference JOINs should specify target_type (https://www.drupal.org/project/dynamic_entity_reference/issues/3120952#comment-14141038)": "https://www.drupal.org/files/issues/2021-06-22/entityquery-reference-joins-should-specify-target_type-3120952-24.patch"
             }
         }
     },

modules/os2forms_attachment/templates/os2forms-attachment--webform-submission.html.twig

@@ -6,9 +6,71 @@
   <meta name="author" content="{{ author }}">
   <title>{{ title }}</title>
   {{ entity_print_css }}
+  <style>
+    @page {
+      margin: 180px 35px 150px 35px;
+    }
+
+    header {
+      position: fixed;
+      top: -150px;
+      left: 25px;
+      right: 0px;
+      height: 50px;
+      font-size: 12px;
+    }
+
+    footer {
+      position: fixed;
+      bottom: -50px;
+      left: 25px;
+      right: 0px;
+      height: 50px;
+      font-size: 12px;
+    }
+
+    .webform-entity-print-body {
+      font-size: 14px;
+      width: 65% !important;
+    }
+
+    .webform-element {
+      padding: 5px 0;
+      margin: 5px 0;
+      font-size: 12px;
+    }
+
+    .webform-entity-print-colophon {
+      font-size: 12px;
+      margin-top: -11px;
+    }
+
+    thead {
+      border-bottom: 1px solid black;
+    }
+
+    th {
+      text-align: left;
+    }
+
+    details, .claro-details {
+      border: none !important;
+    }
+
+    summary {
+      font-size: 20px !important;
+    }
+
+    .webform-section-title {
+      font-size: 14px !important;
+    }
+
+    .table {
+      width: 100%;
+    }
+  </style>
 </head>
 <body>
-
 {% if header %}
 <header>
   {{ header }}

modules/os2forms_forloeb/CHANGELOG.md

@@ -0,0 +1,59 @@
+# OS2Forms Forløb Change Log
+All notable changes to this project should be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+See ["how do I make a good changelog record?"](https://keepachangelog.com/en/1.0.0/#how) 
+before starting to add changes.
+
+## [Unreleased]
+
+## 2.5.2 - 27.03.2023
+
+### Updated
+- Bumped drupal/ultimate_cron version fixing [Deprecated function: Implicit conversion from float-string](https://www.drupal.org/project/ultimate_cron/issues/3256142). 
+
+## 2.5.1 - 10.03.2023
+- Added github action for checking changelog changes when creating pull requests
+- Added os2forms/os2forms dependency
+- Changed composer patching configuration
+- Removed patches that don't belong in this project (Patched correctly in os2forms/os2forms project)
+- Added patch for drupal/dynamic_entity_reference
+- Remove drupal dependency on user default page module
+
+## 2.5.0 - 11.10.2022
+
+### Added 
+- retry task controller action
+- Added support for inheriting values without creating a submission
+
+## 2.4.0 
+
+### Added
+- Github CI action for checking Drupal Coding standards with PHP Code Sniffer
+- Fixed coding standards issues
+
+
+## Example of change log record
+```
+## [x.x.x] Release name
+### Added
+- Description on added functionality.
+
+### Changed/Updated
+- Description on changed/updated functionality.
+
+### Deprecated
+- Description of soon-to-be removed features.
+
+### Removed
+- Description of removed features.
+
+### Fixed
+- Decription of bug fixes.
+
+### Security
+- Security in case of vulnerabilities.
+
+```