displaying date on activities, tidied activity fields

also removed swiftmailer as it didn't help with html email alerts

composer.json

@@ -31,6 +31,7 @@
         "drupal/better_exposed_filters": "^5.0",
         "drupal/content_as_config": "^1.0",
         "drupal/core-composer-scaffold": "^9",
+        "drupal/core-dev": "^9.3",
         "drupal/core-project-message": "^9",
         "drupal/core-recommended": "^9",
         "drupal/ctools": "^3.7",
@@ -59,6 +60,7 @@
     "require-dev": {
         "drupal/console": "^1.9",
         "drupal/devel": "^4.1",
+        "phpspec/prophecy-phpunit": "^2",
         "phpunit/phpunit": "^9.5"
     },
     "conflict": {
@@ -72,7 +74,8 @@
             "composer/installers": true,
             "drupal/console-extend-plugin": true,
             "drupal/core-composer-scaffold": true,
-            "drupal/core-project-message": true
+            "drupal/core-project-message": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "extra": {

config/core.entity_form_display.oc_activity.emi.default.yml

@@ -5,43 +5,39 @@ dependencies:
   config:
     - opencase_entities.oc_activity_type.emi
   module:
-    - hide_revision_field
+    - datetime
 id: oc_activity.emi.default
 targetEntityType: oc_activity
 bundle: emi
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: -3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
-  activity_date_time: true
   client: true
-  description: true
   oc_provider: true
   oc_target: true
+  revision_log: true
   status: true
+  time_taken: true
+  user_id: true

config/core.entity_form_display.oc_activity.phone_call.default.yml

@@ -4,11 +4,19 @@ status: true
 dependencies:
   config:
     - opencase_entities.oc_activity_type.phone_call
+  module:
+    - datetime
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   description:
     type: string_textarea
     weight: 2
@@ -19,24 +27,17 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: 1
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
-  activity_date_time: true
   client: true
   oc_provider: true
   oc_target: true
   revision_log: true
   status: true
+  time_taken: true
   user_id: true

config/core.entity_form_display.oc_activity.trainer_debrief.default.yml

@@ -24,13 +24,13 @@ mode: default
 content:
   activity_date_time:
     type: datetime_default
-    weight: 11
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
   field_caption_for_photo:
     type: string_textarea
-    weight: 9
+    weight: 10
     region: content
     settings:
       rows: 5
@@ -38,7 +38,7 @@ content:
     third_party_settings: {  }
   field_issues_and_difficulties:
     type: string_textarea
-    weight: 4
+    weight: 5
     region: content
     settings:
       rows: 5
@@ -46,7 +46,7 @@ content:
     third_party_settings: {  }
   field_issues_with_group_dynamics:
     type: string_textarea
-    weight: 5
+    weight: 6
     region: content
     settings:
       rows: 5
@@ -54,14 +54,14 @@ content:
     third_party_settings: {  }
   field_number_of_participants:
     type: number
-    weight: 1
+    weight: 2
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_photo:
     type: image_image
-    weight: 8
+    weight: 9
     region: content
     settings:
       progress_indicator: throbber
@@ -69,7 +69,7 @@ content:
     third_party_settings: {  }
   field_what_came_up_for_the_group:
     type: string_textarea
-    weight: 3
+    weight: 4
     region: content
     settings:
       rows: 5
@@ -77,7 +77,7 @@ content:
     third_party_settings: {  }
   field_what_could_be_improved_for:
     type: string_textarea
-    weight: 7
+    weight: 8
     region: content
     settings:
       rows: 5
@@ -85,7 +85,7 @@ content:
     third_party_settings: {  }
   field_what_did_facilitators_do_w:
     type: string_textarea
-    weight: 2
+    weight: 3
     region: content
     settings:
       rows: 5
@@ -93,7 +93,7 @@ content:
     third_party_settings: {  }
   field_what_real_scenarios_or_inc:
     type: string_textarea
-    weight: 6
+    weight: 7
     region: content
     settings:
       rows: 5
@@ -101,13 +101,13 @@ content:
     third_party_settings: {  }
   oc_provider:
     type: options_select
-    weight: 0
+    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 10
+    weight: 11
     region: content
     settings:
       display_label: true

config/core.entity_view_display.oc_activity.emi.default.yml

@@ -6,7 +6,6 @@ dependencies:
     - opencase_entities.oc_activity_type.emi
   module:
     - datetime
-    - user
 id: oc_activity.emi.default
 targetEntityType: oc_activity
 bundle: emi
@@ -17,7 +16,7 @@ content:
     label: above
     settings:
       timezone_override: ''
-      format_type: medium
+      format_type: short
     third_party_settings: {  }
     weight: 0
     region: content
@@ -29,6 +28,13 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
   name:
     type: string
     label: hidden
@@ -37,13 +43,10 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
 hidden:
+  oc_provider: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   time_taken: true
+  user_id: true

config/core.entity_view_display.oc_activity.phone_call.default.yml

@@ -5,19 +5,28 @@ dependencies:
   config:
     - opencase_entities.oc_activity_type.phone_call
   module:
-    - user
+    - datetime
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: short
+    third_party_settings: {  }
+    weight: 0
+    region: content
   client:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
   description:
     type: basic_string
@@ -34,27 +43,10 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
 hidden:
-  activity_date_time: true
   oc_provider: true
   oc_target: true
   search_api_excerpt: true
   status: true
+  time_taken: true
+  user_id: true

config/core.entity_view_display.oc_activity.trainer_debrief.default.yml

@@ -26,9 +26,9 @@ content:
     label: above
     settings:
       timezone_override: ''
-      format_type: medium
+      format_type: short
     third_party_settings: {  }
-    weight: 11
+    weight: 0
     region: content
   field_caption_for_photo:
     type: basic_string
@@ -97,14 +97,6 @@ content:
     third_party_settings: {  }
     weight: 7
     region: content
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
   oc_provider:
     type: entity_reference_label
     label: above
@@ -116,6 +108,7 @@ content:
 hidden:
   client: true
   description: true
+  name: true
   oc_target: true
   search_api_excerpt: true
   status: true

config/core.extension.yml

@@ -45,6 +45,7 @@ module:
   jquery_ui_touch_punch: 0
   jsonapi: 0
   link: 0
+  mailsystem: 0
   menu_link_content: 0
   menu_ui: 0
   node: 0

config/mailsystem.settings.yml

@@ -0,0 +1,11 @@
+_core:
+  default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s
+theme: current
+defaults:
+  sender: php_mail
+  formatter: php_mail
+modules:
+  swiftmailer:
+    none:
+      sender: swiftmailer
+      formatter: swiftmailer

config/views.view.debriefs.yml

@@ -150,7 +150,7 @@ display:
           type: datetime_default
           settings:
             timezone_override: ''
-            format_type: medium
+            format_type: short
           group_column: value
           group_columns: {  }
           group_rows: true