Commit 3f6c95d9 authored by Stephen Mulvihill's avatar Stephen Mulvihill Committed by Will Hearn
Browse files

Issue #3280784 by smulvih2: Did you find webform message not announced

parent 1f6d00ad

config/optional/field.storage.node.field_date_modified.yml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
langcode: en

status: true

dependencies:

  module:

    - datetime

    - node

third_party_settings:

  field_permissions:

    permission_type: public

id: node.field_date_modified

field_name: field_date_modified

entity_type: node

type: datetime

settings:

  datetime_type: date

module: datetime

locked: false

cardinality: 1

translatable: true

indexes: {  }

persist_with_no_fields: false

custom_storage: false

modules/custom/wxt_ext/wxt_ext_webform/config/install/webform.webform.gcweb_did_you_find.yml

+47 −1
Original line number Diff line number Diff line
@@ -16,7 +16,53 @@ id: gcweb_did_you_find 
title: 'GCWeb - Did you find what you were looking for'

description: ''

category: ''

elements: "did_you_find_answer:\n  '#type': hidden\n  '#title': 'Did you find what you were looking for?'\ninitial_page:\n  '#type': webform_wizard_page\n  '#title': 'Initial page'\n  initial_page_text:\n    '#type': processed_text\n    '#text': |\n      <h2 class=\"mrgn-tp-sm h5\">Did you find what you were looking for?</h2>\n    '#format': rich_text\n  actions_02:\n    '#type': webform_actions\n    '#title': 'Submit button (No)'\n    '#submit_hide': true\n    '#update_hide': true\n    '#wizard_prev_hide': true\n    '#wizard_next__label': 'No'\n    '#wizard_next__attributes':\n      class:\n        - 'btn btn-primary'\nno_page:\n  '#type': webform_wizard_page\n  '#title': 'No page'\n  what_was_wrong:\n    '#type': radios\n    '#title': 'What was wrong?'\n    '#options':\n      problem1: 'The answer I need is missing'\n      problem2: 'The information isn’t clear'\n      problem3: 'I’m not in the right place'\n      problem4: 'Something is broken or incorrect'\n      problem5: 'Other reason'\n  problem6:\n    '#type': textarea\n    '#title': 'Please provide more details'\n    '#description': |-\n      <p>(Don&rsquo;t include any personal information. Note that you will not receive a reply.)</p>\n\n      <p class=\"small\">Maximum 300 characters</p>\n    '#description_display': before\n  actions_01:\n    '#type': webform_actions\n    '#title': 'Submit button'\n    '#submit__label': Submit\n    '#submit__attributes':\n      class:\n        - 'btn btn-primary'\n    '#update_hide': true\n    '#wizard_prev_hide': true\n    '#wizard_next_hide': true"

elements: |-

  did_you_find_answer:

    '#type': hidden

    '#title': 'Did you find what you were looking for?'

  initial_page:

    '#type': webform_wizard_page

    '#title': 'Initial page'

    actions_02:

      '#type': webform_actions

      '#title': 'Submit button (No)'

      '#submit_hide': true

      '#update_hide': true

      '#wizard_prev_hide': true

      '#wizard_next__label': 'No'

      '#wizard_next__attributes':

        class:

          - 'btn btn-primary'

  no_page:

    '#type': webform_wizard_page

    '#title': 'No page'

    what_was_wrong:

      '#type': radios

      '#title': 'What was wrong?'

      '#options':

        problem1: 'The answer I need is missing'

        problem2: 'The information isn’t clear'

        problem3: 'I’m not in the right place'

        problem4: 'Something is broken or incorrect'

        problem5: 'Other reason'

    problem6:

      '#type': textarea

      '#title': 'Please provide more details'

      '#description': |-

        <p>(Don&rsquo;t include any personal information. Note that you will not receive a reply.)</p>



        <p class="small">Maximum 300 characters</p>

      '#description_display': before

    actions_01:

      '#type': webform_actions

      '#title': 'Submit button'

      '#submit__label': Submit

      '#submit__attributes':

        class:

          - 'btn btn-primary'

      '#update_hide': true

      '#wizard_prev_hide': true

      '#wizard_next_hide': true

css: ''

javascript: ''

settings:

modules/custom/wxt_ext/wxt_ext_webform/wxt_ext_webform.module

+7 −12
Original line number Diff line number Diff line
@@ -41,17 +41,9 @@ function wxt_ext_webform_theme_suggestions_form_element_alter(array &$suggestion 
/**

 * Implements hook_theme_suggestions_HOOK_alter().

 */

function wxt_ext_webform_theme_suggestions_container_alter(array &$suggestions, array &$variables) {

  if (!empty($variables['element']['#webform']) && $variables['element']['#webform'] == 'gcweb_did_you_find') {

    if ($variables['element']['#webform_key'] == 'initial_page') {

      // Add class to webform container

      $variables['element']['#attributes']['class'][] = 'row';

    }



    if ($variables['element']['#webform_key'] == 'actions_02') {

      // Add class to webform container (action buttons)

      $variables['element']['#attributes']['class'][] = 'col-xs-8 col-sm-5 text-right margin-bottom-none';

    }

function wxt_ext_webform_theme_suggestions_container_alter(array &$suggestions, array $variables) {

  if (!empty($variables['element']['#webform_id']) && $variables['element']['#webform_id'] == 'gcweb_did_you_find--actions_02') {

    $suggestions[] = 'container__gcweb_did_you_find_actions';

  }

}
@@ -73,7 +65,10 @@ function wxt_ext_webform_webform_submission_presave(WebformSubmission $submissio 
function wxt_ext_webform_webform_submission_form_alter(array &$form, FormStateInterface $form_state, $form_id) {

  if (strpos($form_id, 'webform_submission_gcweb_did_you_find') !== FALSE) {

    if ($form_state->get('current_page') == 'initial_page') {

      // Add submit button on first page of wizard

      // Add class to No button for spacing.

      $form['actions']['wizard_next']['#attributes']['class'][] = 'mrgn-lft-sm';



      // Add submit button on first page of wizard.

      $form['actions']['submit_first_page'] = [

        '#type' => 'submit',

        '#value' => t('Yes'),