Skip to content

Commit ad3a90e

Browse files
authored
Merge pull request #81 from CodeYourFuture/features/identify-capgemini-volunteers
Features/identify capgemini volunteers
2 parents ef1e417 + 77c66bc commit ad3a90e

File tree

4 files changed

+32
-1
lines changed

4 files changed

+32
-1
lines changed

src/Components/forms/data.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
{ "name": "Transport and Logistics", "_id": "Transport and Logistics" },
3636
{ "name": "Other", "_id": "Other" }
3737
],
38+
3839
"hearAboutCYFList": [
40+
{ "name": "Employer", "_id": "Employer" },
3941
{ "name": "Search engine", "_id": "Search engine" },
4042
{ "name": "Colleague or friend", "_id": "Colleague or friend" },
4143
{ "name": "Conference", "_id": "Conference" },
@@ -45,11 +47,17 @@
4547
{ "name": "Other", "_id": "Other" }
4648
],
4749

50+
"employerList": [
51+
{ "name": "Capgemini", "_id": "Capgemini" },
52+
{ "name": "Other", "_id": "Other" }
53+
],
54+
4855
"radioButtonList": [
4956
{ "value": "None", "_id": "None" },
5057
{ "value": "Some", "_id": "Some" },
5158
{ "value": "Professional experience", "_id": "Professional experience" }
5259
],
60+
5361
"guidePeopleSkillList": [
5462
{
5563
"id": "98y439hf934",
@@ -64,6 +72,7 @@
6472
"label": "Help people learn public speaking"
6573
}
6674
],
75+
6776
"techSkillList": [
6877
{
6978
"id": "8976tygsbhj3e",

src/Components/forms/helper.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ export const initialState = {
1010
interestedInCYF: '',
1111
industry: '',
1212
hearAboutCYF: '',
13+
hearAboutCYFFromEmployer: false,
14+
employer: '',
1315
guidePeople: ListsData.guidePeopleSkillList,
1416
techSkill: ListsData.techSkillList,
1517
otherSkill: ListsData.otherSkillList,

src/Components/forms/index.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ class Forms extends Component {
100100
err: null
101101
})
102102
}
103+
if (name === 'hearAboutCYF') {
104+
this.setState({ hearAboutCYFFromEmployer: value === 'Employer' })
105+
}
103106
}
104107

105108
validateForm = values => {
@@ -154,6 +157,8 @@ class Forms extends Component {
154157
interestedInCYF,
155158
industry,
156159
hearAboutCYF,
160+
hearAboutCYFFromEmployer,
161+
employer,
157162
guidePeople,
158163
techSkill,
159164
otherSkill,
@@ -167,6 +172,7 @@ class Forms extends Component {
167172
lastName,
168173
email,
169174
cityId,
175+
employer: hearAboutCYFFromEmployer ? employer : true,
170176
interestedInVolunteer,
171177
tel,
172178
agreeToTOU,
@@ -191,6 +197,7 @@ class Forms extends Component {
191197
interestedInCYF,
192198
industry,
193199
hearAboutCYF,
200+
employer: hearAboutCYFFromEmployer ? employer : '',
194201
guidePeople: filterEmptyValue(guidePeople),
195202
techSkill: filterEmptyValue(techSkill),
196203
otherSkill: filterEmptyValue(otherSkill),

src/Components/forms/inputs/index.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ export default class VolunteerForm extends Component {
2424
interestedInCYF,
2525
industry,
2626
hearAboutCYF,
27+
hearAboutCYFFromEmployer,
2728
onChangeCheckList,
2829
guidePeople,
2930
techSkill,
30-
otherSkill
31+
otherSkill,
32+
employer
3133
} = this.props
3234

3335
return (
@@ -109,6 +111,7 @@ export default class VolunteerForm extends Component {
109111
isEmpty={errors.industry}
110112
label="What industry are you in?"
111113
/>
114+
112115
<DropDown
113116
onChange={onChange}
114117
value={hearAboutCYF}
@@ -117,6 +120,16 @@ export default class VolunteerForm extends Component {
117120
isEmpty={errors.hearAboutCYF}
118121
label="Where did you hear about Code Your Future?"
119122
/>
123+
{hearAboutCYFFromEmployer && (
124+
<DropDown
125+
onChange={onChange}
126+
value={employer}
127+
name="employer"
128+
arrayList={ListsData.employerList}
129+
isEmpty={errors.employer}
130+
label="Who is your employer? *"
131+
/>
132+
)}
120133
<span className="contact-interested">
121134
<span>
122135
What would you like help Code Your Future with, and what is your

0 commit comments

Comments
 (0)