-
Notifications
You must be signed in to change notification settings - Fork 242
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7230 from pretendWhale/v2.5.2
V2.5.2
- Loading branch information
Showing
33 changed files
with
520 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| VERSION=v2.5.1,PATCH_LEVEL=DEV | ||
| VERSION=v2.5.2,PATCH_LEVEL=DEV |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
app/assets/javascripts/Components/Modals/section_distribution_modal.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| import React from "react"; | ||
| import Modal from "react-modal"; | ||
| import PropTypes from "prop-types"; | ||
|
|
||
| export class SectionDistributionModal extends React.Component { | ||
| static defaultProps = { | ||
| override: false, | ||
| }; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
| this.input = React.createRef(); | ||
| this.sectionsArray = Object.values(this.props.sections).sort(); | ||
| this.graderMap = this.props.graders.reduce((map, grader) => { | ||
| map[grader.user_name] = grader._id; | ||
| return map; | ||
| }, {}); | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| Modal.setAppElement("body"); | ||
| } | ||
|
|
||
| onSubmit = event => { | ||
| event.preventDefault(); | ||
| const form = new FormData(this.input.current); | ||
| const assignments = {}; | ||
| form.forEach((value, key) => { | ||
| assignments[key] = this.graderMap[value]; | ||
| }); | ||
| this.props.onSubmit(assignments); | ||
| }; | ||
|
|
||
| renderSectionRow = section => { | ||
| const {graders} = this.props; | ||
| return ( | ||
| <div className="flex-row-expand" key={section}> | ||
| <label htmlFor={`input-${section}`} className="modal-inline-label"> | ||
| {section} | ||
| </label> | ||
| <select className={`input-${section}`} name={section}> | ||
| <option value=""></option> | ||
| {graders.map(grader => ( | ||
| <option key={grader.user_name} value={grader.user_name}> | ||
| {grader.user_name} | ||
| </option> | ||
| ))} | ||
| </select> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| render() { | ||
| return ( | ||
| <Modal | ||
| className="react-modal dialog" | ||
| isOpen={this.props.isOpen} | ||
| onRequestClose={this.props.onRequestClose} | ||
| > | ||
| <form onSubmit={this.onSubmit} ref={this.input}> | ||
| <div className={"modal-container-vertical"}> | ||
| <h2>{I18n.t("graders.assign_by_section_modal_title")}</h2> | ||
| <p style={{"max-width": "300px"}}>{I18n.t("graders.assign_by_section_instruction")}</p> | ||
| {this.sectionsArray.map(section => this.renderSectionRow(section))} | ||
| </div> | ||
| <div className={"modal-container"}> | ||
| <input type="submit" value={I18n.t("graders.actions.assign_by_section")} /> | ||
| </div> | ||
| </form> | ||
| </Modal> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| SectionDistributionModal.propTypes = { | ||
| graders: PropTypes.arrayOf(PropTypes.object).isRequired, | ||
| isOpen: PropTypes.bool.isRequired, | ||
| onSubmit: PropTypes.func.isRequired, | ||
| sections: PropTypes.objectOf(PropTypes.string).isRequired, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.