diff --git a/config/core.date_format.short.yml b/config/core.date_format.short.yml index 51980f3..6c70721 100644 --- a/config/core.date_format.short.yml +++ b/config/core.date_format.short.yml @@ -7,4 +7,4 @@ _core: id: short label: 'Default short date' locked: false -pattern: d-M-Y +pattern: 'd M Y' diff --git a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml index 347754b..d9e6d6d 100644 --- a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml +++ b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml @@ -15,13 +15,19 @@ dependencies: - image.style.thumbnail - opencase_entities.oc_activity_type.trainer_debrief module: - - hide_revision_field + - datetime - image id: oc_activity.trainer_debrief.default targetEntityType: oc_activity bundle: trainer_debrief mode: default content: + activity_date_time: + type: datetime_default + weight: 11 + region: content + settings: { } + third_party_settings: { } field_caption_for_photo: type: string_textarea weight: 9 @@ -99,18 +105,6 @@ content: region: content settings: { } 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: { } status: type: boolean_checkbox weight: 10 @@ -119,9 +113,10 @@ content: display_label: true third_party_settings: { } hidden: - activity_date_time: true client: true description: true name: true oc_target: true + revision_log: true time_taken: true + user_id: true diff --git a/config/core.entity_form_display.oc_case.project.default.yml b/config/core.entity_form_display.oc_case.project.default.yml index d9ca8c9..60baa10 100644 --- a/config/core.entity_form_display.oc_case.project.default.yml +++ b/config/core.entity_form_display.oc_case.project.default.yml @@ -5,12 +5,15 @@ dependencies: config: - field.field.oc_case.project.feeds_item - field.field.oc_case.project.field_contract_signed_date - - field.field.oc_case.project.field_fee + - field.field.oc_case.project.field_invoicing_notes + - field.field.oc_case.project.field_invoicing_status + - field.field.oc_case.project.field_link_to_invoice - opencase_cases.oc_case_type.project module: - datetime - file - hide_revision_field + - link id: oc_case.project.default targetEntityType: oc_case bundle: project @@ -28,6 +31,28 @@ content: region: content settings: { } third_party_settings: { } + field_invoicing_notes: + type: string_textarea + weight: 81 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_invoicing_status: + type: options_select + weight: 83 + region: content + settings: { } + third_party_settings: { } + field_link_to_invoice: + type: link_default + weight: 84 + region: content + settings: + placeholder_url: '' + placeholder_title: '' + third_party_settings: { } files: type: file_generic weight: 1 @@ -56,7 +81,6 @@ content: third_party_settings: { } hidden: feeds_item: true - field_fee: true name: true notes: true oc_target: true diff --git a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml index c0500a1..08105b7 100644 --- a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml +++ b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml @@ -14,12 +14,22 @@ dependencies: - field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc - opencase_entities.oc_activity_type.trainer_debrief module: + - datetime - image id: oc_activity.trainer_debrief.default targetEntityType: oc_activity bundle: trainer_debrief mode: default content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 11 + region: content field_caption_for_photo: type: basic_string label: above @@ -104,7 +114,6 @@ content: weight: 1 region: content hidden: - activity_date_time: true client: true description: true oc_target: true diff --git a/config/core.entity_view_display.oc_case.project.default.yml b/config/core.entity_view_display.oc_case.project.default.yml index 492278b..bc70572 100644 --- a/config/core.entity_view_display.oc_case.project.default.yml +++ b/config/core.entity_view_display.oc_case.project.default.yml @@ -5,11 +5,14 @@ dependencies: config: - field.field.oc_case.project.feeds_item - field.field.oc_case.project.field_contract_signed_date - - field.field.oc_case.project.field_fee + - field.field.oc_case.project.field_invoicing_notes + - field.field.oc_case.project.field_invoicing_status + - field.field.oc_case.project.field_link_to_invoice - opencase_cases.oc_case_type.project module: - datetime - file + - link - user id: oc_case.project.default targetEntityType: oc_case @@ -32,12 +35,12 @@ content: settings: link: true third_party_settings: { } - weight: 5 + weight: 8 region: content fees: settings: { } third_party_settings: { } - weight: 2 + weight: 5 region: content field_contract_signed_date: type: datetime_default @@ -46,7 +49,34 @@ content: timezone_override: '' format_type: short third_party_settings: { } - weight: 6 + weight: 9 + region: content + field_invoicing_notes: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content + field_invoicing_status: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 3 + region: content + field_link_to_invoice: + type: link + label: above + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 4 region: content files: type: file_default @@ -54,7 +84,7 @@ content: settings: use_description_as_link_text: true third_party_settings: { } - weight: 8 + weight: 11 region: content total_fee: type: number_decimal @@ -65,25 +95,24 @@ content: scale: 2 prefix_suffix: true third_party_settings: { } - weight: 3 + weight: 6 region: content trainings: settings: { } third_party_settings: { } - weight: 4 + weight: 7 region: content user_id: type: author label: above settings: { } third_party_settings: { } - weight: 7 + weight: 10 region: content hidden: changed: true created: true feeds_item: true - field_fee: true name: true notes: true oc_target: true diff --git a/config/field.field.oc_case.project.field_fee.yml b/config/field.field.oc_case.project.field_fee.yml deleted file mode 100644 index b3629bf..0000000 --- a/config/field.field.oc_case.project.field_fee.yml +++ /dev/null @@ -1,40 +0,0 @@ -uuid: 0ec431ed-c572-41c3-9796-54a5f94b2cba -langcode: en -status: true -dependencies: - config: - - field.storage.oc_case.field_fee - - opencase_cases.oc_case_type.project - - paragraphs.paragraphs_type.fee - module: - - entity_reference_revisions -id: oc_case.project.field_fee -field_name: field_fee -entity_type: oc_case -bundle: project -label: Fees -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:paragraph' - handler_settings: - negate: 0 - target_bundles: - fee: fee - target_bundles_drag_drop: - availability: - weight: 5 - enabled: false - emergency_contact: - weight: 6 - enabled: false - fee: - enabled: true - weight: 7 - trainer: - weight: 8 - enabled: false -field_type: entity_reference_revisions diff --git a/config/field.field.oc_case.project.field_invoicing_notes.yml b/config/field.field.oc_case.project.field_invoicing_notes.yml new file mode 100644 index 0000000..cc4708f --- /dev/null +++ b/config/field.field.oc_case.project.field_invoicing_notes.yml @@ -0,0 +1,19 @@ +uuid: cec8eb04-c5a8-461f-be02-3d3f5d4ed161 +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case.field_invoicing_notes + - opencase_cases.oc_case_type.project +id: oc_case.project.field_invoicing_notes +field_name: field_invoicing_notes +entity_type: oc_case +bundle: project +label: 'Invoicing notes' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/field.field.oc_case.project.field_invoicing_status.yml b/config/field.field.oc_case.project.field_invoicing_status.yml new file mode 100644 index 0000000..536c168 --- /dev/null +++ b/config/field.field.oc_case.project.field_invoicing_status.yml @@ -0,0 +1,33 @@ +uuid: 615e68c9-6593-4720-97db-b77bdad48eb2 +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case.field_invoicing_status + - opencase_cases.oc_case_type.project + - taxonomy.vocabulary.invoicing_statuses + content: + - 'taxonomy_term:invoicing_statuses:18d498c4-a77c-4724-9512-58d72f245c16' +id: oc_case.project.field_invoicing_status +field_name: field_invoicing_status +entity_type: oc_case +bundle: project +label: 'Invoicing status' +description: '' +required: false +translatable: false +default_value: + - + target_uuid: 18d498c4-a77c-4724-9512-58d72f245c16 +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + invoicing_statuses: invoicing_statuses + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/field.field.oc_case.project.field_link_to_invoice.yml b/config/field.field.oc_case.project.field_link_to_invoice.yml new file mode 100644 index 0000000..7e0a446 --- /dev/null +++ b/config/field.field.oc_case.project.field_link_to_invoice.yml @@ -0,0 +1,23 @@ +uuid: 485b2e9f-88b1-4848-839f-473f7ee02478 +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case.field_link_to_invoice + - opencase_cases.oc_case_type.project + module: + - link +id: oc_case.project.field_link_to_invoice +field_name: field_link_to_invoice +entity_type: oc_case +bundle: project +label: 'Link to invoice' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + title: 0 + link_type: 16 +field_type: link diff --git a/config/field.storage.oc_case.field_invoicing_notes.yml b/config/field.storage.oc_case.field_invoicing_notes.yml new file mode 100644 index 0000000..fb5cfbe --- /dev/null +++ b/config/field.storage.oc_case.field_invoicing_notes.yml @@ -0,0 +1,19 @@ +uuid: 04d70cb8-6464-4f57-97f5-e28c0476a69f +langcode: en +status: true +dependencies: + module: + - opencase_cases +id: oc_case.field_invoicing_notes +field_name: field_invoicing_notes +entity_type: oc_case +type: string_long +settings: + case_sensitive: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/field.storage.oc_case.field_fee.yml b/config/field.storage.oc_case.field_invoicing_status.yml similarity index 54% rename from config/field.storage.oc_case.field_fee.yml rename to config/field.storage.oc_case.field_invoicing_status.yml index bd1c542..dc8d4ca 100644 --- a/config/field.storage.oc_case.field_fee.yml +++ b/config/field.storage.oc_case.field_invoicing_status.yml @@ -1,24 +1,23 @@ -uuid: 540a147e-eb93-474f-b77c-62380d0eadc9 +uuid: f94656f9-410c-4fac-9e78-72e719c7a91c langcode: en status: true dependencies: module: - - entity_reference_revisions - field_permissions - opencase_cases - - paragraphs + - taxonomy third_party_settings: field_permissions: permission_type: public -id: oc_case.field_fee -field_name: field_fee +id: oc_case.field_invoicing_status +field_name: field_invoicing_status entity_type: oc_case -type: entity_reference_revisions +type: entity_reference settings: - target_type: paragraph -module: entity_reference_revisions + target_type: taxonomy_term +module: core locked: false -cardinality: -1 +cardinality: 1 translatable: true indexes: { } persist_with_no_fields: false diff --git a/config/field.storage.oc_case.field_link_to_invoice.yml b/config/field.storage.oc_case.field_link_to_invoice.yml new file mode 100644 index 0000000..8d38b34 --- /dev/null +++ b/config/field.storage.oc_case.field_link_to_invoice.yml @@ -0,0 +1,23 @@ +uuid: a719c93e-3463-4071-a003-7fa42ef5b7ae +langcode: en +status: true +dependencies: + module: + - field_permissions + - link + - opencase_cases +third_party_settings: + field_permissions: + permission_type: public +id: oc_case.field_link_to_invoice +field_name: field_link_to_invoice +entity_type: oc_case +type: link +settings: { } +module: link +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/system.action.user_add_role_action.invoicing_alerts.yml b/config/system.action.user_add_role_action.invoicing_alerts.yml new file mode 100644 index 0000000..55db8bb --- /dev/null +++ b/config/system.action.user_add_role_action.invoicing_alerts.yml @@ -0,0 +1,14 @@ +uuid: 63de88ab-e439-4b10-89eb-48f9303c7aab +langcode: en +status: true +dependencies: + config: + - user.role.invoicing_alerts + module: + - user +id: user_add_role_action.invoicing_alerts +label: 'Add the Invoicing Alerts role to the selected user(s)' +type: user +plugin: user_add_role_action +configuration: + rid: invoicing_alerts diff --git a/config/system.action.user_remove_role_action.invoicing_alerts.yml b/config/system.action.user_remove_role_action.invoicing_alerts.yml new file mode 100644 index 0000000..abd701a --- /dev/null +++ b/config/system.action.user_remove_role_action.invoicing_alerts.yml @@ -0,0 +1,14 @@ +uuid: 418e7e95-3e97-4bca-aca7-39f107d27a96 +langcode: en +status: true +dependencies: + config: + - user.role.invoicing_alerts + module: + - user +id: user_remove_role_action.invoicing_alerts +label: 'Remove the Invoicing Alerts role from the selected user(s)' +type: user +plugin: user_remove_role_action +configuration: + rid: invoicing_alerts diff --git a/config/taxonomy.vocabulary.invoicing_statuses.yml b/config/taxonomy.vocabulary.invoicing_statuses.yml new file mode 100644 index 0000000..eefc381 --- /dev/null +++ b/config/taxonomy.vocabulary.invoicing_statuses.yml @@ -0,0 +1,8 @@ +uuid: c8f89b5c-1d2c-47db-89aa-d9c274b89a43 +langcode: en +status: true +dependencies: { } +name: 'Invoicing statuses' +vid: invoicing_statuses +description: '' +weight: 0 diff --git a/config/user.role.invoicing_alerts.yml b/config/user.role.invoicing_alerts.yml new file mode 100644 index 0000000..a47e879 --- /dev/null +++ b/config/user.role.invoicing_alerts.yml @@ -0,0 +1,9 @@ +uuid: adcb5e23-6def-4616-b99c-a35a87e52164 +langcode: en +status: true +dependencies: { } +id: invoicing_alerts +label: 'Invoicing Alerts' +weight: 7 +is_admin: null +permissions: { } diff --git a/config/views.view.debrief_report.yml b/config/views.view.debrief_report.yml index 1a9197d..a2c8c25 100644 --- a/config/views.view.debrief_report.yml +++ b/config/views.view.debrief_report.yml @@ -7,6 +7,7 @@ dependencies: - system.menu.opencase - user.role.gno_admin_user module: + - datetime - opencase_entities - rest - serialization @@ -28,15 +29,15 @@ display: display_options: title: 'Debrief Report' fields: - created: - id: created + activity_date_time: + id: activity_date_time table: oc_activity_field_data - field: created + field: activity_date_time relationship: none group_type: group admin_label: '' entity_type: oc_activity - entity_field: created + entity_field: activity_date_time plugin_id: field label: 'Date submitted' exclude: false @@ -80,11 +81,10 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: timestamp + type: datetime_default settings: - date_format: short - custom_date_format: '' - timezone: '' + timezone_override: '' + format_type: short group_column: value group_columns: { } group_rows: true