Skip to content

Commit

Permalink
#2 add state for teacherStudentAddStudentLoginRequired
Browse files Browse the repository at this point in the history
  • Loading branch information
MirTalpur committed Aug 17, 2020
1 parent c9ac51a commit fe3fdff
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 33 deletions.
1 change: 1 addition & 0 deletions components/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export default class Nav extends React.Component {
onBlurhandleTeacherStudentAddName={this.props.onBlurhandleTeacherStudentAddName}
handleTeacherStudentAddCurrentGrade={this.props.handleTeacherStudentAddCurrentGrade}
onBlurhandleTeacherStudentAddCurrentGrade={this.props.onBlurhandleTeacherStudentAddCurrentGrade}
requireLoginPortalForStudent={this.props.requireLoginPortalForStudent}
/>
}
}
Expand Down
26 changes: 25 additions & 1 deletion components/teacherDashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export class TeacherDashboard extends React.Component {
teacherStudentAddPhotoURL: "",
teacherStudentAddCurrentGrade: "",
teacherStudentAddCurrentGradeError: false,
teacherStudentAddStudentLoginRequired: false,
},
}
this.handleMenuClick = this.handleMenuClick.bind(this);
Expand Down Expand Up @@ -87,6 +88,7 @@ export class TeacherDashboard extends React.Component {
this.onBlurhandleTeacherStudentAddName = this.onBlurhandleTeacherStudentAddName.bind(this);
this.handleTeacherStudentAddCurrentGrade = this.handleTeacherStudentAddCurrentGrade.bind(this);
this.onBlurhandleTeacherStudentAddCurrentGrade = this.onBlurhandleTeacherStudentAddCurrentGrade.bind(this);
this.requireLoginPortalForStudent = this.requireLoginPortalForStudent.bind(this);
}

componentDidMount() {
Expand Down Expand Up @@ -516,7 +518,8 @@ export class TeacherDashboard extends React.Component {
teacherStudentAddPhotoURL: "",
teacherStudentAddCurrentGrade: "",
teacherStudentAddNameError: false,

teacherStudentAddCurrentGradeError: false,
teacherStudentAddStudentLoginRequired: false,
}
}));
}
Expand Down Expand Up @@ -593,6 +596,26 @@ export class TeacherDashboard extends React.Component {
}
}

requireLoginPortalForStudent = (e) => {
console.log("in requireLoginPortalForStudent");
if(this.state.teacherStudentComponent.teacherStudentAddStudentLoginRequired) {
this.setState(prevState => ({
teacherStudentComponent: {
...prevState.teacherStudentComponent,
teacherStudentAddStudentLoginRequired: false,
teacherStudentAddEmail: "",
}
}));
} else {
this.setState(prevState => ({
teacherStudentComponent: {
...prevState.teacherStudentComponent,
teacherStudentAddStudentLoginRequired: true,
}
}));
}
}

/* teacherStudentAdd End */

/* individualStudentTeacherEdit component functions end */
Expand Down Expand Up @@ -893,6 +916,7 @@ export class TeacherDashboard extends React.Component {
onBlurhandleTeacherStudentAddName={this.onBlurhandleTeacherStudentAddName}
handleTeacherStudentAddCurrentGrade={this.handleTeacherStudentAddCurrentGrade}
onBlurhandleTeacherStudentAddCurrentGrade={this.onBlurhandleTeacherStudentAddCurrentGrade}
requireLoginPortalForStudent={this.requireLoginPortalForStudent}
/>
</div>
</React.Fragment>
Expand Down
90 changes: 58 additions & 32 deletions components/teacherStudentAdd.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Modal, Button, Form, Space, Input } from 'antd';
import { Modal, Button, Form, Space, Input, Switch } from 'antd';

import stylesheet from 'antd/dist/antd.min.css';
import { UploadOutlined, LoadingOutlined } from '@ant-design/icons';
Expand Down Expand Up @@ -47,37 +47,54 @@ export default class TeacherStudentAdd extends React.Component {
}
}

