From 350525a5f9930ca5301764f1ec5df49b2cad1418 Mon Sep 17 00:00:00 2001 From: Gorpalicious Date: Wed, 22 Jul 2020 16:42:13 +0100 Subject: [PATCH] Significant Copy Update Major changes to the en.json file and questions-1 page to reflect changes in the copy from the working group - changes to agreement page tbc --- locales/en.json | 202 +++++++++++------------- package-lock.json | 9 +- package.json | 3 +- public/js/toggle-area.js | 1 + routes/questions-1/questions-1.njk | 239 ++++++++++++++--------------- views/macros/checkboxes.njk | 5 + views/macros/double-input-text.njk | 30 ++++ views/macros/input-text.njk | 9 +- 8 files changed, 262 insertions(+), 236 deletions(-) create mode 100644 views/macros/double-input-text.njk diff --git a/locales/en.json b/locales/en.json index a8c9c52..99416bf 100644 --- a/locales/en.json +++ b/locales/en.json @@ -35,116 +35,100 @@ "participant-consent-form.title": "Generate a participant consent form", "participant-consent-form.intro": "Enter information about your research project.", "questions-1.title": "Make a form for recruitment and testing", - "questions-1.intro": "Your answers will be put into a consent form for your research participant to read and agree to. You'll be able to print the consent form later. This information is not stored for any other purpose. It is recommended you enter in as much information as possible", - "_QUESTIONS_YOUR_CONTACT_INFORMATION_": "", - "contactInfo.title": "Your contact information", - "form.researcher_name": "Name", - "form.researcher_title": "Job Title", - "form.researcher_phone": "Work phone number", - "form.researcher_email": "Work email address", - "form.researcher_org": "Organization", - "_QUESTIONS_QUESTIONS_AND_ANSWERS_SECTION_": "", - "study_info.title": "Study Information", - "form.is_with_partner_team": "Will you be conducting research with another partner team?", - "form.partner_name_team": "Which team will you be conducting the research with?", - "form.partner_name_team.desc": "E.g. Internal teams: Design, Product, Customer Service, Regional, Global or any other teams within the organization External teams: Research agency, Recruitment agency, Client and etc", - "form.partner_department_authority": "Which organization legal act allows you to collect information about the participant?", - "form.partner_department_authority.desc": "E.g. Data privacy laws last updated 20/12/2019 by John Doe. Ask your legal team if you are unsure.", - "form.research_method": "What type of research are you doing?", - "form.interview": "Interview (Moderated)", - "form.usability_testing_moderated": "Usability testing (Moderated)", - "form.ethnography": "Ethnography (Moderated)", - "form.focus_groups": "Focus Group (Moderated)", - "form.card_sorting": "Card Sorting (Moderated)", - "form.survey_moderated": "Survey (Moderated)", - "form.usability_testing_unmoderated": "Usability Testing (Unmoderated)", - "form.survey_unmoderated": "Survey (Unmoderated)", - "form.diary_study": "Diary Study (Unmoderated)", - "form.other_research": "Other", - "form.other_research_freetext.desc": "Other (e.g. Remote Usability Testing, Co-Creation Workshop, etc...)", - "form.research_goal": "What's the purpose of your research? (required field)", - "form.research_goal.desc": "E.g. To help the Design team validate the customer registration flow using a prototype", - "form.session_activity": "What will the participant be doing during the sessions? (required field)", - "form.session_activity.desc": "E.g. Complete tasks using the prototype and feedback based on their impressions", - "form.session_duration": "How long will the session take? (required field)", - "form.session_duration.desc": "E.g. '1 hour'. Be as precise as you can", - "form.personal_information_collected": "What personal information will you be collecting during the research activity? (required field)", - "form.personal_collected_full_name": "Full Name", - "form.personal_collected_phone": "Phone Contact Information", - "form.personal_collected_email": "Email Contact Information", - "form.personal_collected_age": "Age or Date of Birth", - "form.personal_collected_gender": "Gender", - "form.personal_collected_nationality": "Nationality", - "form.personal_collected_address": "Address or City of Residence", - "form.personal_collected_employment_status": "Employment Status", - "form.personal_collected_title": "Job Title", - "form.personal_collected_company": "Company Name", - "form.personal_collected_income": "Household Income", - "form.personal_collected_marital_status": "Marital Status", - "form.personal_collected_dependents": "Number of Children or Dependents", - "form.personal_collected_device": "Device Type or Software Information", - "form.personal_collected_account_details": "Bank Account Details or Paypal Account Number", - "form.personal_collected_identification_number": "Identification Number, e.g. passport, resident ID, driving licence, etc...", - "form.personal_collected_other.desc": "Other (e.g. Disability Information, Religious Beliefs, etc...)", - "compensation.title": "Compensation", - "form.compensation": "Will you be offering an incentive to the participant for their time?", - "form.compensation_method": "Which type of incentive are you offering?", - "form.compensation_cash_physical": "Cash in Hand", - "form.compensation_cash_transfer": "Cash Bank Transfer", - "form.compensation_gift_card": "Gift card", - "form.compensation_other": "If other, enter the details here", - "form.compensation_other.desc": "Other (e.g. Merchandise, Vouchers, etc...)", - "form.compensation_value": "What is the value of the incentive?", - "form.compensation_value.desc": "E.g. $25, £50, €30, etc...", - "privacy.title": "Participant privacy", - "form.confidentiality": "How will you protect the participant's privacy?", - "form.confidentiality_full": "Full privacy", - "form.confidentiality_full.desc1": "All identification, information and responses from the participant will be anonymized including name, images, audio and video.", - "form.confidentiality_full.desc2": "Any information pertaining to participants will be replaced using numbers or pseudonyms.", - "form.confidentiality_partial": "Partial privacy", - "form.confidentiality_partial.desc1": "Identity, information and responses of the participant will be shared amongst the working teams.", - "form.confidentiality_partial.desc2": "Some information may be anonymized depending on its use.", - "form.confidentiality_none": "No privacy", - "form.confidentiality_none.desc1": "Identity, information and responses of the participant will be shared publicly", - "form.confidentiality_info": "Show More Information", - "form.personal_information_shared": "What information about the participant and their responses are you likely to share?", - "form.personal_shared_full_name": "Full Name", - "form.personal_shared_phone": "Phone Contact Information", - "form.personal_shared_email": "Email Contact Information", - "form.personal_shared_age": "Age or Date of Birth", - "form.personal_shared_gender": "Gender", - "form.personal_shared_nationality": "Nationality", - "form.personal_shared_address": "Address or City of Residence", - "form.personal_shared_employment_status": "Employment Status", - "form.personal_shared_title": "Job Title", - "form.personal_shared_company": "Company Name", - "form.personal_shared_income": "Household Income", - "form.personal_shared_marital_status": "Marital Status", - "form.personal_shared_dependents": "Number of Children or Dependents", - "form.personal_shared_device": "Device Type or Software Information", - "form.personal_shared_account_details": "Bank Account Details or Paypal Account Number", - "form.personal_shared_identification_number": "Identification Number, e.g. passport, resident ID, driving licence, etc...", - "form.personal_shared_quotes": "Quotes from Responses", - "form.personal_shared_references": "Reference from Responses", - "form.personal_shared_other.desc": "Other (e.g Disability Information, Religion Beliefs, etc...)", - "form.administrative_decision": "Will the participant's responses affect their access to government benefits or services?", - "form.administrative_purpose": "How will the participant's responses affect their access to benefits or services?", - "form.administrative_purpose.desc": "E.g. Reschedule your citizenship ceremony, etc...", - "form.consent": "How will you get proof of consent?", - "form.consent_verbal": "Verbally", - "form.consent_written": "In Writing on Paper", - "form.consent_digital": "Digital Signature", - "form.consent_agency": "Recruitment Agency", - "form.consent_other": "Other", - "form.consent_other.desc": "Other (e.g. recorded audio consent, online form, etc...)", - "form.recording_type": "How will you be recording the participant and their property?", - "form.recording_audio": "Audio", - "form.recording_video": "Video", - "form.recording_image": "Photo/Image", - "form.recording_device": "Device Screen", - "form.recording_written": "Written Responses", - "form.recording_none": "No Recording", + "questions-1.intro1": "Your answers will be put into a consent form for your research participant to read and agree to.", + "questions-1.intro2": "You'll be able to edit your answers and print the consent form later.", + "questions-1.intro3": "This information is not stored for any other purpose.", + "questions-1.intro4": "It's recommended you enter in as much information as possible", + "_QUESTIONS_PAGE_": "", + "basicInfo.title": "Basic Information", + "form.researcher_name": "What is your name?", + "form.researcher_org": "What organisation are you representing?", "form.organisation_representation": "Will the participant be representing an organisation?", + "projectInfo.title": "Project Information", + "form.project.goal": "What is the goal of the project?", + "form.project.goal.desc": "'The purpose of this study is to [insert project goal].' For example, to help the Design team validate the customer registration flow using a prototype", + "form.research.topic": "What is the topic of this particular piece of research?", + "form.research.topic.desc": "'We're doing some research to learn more about [insert research topic here]...'", + "form.research.goal": "What is the goal of this particular piece of research?", + "form.research.goal.desc": "'...so we can understand how we might [[insert research goal here]...'", + "form.participant.value": "Why do you want to talk to these research participants?", + "form.participant.value.desc": "'...We'd like to talk with the participant about it because [insert reason here].'", + "form.research.output.text": "What do you plan to be the primary outputs from the research?", + "form.research.output.text.desc": "E.g. a report, a presentation, a research dataset, etc...", + "form.research.type": "What type of research are you doing?", + "form.research.type.interview": "Interview Style", + "form.research.type.workshop": "Workshop Style", + "form.research.type.evaluation": "Evaluation Style", + "form.research.type.observation": "Observation Style", + "form.session.info.duration": "How long will the session(s) take?", + "form.session.info.duration.desc": "E.g. '1 hour'. Be as precise as you can", + "form.session.info.location": "Where will the session(s) take place?", + "form.session.info.location.desc": "E.g. 'in our offices', 'at your home', 'in a nearby coffee shop', etc...", + "form.session.info.observation.duration": "Over how many sessions will the research take place?", + "form.session.info.observation.duration.desc": "E.g. '2 sessions', '8 weeks', '1 month', etc...", + "privacy.title": "Privacy Information", + "form.personal.information.collected": "What information will you be collecting about the participant?", + "form.personal.information.name": "Full Name", + "form.personal.information.personal.identifiers": "Personal Identifiers", + "form.personal.information.personal.identifiers.desc": "Personal Identifiers: Name, alias, postal address, unique personal identifier, online identifier, Internet Protocol (IP) address, email address, account name, social security number, driver’s license number, passport number, or other similar identifiers", + "form.personal.information.personal.recorded.information": "Personal Recorded Information", + "form.personal.information.personal.recorded.information.desc": "Personal Recorded Information: Name, signature, social security number, physical characteristics or description, address, telephone number, passport number, driver’s license or state identification card number, insurance policy number, education, employment, employment history, bank account number, credit or debit card number, other financial information, medical information, health insurance information", + "form.personal.information.sensitive.personal.characteristics": "Sensitive Personal Characteristics", + "form.personal.information.sensitive.personal.characteristics.desc": "Sensitive Personal Characteristics: Race, religion, sexual orientation, gender identity, gender expression, age", + "form.personal.information.commercial.information": "Commercial Information", + "form.personal.information.commercial.information.desc": "Commercial Information: Records of personal property, products or services purchased, obtained, or considered, or other purchasing or consuming histories or tendencies", + "form.personal.information.biometric.information": "Biometric information", + "form.personal.information.biometric.information.desc": "Biometric information: Hair color, eye color, fingerprints, height, retina scans, facial recognition, voice, and other biometric data", + "form.personal.information.internet.activity.information": "Internet Activity Information", + "form.personal.information.internet.activity.information.desc": "Internet Activity Information: Browsing history, search history, and information regarding a consumer’s interaction with an Internet website, application, or advertisement", + "form.personal.information.geolocation.data": "Geolocation data", + "form.personal.information.geolocation.data.desc": "Geolocation data", + "form.personal.information.recording.data": "Recording Data", + "form.personal.information.recording.data.desc": "Recording Data: Audio, electronic, visual, thermal, olfactory, or similar information", + "form.personal.information.professional.information": "Professional Information", + "form.personal.information.professional.information.desc": "Professional Information: Employment-related information", + "form.personal.information.nonpublic.education.information": "Non-Publicly Available Education information", + "form.personal.information.nonpublic.education.information.desc": "Non-Publicly Available Education information: Information that is not “publicly available personally identifiable information” as defined in the California Family Educational Rights and Privacy Act (20 U.S.C. section 1232g, 34 C.F.R. Part 99)", + "form.personal.information.personal.inferences": "Personal Inferences", + "form.personal.information.personal.inferences.desc": "Personal Inferences: Preferences, Characteristics, Psychological trends, Predispositions, Behavior, Attitudes, Intelligence, Abilities, Aptitudes", + "form.privacy-info": "Show More Information", + "form.recording.type": "How will you be recording the participant and their property?", + "form.recording.type.audio": "Audio", + "form.recording.type.video": "Video", + "form.recording.type.device": "Device Screen", + "form.recording.type.image": "Images/Photographs", + "form.recording.type.none": "No Recording", + "form.recording.shared": "Will clips of the recordings, where the participant's face is obscured, be shared outside the project team?", + "form.confidentiality": "How will you protect the participant's privacy?", + "form.confidentiality.full": "Full privacy", + "form.confidentiality.full.desc1": "All identification, information and responses from the participant will be anonymized including name, images, audio and video.", + "form.confidentiality.full.desc2": "Any information pertaining to participants will be replaced using numbers or pseudonyms.", + "form.confidentiality.partial": "Partial privacy", + "form.confidentiality.partial.desc1": "Identity, information and responses of the participant will be shared amongst the working teams.", + "form.confidentiality.partial.desc2": "Some information may be anonymized depending on its use.", + "form.confidentiality.none": "No privacy", + "form.confidentiality.none.desc1": "Identity, information and responses of the participant will be shared publicly", + "form.confidentiality-info": "Show More Information", + "form.data.contact": "Who should the participant contact if they have any concerns, queries or data related requests?", + "form.data.contact.desc": "This should be anyone who is responsible for the data, other than you (link to GDPR)", + "form.gdpr.link": "Click here for more information - ICO GDPR Regulation Guidelines", + "form.gdpr.link.html": "https://ico.org.uk/for-organisations/guide-to-data-protection/guide-to-the-general-data-protection-regulation-gdpr/individual-rights/right-of-access/#3", + "form.data.contact.email": "What is their email address?", + "research.repository.title": "Data Storage Information", + "form.research.repository.exists": "Will you be storing the data in the research repository?", + "form.research.repository.location": "Where will the data in the repository be stored?", + "form.research.repository.location.desc": "E.g. Secure file drive, protected cloud server, etc...", + "form.research.repository.retention.original": "How long will it be before you destroy all personal data relating to the recordings?", + "form.research.repository.retention.original.desc": "E.g. '12 weeks', '6 months', '2 years', etc...", + "form.research.repository.retention.personal": "How long will it be before you destroy the original recordings, transcripts, and any raw data?", + "form.research.repository.retention.personal.desc": "E.g. '12 weeks', '6 months', '2 years', etc...", + "compensation.title": "Compensation", + "form.compensation": "Will you be compensating the participant for their time?", + "form.compensation.value": "What is the value of the incentive?", + "form.compensation.value.desc": "E.g. $25, £50, 'a discount card', 'branded goodies', etc...", + "form.compensation.followup.needed": "Will you be organising a follow up interview?", + "form.compensation.followup.needed.value": "What is the value of the incentive for the followup?", + "form.compensation.followup.needed.value.desc": "E.g. $25, £50, 'a discount card', 'branded goodies', etc...", "_QUESTIONS_FEEDBACK_SECTION_": "", "feedback.title": "Feedback", "feedback-thanks.title": "Thank you", diff --git a/package-lock.json b/package-lock.json index 7e571b8..3b26e68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1611,7 +1611,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -3662,7 +3663,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -9223,7 +9225,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, diff --git a/package.json b/package.json index da74d75..f61f8f2 100644 --- a/package.json +++ b/package.json @@ -43,10 +43,9 @@ "request": "^2.88.2" }, "devDependencies": { - "commander": "^3.0.2", + "commander": "^5.0.0", "acorn": "^7.1.1", "cheerio": "^1.0.0-rc.3", - "commander": "^5.0.0", "eslint": "^6.8.0", "eslint-config-prettier": "^6.10.1", "eslint-config-standard": "^14.1.1", diff --git a/public/js/toggle-area.js b/public/js/toggle-area.js index 90c9ed3..a0b40bf 100644 --- a/public/js/toggle-area.js +++ b/public/js/toggle-area.js @@ -21,6 +21,7 @@ function toggleArea(event) { } if ((toggleState.indexOf('on') >= 0) & (checked == true)) { target.style.display = 'block' + target.style.marginTop = '0px' } else { target.style.display = 'none' } diff --git a/routes/questions-1/questions-1.njk b/routes/questions-1/questions-1.njk index 27f518d..34698ac 100644 --- a/routes/questions-1/questions-1.njk +++ b/routes/questions-1/questions-1.njk @@ -3,167 +3,166 @@ {% block content %}

{{ __('questions-1.title') }}

-

{{ __('questions-1.intro') }}

+

{{ __('questions-1.intro1') }}

+

{{ __('questions-1.intro2') }}

+

{{ __('questions-1.intro3') }}

+ {#

{{ __('questions-1.intro4') }}

#}
-

{{ __('contactInfo.title') }}

+

{{ __('basicInfo.title') }}

{{ textInput('researcher_name', 'form.researcher_name') }} - {{ textInput('researcher_title', 'form.researcher_title') }} - {{ textInput('researcher_phone', 'form.researcher_phone') }} - {{ textInput('researcher_email', 'form.researcher_email') }} {{ textInput('researcher_org', 'form.researcher_org') }} +
+ {{ radioButtons('organisation_representation', { 'on-1':'yes','off-1':'no'}, data.company_representation, 'form.organisation_representation', errors) }} +
+ +

{{ __('projectInfo.title') }}

+ + {{ textInput('project.goal', 'form.project.goal', { hint: 'form.project.goal.desc' }) }} + + {{ textInput('research.topic', 'form.research.topic', { hint: 'form.research.topic.desc' }) }} -

{{ __('study_info.title') }}

+ {{ textInput('research.goal', 'form.research.goal', { hint: 'form.research.goal.desc' }) }} + + {{ textInput('participant.value', 'form.participant.value', { hint: 'form.participant.value.desc' }) }} + + {{ textInput('research.output.text', 'form.research.output.text', { hint: 'form.research.output.text.desc', hint2: 'Output 1'}) }} + {{ textInput('research.output.text2', '', {hint2:'Output 2'}) }}
- {{ radioButtons('is_with_partner_team', { 'on':'yes','off':'no'}, data.is_with_partner_team, 'form.is_with_partner_team', errors) }} + {{ radioButtons('research-type', { 'off-1':'form.research.type.interview','off-2':'form.research.type.workshop', 'off-3':'form.research.type.evaluation','on':'form.research.type.observation'}, data.research.type, 'form.research.type', errors) }} + {# {{ radioButtons('research-type', { 'on':'yes','off':'no'}, data.research.type, 'form.research.type', errors) }} #}
-