Merged in feature/BKL-91-AddMetadataToDocument (pull request #66)

AndreasEngelmark · AndreasEngelmark · commit debd30f17ef2 · 2022-06-03T11:46:47.000Z
Feature/BKL-91 AddMetadataToDocument
diff --git a/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml
@@ -8,18 +8,41 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - autocomplete_deluxe
     - datetime
+    - field_group
     - paragraphs
     - path
     - text
+third_party_settings:
+  field_group:
+    group_metadata:
+      children:
+        - os2loop_shared_version
+        - os2loop_shared_approver
+        - os2loop_shared_approval_date
+        - os2loop_shared_rev_date
+      parent_name: ''
+      weight: 12
+      format_type: fieldset
+      region: content
+      format_settings:
+        show_empty_fields: false
+        id: ''
+        classes: ''
+        description: ''
+        required_fields: true
+      label: Metadata
 id: node.os2loop_documents_document.default
 targetEntityType: node
 bundle: os2loop_documents_document
@@ -68,12 +91,26 @@ content:
     type: text_textarea
     region: content
   os2loop_notify_users:
-    weight: 26
+    weight: 15
     settings:
       display_label: true
     third_party_settings: {  }
     type: boolean_checkbox
     region: content
+  os2loop_shared_approval_date:
+    weight: 28
+    settings: {  }
+    third_party_settings: {  }
+    type: datetime_default
+    region: content
+  os2loop_shared_approver:
+    weight: 27
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
   os2loop_shared_category:
     weight: 8
     settings:
@@ -102,7 +139,7 @@ content:
     type: autocomplete_deluxe
     region: content
   os2loop_shared_rev_date:
-    weight: 12
+    weight: 29
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
@@ -141,9 +178,17 @@ content:
     third_party_settings: {  }
     type: autocomplete_deluxe
     region: content
+  os2loop_shared_version:
+    weight: 26
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
   path:
     type: path
-    weight: 13
+    weight: 14
     region: content
     settings: {  }
     third_party_settings: {  }
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml
@@ -8,11 +8,14 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - datetime
@@ -70,6 +73,23 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  os2loop_shared_approval_date:
+    weight: 14
+    label: inline
+    settings:
+      format_type: medium
+      timezone_override: ''
+    third_party_settings: {  }
+    type: datetime_default
+    region: content
+  os2loop_shared_approver:
+    weight: 13
+    label: inline
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
   os2loop_shared_category:
     weight: 6
     label: above
@@ -88,7 +108,7 @@ content:
     region: content
   os2loop_shared_rev_date:
     weight: 11
-    label: above
+    label: inline
     settings:
       format_type: medium
       timezone_override: ''
@@ -111,6 +131,14 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
+  os2loop_shared_version:
+    weight: 12
+    label: inline
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
 hidden:
   entity_print_view_epub: true
   entity_print_view_pdf: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.list_display.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.list_display.yml
@@ -9,11 +9,14 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - entity_reference_revisions
@@ -95,5 +98,8 @@ hidden:
   os2loop_documents_document_body: true
   os2loop_documents_info_box: true
   os2loop_notify_users: true
+  os2loop_shared_approval_date: true
+  os2loop_shared_approver: true
   os2loop_shared_rev_date: true
+  os2loop_shared_version: true
   search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.os2loop_search_db_search_autocomplete.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.os2loop_search_db_search_autocomplete.yml
@@ -9,11 +9,14 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - user
@@ -56,7 +59,10 @@ hidden:
   os2loop_documents_document_conte: true
   os2loop_documents_info_box: true
   os2loop_notify_users: true
+  os2loop_shared_approval_date: true
+  os2loop_shared_approver: true
   os2loop_shared_category: true
   os2loop_shared_profession: true
   os2loop_shared_rev_date: true
   os2loop_shared_tags: true
+  os2loop_shared_version: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.pdf.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.pdf.yml
@@ -9,11 +9,14 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - entity_reference_revisions
@@ -100,6 +103,9 @@ hidden:
   entity_print_view_word_docx: true
   langcode: true
   os2loop_notify_users: true
+  os2loop_shared_approval_date: true
+  os2loop_shared_approver: true
   os2loop_shared_category: true
   os2loop_shared_rev_date: true
+  os2loop_shared_version: true
   search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.search_result.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.search_result.yml
@@ -9,11 +9,14 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - user
@@ -56,7 +59,10 @@ hidden:
   os2loop_documents_document_conte: true
   os2loop_documents_info_box: true
   os2loop_notify_users: true
+  os2loop_shared_approval_date: true
+  os2loop_shared_approver: true
   os2loop_shared_category: true
   os2loop_shared_profession: true
   os2loop_shared_rev_date: true
   os2loop_shared_tags: true
+  os2loop_shared_version: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.teaser.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.teaser.yml
@@ -9,11 +9,14 @@ dependencies:
     - field.field.node.os2loop_documents_document.os2loop_documents_document_conte
     - field.field.node.os2loop_documents_document.os2loop_documents_info_box
     - field.field.node.os2loop_documents_document.os2loop_notify_users
+    - field.field.node.os2loop_documents_document.os2loop_shared_approval_date
+    - field.field.node.os2loop_documents_document.os2loop_shared_approver
     - field.field.node.os2loop_documents_document.os2loop_shared_category
     - field.field.node.os2loop_documents_document.os2loop_shared_profession
     - field.field.node.os2loop_documents_document.os2loop_shared_rev_date
     - field.field.node.os2loop_documents_document.os2loop_shared_subject
     - field.field.node.os2loop_documents_document.os2loop_shared_tags
+    - field.field.node.os2loop_documents_document.os2loop_shared_version
     - node.type.os2loop_documents_document
   module:
     - user
@@ -49,9 +52,12 @@ hidden:
   os2loop_documents_document_conte: true
   os2loop_documents_info_box: true
   os2loop_notify_users: true
+  os2loop_shared_approval_date: true
+  os2loop_shared_approver: true
   os2loop_shared_category: true
   os2loop_shared_profession: true
   os2loop_shared_rev_date: true
   os2loop_shared_subject: true
   os2loop_shared_tags: true
+  os2loop_shared_version: true
   search_api_excerpt: true
diff --git a/config/sync/field.field.node.os2loop_documents_document.os2loop_shared_approval_date.yml b/config/sync/field.field.node.os2loop_documents_document.os2loop_shared_approval_date.yml
@@ -0,0 +1,21 @@
+uuid: 7c2055ad-097e-4d5a-aefb-efd9e4500f0b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.os2loop_shared_approval_date
+    - node.type.os2loop_documents_document
+  module:
+    - datetime
+id: node.os2loop_documents_document.os2loop_shared_approval_date
+field_name: os2loop_shared_approval_date
+entity_type: node
+bundle: os2loop_documents_document
+label: 'Approval date'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: datetime
diff --git a/config/sync/field.field.node.os2loop_documents_document.os2loop_shared_approver.yml b/config/sync/field.field.node.os2loop_documents_document.os2loop_shared_approver.yml
@@ -0,0 +1,19 @@
+uuid: c5030386-43cb-4e06-8964-d188d3947f16
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.os2loop_shared_approver
+    - node.type.os2loop_documents_document
+id: node.os2loop_documents_document.os2loop_shared_approver
+field_name: os2loop_shared_approver
+entity_type: node
+bundle: os2loop_documents_document
+label: Approver
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/sync/field.field.node.os2loop_documents_document.os2loop_shared_version.yml b/config/sync/field.field.node.os2loop_documents_document.os2loop_shared_version.yml
@@ -0,0 +1,19 @@
+uuid: dd805d7c-2af5-4c9c-8522-d898f91e4ae5
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.os2loop_shared_version
+    - node.type.os2loop_documents_document
+id: node.os2loop_documents_document.os2loop_shared_version
+field_name: os2loop_shared_version
+entity_type: node
+bundle: os2loop_documents_document
+label: Version
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/sync/language/da/field.field.node.os2loop_documents_document.os2loop_shared_approval_date.yml b/config/sync/language/da/field.field.node.os2loop_documents_document.os2loop_shared_approval_date.yml
@@ -0,0 +1 @@
+label: Godkendelsesdato
diff --git a/config/sync/language/da/field.field.node.os2loop_documents_document.os2loop_shared_approver.yml b/config/sync/language/da/field.field.node.os2loop_documents_document.os2loop_shared_approver.yml
@@ -0,0 +1 @@
+label: Godkender
diff --git a/config/sync/language/da/field.field.node.os2loop_documents_document.os2loop_shared_rev_date.yml b/config/sync/language/da/field.field.node.os2loop_documents_document.os2loop_shared_rev_date.yml
@@ -0,0 +1 @@
+label: Revisionsdato
diff --git a/config/sync/language/da/taxonomy.vocabulary.os2loop_profession.yml b/config/sync/language/da/taxonomy.vocabulary.os2loop_profession.yml
@@ -1 +1 @@
-name: Profession
+name: Faggruppe
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/pages/user-replies.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/pages/user-replies.scss
@@ -2,8 +2,8 @@
 	.content-wrapper {
 		@extend .block-primary-white, .p-30;
 
-		.views-rows-container {
-			@extend .block-primary-gray, .p-30, .mt-30;
+		.user-reply-wrapper {
+			@extend .block-primary-gray, .p-30;
 		}
 
 		.views-row {
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/views/views-view-unformatted--os2loop-user-answers.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/views/views-view-unformatted--os2loop-user-answers.html.twig
diff --git a/web/profiles/custom/os2loop/translations/translations.da.po b/web/profiles/custom/os2loop/translations/translations.da.po