// emailComponent = () => {
// if(this.props.teacherStudentComponent.teacherStudentAddEmailError) {
// return(
// <div>
// <p>Email</p>
// <Form.Item
// validateStatus="error"
// help="Student Email not valid">
// <Input size="medium" style={{ borderWidth: "0 0 2px" }}
// onChange={(e) => this.props.handleTeacherStudentAddEmail(e)}
// value={this.props.teacherStudentComponent.teacherStudentAddEmail}
// onBlur={(e) => this.props.onBlurhandleTeacherStudentAddEmail(e)}
// />
// </Form.Item>
// </div>
// )
// } else {
// return(
// <div>
// <p>Name</p>
// <Form.Item>
// <Input size="medium" style={{ borderWidth: "0 0 2px" }}
// onChange={(e) => this.props.handleTeacherStudentAddName(e)}
// value={this.props.teacherStudentComponent.teacherStudentAddName}
// onBlur={(e) => this.props.onBlurhandleTeacherStudentAddName(e)}
// />
// </Form.Item>
// </div>
// )
// }
// }
emailComponent = () => {
console.log("this.props.teacherStudentComponent.teacherStudentAddStudentLoginRequired");
console.log(this.props.teacherStudentComponent.teacherStudentAddStudentLoginRequired);
if(this.props.teacherStudentComponent.teacherStudentAddStudentLoginRequired === true){
return(
<div>
<p>Email</p>
<Form.Item>
<Input size="medium" style={{ borderWidth: "0 0 2px" }}
/>
</Form.Item>
</div>
)
} else {
return(
null
)
}
// if(this.props.teacherStudentComponent.teacherStudentAddEmailError) {
// return(
// <div>
// <p>Email</p>
// <Form.Item
// validateStatus="error"
// help="Student Email not valid">
// <Input size="medium" style={{ borderWidth: "0 0 2px" }}
// onChange={(e) => this.props.handleTeacherStudentAddEmail(e)}
// value={this.props.teacherStudentComponent.teacherStudentAddEmail}
// onBlur={(e) => this.props.onBlurhandleTeacherStudentAddEmail(e)}
// />
// </Form.Item>
// </div>
// )
// } else {
// return(
// <div>
// <p>Name</p>
// <Form.Item>
// <Input size="medium" style={{ borderWidth: "0 0 2px" }}
// onChange={(e) => this.props.handleTeacherStudentAddName(e)}
// value={this.props.teacherStudentComponent.teacherStudentAddName}
// onBlur={(e) => this.props.onBlurhandleTeacherStudentAddName(e)}
// />
// </Form.Item>
// </div>
// )
// }
}

currentGradeComponent = () => {
if(this.props.teacherStudentComponent.teacherStudentAddCurrentGradeError) {
Expand Down Expand Up @@ -111,6 +128,12 @@ export default class TeacherStudentAdd extends React.Component {
}
}

showRequireLoginToggleComponent = () => {
return(
<Switch style={{ float: 'right' }} onChange={(e) => this.props.requireLoginPortalForStudent(e)} />
)
}

render() {
return (
<React.Fragment>
Expand All @@ -134,6 +157,9 @@ export default class TeacherStudentAdd extends React.Component {
<Space/>
{this.nameComponent()}
{this.currentGradeComponent()}
{this.emailComponent()}
Enable Student Portal
{this.showRequireLoginToggleComponent()}
</Form>
</Modal>
</div>
Expand Down
1 change: 1 addition & 0 deletions components/teacherStudentComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export default class TeacherStudentComponent extends React.Component {
handleTeacherStudentAddCurrentGrade={this.props.handleTeacherStudentAddCurrentGrade}
onBlurhandleTeacherStudentAddCurrentGrade={this.props.onBlurhandleTeacherStudentAddCurrentGrade}
teacherStudentComponent={this.props.teacherStudentComponent}
requireLoginPortalForStudent={this.props.requireLoginPortalForStudent}
/>
} else {
console.log("I'm in the null...");
Expand Down

0 comments on commit fe3fdff

Please sign in to comment.