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.

Sign up for GitHub

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

Edit Volunteer & Edit Request UI Improvments. (Issue #120) #139

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Edit Volunteer & Edit Request UI Improvments. (Issue #120) #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 39 additions & 11 deletions src/components/VolunteerTab/VolunteerEditModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class VolunteerEditModal extends React.Component {
}

initState = _ => {
this.state = {
this.state = {
loading: true,

generalAnswer: null,
Expand Down Expand Up @@ -103,7 +103,7 @@ export default class VolunteerEditModal extends React.Component {
this.state.isButtonEnabled = true
this.state.hasChanges = false
this.setState(this.state)
this.props.onSuccess()
this.props.onSuccess()
})
}

Expand All @@ -116,24 +116,52 @@ export default class VolunteerEditModal extends React.Component {
this.state.hasChanges = false
this.setState(this.state)
this.props.onSuccess()
this.props.onHide()
this.props.onHide()
})
}

formatingUserDetails = val => {
return val? val: ''
}

renderUserDetails = _=> {
if (!this.props.volunteer){
return (
<span className="edit-volunteer-title">
No Data
</span>
)
}
let {firstName, lastName, contactEmail, email, contactPhone, tags} = this.props.volunteer;

if (!tags || tags.length==0){ tags='No Tags'}
else{
let tagList = tags.map((tag, index) => {
return <li key={index}>{tag}</li>
})
tags = <ul>{tagList}</ul>
}

return (
<span className="edit-volunteer-title">
<h2>{`${firstName} ${lastName}`}</h2>
<h4>{email}</h4>
<h5>{`${(this.formatingUserDetails(contactEmail))} , ${this.formatingUserDetails(contactPhone)}`}<br/>
tags: {tags}

</h5>
</span>
)
}


render() {
const name = this.props.volunteer ?
`${this.props.volunteer.firstName} ${this.props.volunteer.lastName}` :
'No Data'
const email = this.props.volunteer ? this.props.volunteer.userId : 'No Data'
const errorMessage = this.errorMessage();

return (
<Modal show={this.props.show} onHide={this.onHide} onEnter={this.onEnter} bsSize="lg">
<Modal.Header closeButton>
<span className="edit-volunteer-title">
<h2>{name}</h2>
<h4>{email}</h4>
</span>
{this.renderUserDetails()}
</Modal.Header>
<Modal.Body>
<Tabs id="volunteer-edit-tabs">
Expand Down
60 changes: 44 additions & 16 deletions src/components/VolunteerTab/VolunteerRequestPreviewModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default class VolunteerRequestPreviewModal extends React.Component {
}

initState = _ => {
this.state = {
this.state = {
loading: true,
request: this.props.request,
status: '',
Expand Down Expand Up @@ -82,12 +82,12 @@ export default class VolunteerRequestPreviewModal extends React.Component {
}
return null;
}
handleOptionsChange = event => {

handleOptionsChange = event => {
const field = event.target.id;
this.state[field] = event.target.value
this.setState(this.state);
}
}

onHide = _ => {
//TODO: check if there are unsaved changes and show "are you sure" alert
Expand All @@ -104,7 +104,7 @@ export default class VolunteerRequestPreviewModal extends React.Component {
this.state.isButtonEnabled = true
this.state.hasChanges = false
this.setState(this.state)
this.props.onSuccess()
this.props.onSuccess()
})
}

Expand All @@ -119,7 +119,7 @@ export default class VolunteerRequestPreviewModal extends React.Component {
this.state.removeEnabled = true
this.setState(this.state)
this.props.onSuccess()
this.props.onHide()
this.props.onHide()
})
}

Expand All @@ -139,7 +139,7 @@ export default class VolunteerRequestPreviewModal extends React.Component {
this.state.addEnabled = true
this.setState(this.state)
this.props.onSuccess()
this.props.onHide()
this.props.onHide()
})
.catch(error => {
this.state.status = error.response.data && error.response.data.error ? error.response.data.error : 'Server Error'
Expand All @@ -148,30 +148,58 @@ export default class VolunteerRequestPreviewModal extends React.Component {
});
}

formatingUserDetails = val => {
return val? val: ''
}

renderUserDetails = _=> {
if (!this.props.volunteer){
return (
<span className="edit-volunteer-title">
No Data
</span>
)
}
let {firstName, lastName, contactEmail, email, contactPhone, tags} = this.props.volunteer;

if (!tags || tags.length==0){ tags='No Tags'}
else{
let tagList = tags.map((tag, index) => {
return <li key={index}>{tag}</li>
})
tags = <ul>{tagList}</ul>
}

return (
<span className="edit-volunteer-title">
<h2>{`${firstName} ${lastName}`}</h2>
<h4>{email}</h4>
<h5>{`${(this.formatingUserDetails(contactEmail))} , ${this.formatingUserDetails(contactPhone)}`}<br/>
tags: {tags}

</h5>
</span>
)
}

render() {
if (!this.props.request) {
return (<span/>)
}

const name = this.props.request ? `${this.props.request.firstName} ${this.props.request.lastName}` : 'No Data';
const email = this.props.request ? this.props.request.userId : 'No Data';

const errorMessage = this.errorMessage();


return (
<Modal show={this.props.show} onHide={this.onHide} onEnter={this.onEnter} bsSize="lg">
<Modal.Header closeButton>
<span className="edit-volunteer-title">
<h2>{name}</h2>
<h4>{email}</h4>
</span>
{this.renderUserDetails()}
{/* {this.state.hasChanges &&
<Button className="edit-volunteer-save" bsStyle="success" onClick={this.save}>Save</Button>} */}
</Modal.Header>
<Modal.Body>
<Tabs id="edit-department-tabs">

<Tab eventKey={1} title="Status" className="status">
{errorMessage}
<div className="add-section">
Expand Down Expand Up @@ -200,7 +228,7 @@ export default class VolunteerRequestPreviewModal extends React.Component {

<Button bsStyle="danger" disabled={!this.state.removeEnabled} onClick={this.remove}>Remove</Button>
</Tab>

<Tab eventKey={2} title="Forms">
<h4>General</h4>
<FromAnswersView answers={this.state.generalAnswer}/>
Expand Down