Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More copy + TeacherCon registration form updates #20376

Merged
merged 6 commits into from
Feb 2, 2018

Conversation

tanyaparker
Copy link
Contributor

@tanyaparker tanyaparker commented Feb 2, 2018

If approved to merge, I'll merge into staging after #20363.

  • gradingSystem should be a question for both CSD and CSP
  • Typo, "trains" instead of "trainings"
  • Fix stray commas and periods in emails
  • Capitalize Form in the TeacherCon Registration Form title

@tanyaparker tanyaparker changed the title More copy updates More copy + TeacherCon registration form updates Feb 2, 2018
Copy link
Contributor

@aoby aoby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, with a couple small suggestions

);
} else if (data['course'] === 'CS Discoveries') {
requiredFields.push(
'howManyHours',
'howManyTerms'
'howManyTerms',
'gradingSystem'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is required in both (all) cases, it could just be a static required field in the ruby class.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After chatting w @mehalshah, we're going to leave this where it is in case course is ever something else.

</FormGroup>
}

{this.props.course === "CS Discoveries" &&
<FormGroup>
{this.radioButtonsFor("howManyHours")}
{this.radioButtonsFor("howManyTerms")}
{this.radioButtonsWithAdditionalTextFieldsFor("gradingSystem", {
[TextFields.otherPleaseList]: "grading_system_other"
})}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a big deal but this could be reworked slightly to reduce repeated code, making the <FormGroup> and these gradingSystem radio buttons common, then branching for CSD/CSP for the course-specific fields.

@tanyaparker
Copy link
Contributor Author

Actually, CSP was missing more questions. Almost matched to spec now. It looks like there still should be a question "How many course hours per week will your school offer CS Principles?" but idk how to add a new question so I'll create a new card for that.

@tanyaparker
Copy link
Contributor Author

@tanyaparker tanyaparker changed the base branch from teachercon_registration_form_updates to staging February 2, 2018 18:45
@aoby
Copy link
Contributor

aoby commented Feb 2, 2018

@mehalshah PTAL at my addition: 3efaca8

…r consistency (the key format is transformed back and forth so it has no actual effect)
@tanyaparker tanyaparker merged commit 9a60c7e into staging Feb 2, 2018
@tanyaparker tanyaparker deleted the more-copy-updates branch May 24, 2018 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants