tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle admin member detail form errors and simplify info

Browse Source
This commit is contained in:
Tanner Collin 2020-01-14 01:52:13 +00:00
parent 384964ca07
commit 437376fc36
1 changed files with 116 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
webclient/src/Admin.js
View File

@ -42,80 +42,77 @@ export function AdminMemberForm(props) {
return ( return (
<div> <div>
{!error ? {input ?
input ? <Form onSubmit={handleSubmit}>
<Form onSubmit={handleSubmit}> <Header size='medium'>Edit Member Details</Header>
<Header size='medium'>Edit Member Details</Header>
<Form.Input <Form.Input
label='Email' label='Email'
{...makeProps('email')} {...makeProps('email')}
/>
<Form.Input
label='Application Date'
{...makeProps('application_date')}
/>
<Form.Input
label='Current Start Date'
{...makeProps('current_start_date')}
/>
<Form.Input
label='Vetted Date'
{...makeProps('vetted_date')}
/>
<Form.Input
label='Expire Date'
{...makeProps('expire_date')}
/>
<Form.Input
label='Membership Fee'
{...makeProps('monthly_fees')}
/>
<Form.Field>
<label>Is the member a director?</label>
<Checkbox
label='Yes'
name='is_director'
onChange={handleCheck}
checked={input.is_director}
/> />
</Form.Field>
<Form.Input <Form.Field>
label='Application Date' <label>Is the member portal staff?</label>
{...makeProps('application_date')} <Checkbox
label='Yes'
name='is_staff'
onChange={handleCheck}
checked={input.is_staff}
/> />
</Form.Field>
<Form.Input <Form.Field>
label='Current Start Date' <label>Is the member an instructor?</label>
{...makeProps('current_start_date')} <Checkbox
label='Yes'
name='is_instructor'
onChange={handleCheck}
checked={input.is_instructor}
/> />
</Form.Field>
<Form.Input {success && <p>Success!</p>}
label='Vetted Date' <Form.Button loading={loading} error={error.non_field_errors}>
{...makeProps('vetted_date')} Submit
/> </Form.Button>
</Form>
<Form.Input
label='Expire Date'
{...makeProps('Expire Date')}
/>
<Form.Input
label='Membership Fee'
{...makeProps('monthly_fees')}
/>
<Form.Field>
<label>Is the member a director?</label>
<Checkbox
label='Yes'
name='is_director'
onChange={handleCheck}
checked={input.is_director}
/>
</Form.Field>
<Form.Field>
<label>Is the member portal staff?</label>
<Checkbox
label='Yes'
name='is_staff'
onChange={handleCheck}
checked={input.is_staff}
/>
</Form.Field>
<Form.Field>
<label>Is the member an instructor?</label>
<Checkbox
label='Yes'
name='is_instructor'
onChange={handleCheck}
checked={input.is_instructor}
/>
</Form.Field>
{success && <p>Success!</p>}
<Form.Button loading={loading} error={error.non_field_errors}>
Submit
</Form.Button>
</Form>
:
<p>Loading...</p>
: :
<p>Error loading member</p> <p>Loading...</p>
} }
</div> </div>
); );
@ -123,73 +120,68 @@ export function AdminMemberForm(props) {
export function AdminMemberInfo(props) { export function AdminMemberInfo(props) {
const member = props.result.member; const member = props.result.member;
const [error, setError] = useState(false);
const { id } = useParams();
return ( return (
<div> <div>
{!error ? {member ?
member ? <div>
<div> <Header size='medium'>Admin Details</Header>
<Header size='medium'>Admin Details</Header>
<BasicTable> <BasicTable>
<Table.Body> <Table.Body>
<Table.Row> <Table.Row>
<Table.Cell>Name:</Table.Cell> <Table.Cell>Name:</Table.Cell>
<Table.Cell>{member.first_name} {member.last_name}</Table.Cell> <Table.Cell>{member.first_name} {member.last_name}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>Status:</Table.Cell> <Table.Cell>Status:</Table.Cell>
<Table.Cell>{member.status}</Table.Cell> <Table.Cell>{member.status}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>Phone:</Table.Cell> <Table.Cell>Phone:</Table.Cell>
<Table.Cell>{member.phone}</Table.Cell> <Table.Cell>{member.phone}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>Address:</Table.Cell> <Table.Cell>Address:</Table.Cell>
<Table.Cell>{member.street_address}</Table.Cell> <Table.Cell>{member.street_address}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>City:</Table.Cell> <Table.Cell>City:</Table.Cell>
<Table.Cell>{member.city}</Table.Cell> <Table.Cell>{member.city}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>Postal:</Table.Cell> <Table.Cell>Postal:</Table.Cell>
<Table.Cell>{member.postal_code}</Table.Cell> <Table.Cell>{member.postal_code}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>Minor:</Table.Cell> <Table.Cell>Minor:</Table.Cell>
<Table.Cell>{member.is_minor ? 'Yes' : 'No'}</Table.Cell> <Table.Cell>{member.is_minor ? 'Yes' : 'No'}</Table.Cell>
</Table.Row> </Table.Row>
{member.is_minor && <Table.Row> {member.is_minor && <Table.Row>
<Table.Cell>Birthdate:</Table.Cell> <Table.Cell>Birthdate:</Table.Cell>
<Table.Cell>{member.birthdate}</Table.Cell> <Table.Cell>{member.birthdate}</Table.Cell>
</Table.Row>} </Table.Row>}
{member.is_minor && <Table.Row> {member.is_minor && <Table.Row>
<Table.Cell>Guardian:</Table.Cell> <Table.Cell>Guardian:</Table.Cell>
<Table.Cell>{member.guardian_name}</Table.Cell> <Table.Cell>{member.guardian_name}</Table.Cell>
</Table.Row>} </Table.Row>}
<Table.Row> <Table.Row>
<Table.Cell>Emergency Contact Name:</Table.Cell> <Table.Cell>Emergency Contact Name:</Table.Cell>
<Table.Cell>{member.emergency_contact_name || 'None'}</Table.Cell> <Table.Cell>{member.emergency_contact_name || 'None'}</Table.Cell>
</Table.Row> </Table.Row>
<Table.Row> <Table.Row>
<Table.Cell>Emergency Contact Phone:</Table.Cell> <Table.Cell>Emergency Contact Phone:</Table.Cell>
<Table.Cell>{member.emergency_contact_phone || 'None'}</Table.Cell> <Table.Cell>{member.emergency_contact_phone || 'None'}</Table.Cell>
</Table.Row> </Table.Row>
</Table.Body> </Table.Body>
</BasicTable> </BasicTable>
</div> </div>
:
<p>Loading...</p>
: :
<p>Error loading member</p> <p>Loading...</p>
} }
</div> </div>
); );