Merge branch 'master' into dev

config/automated_cron.settings.yml

@@ -1,3 +1,3 @@
-interval: 10800
 _core:
   default_config_hash: fUksROt4FfkAU9BV4hV2XvhTBSS2nTNrZS4U7S-tKrs
+interval: 10800

config/core.entity_view_display.oc_actor.trainer.default.yml

@@ -143,4 +143,8 @@ hidden:
   full_name: true
   middle_names: true
   phone2: true
+  recent_cases: true
   search_api_excerpt: true
+  status: true
+  total_cases: true
+  user_id: true

config/system.cron.yml

@@ -1,6 +1,6 @@
+_core:
+  default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
 logging: 1
-_core:
-  default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y

config/views.view.debriefs.yml

@@ -354,18 +354,7 @@ display:
       cache:
         type: tag
         options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: "Trainer debrief will appear here once it is added.\r\n<div><a class=\"button\" href=\"/opencase/oc_activity/add/trainer_debrief?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}\">Add trainer debrief</a></div\r\n"
-          tokenize: true
+      empty: {  }
       sorts: {  }
       arguments:
         oc_case:
@@ -532,7 +521,18 @@ display:
           plugin_id: standard
           required: true
       header: {  }
-      footer: {  }
+      footer:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: '<div><a class="button" href="/opencase/oc_activity/add/trainer_debrief?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}">Add trainer debrief</a></div>'
+          tokenize: true
       display_extenders: {  }
     cache_metadata:
       max-age: -1

config/views.view.evaluations.yml

@@ -369,20 +369,7 @@ display:
       cache:
         type: tag
         options: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: 'Evaluations will appear here once they are added.'
-            format: full_html
-          tokenize: false
+      empty: {  }
       sorts: {  }
       arguments:
         oc_case: