Skip to content

Commit fd25942

Browse files
author
ninjadev999
committed
added checkboxs for current status of profile.
1 parent b20c569 commit fd25942

File tree

8 files changed

+229
-195
lines changed

8 files changed

+229
-195
lines changed

‎frontend/src/components/shiptalent/forms/adminTalentPositions/SkillSelection.js

-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, {Component} from 'react';
22
import { withStyles } from '@material-ui/core/styles';
3-
import Grid from '@material-ui/core/Grid';
43
import SubSkillsSelection from './SubSkillsSelection';
54
import PropertyButton from './PropertyButton';
65
import { adminStyles } from 'styles';
@@ -21,29 +20,6 @@ class SkillSelection extends Component {
2120
/>
2221
</div>
2322
);
24-
25-
// return(
26-
// <div style={{display: 'block'}}>
27-
// <Grid container spacing={8} direction="row" justify="center" alignItems="flex-start">
28-
// <Grid
29-
// item xl={12} lg={12} md={12} sm={12} xs={12}
30-
// className={classes.clientTalentSearchGenderButtonItem}
31-
// >
32-
// <PropertyButton title={skill[titleItem]} selected={selected} />
33-
// </Grid>
34-
// <Grid
35-
// item xl={12} lg={12} md={12} sm={12} xs={12}
36-
// className={classes.clientTalentSearchGenderButtonItem}
37-
// >
38-
// <SubSkillsSelection
39-
// allSubSkills={skill.sub_skills}
40-
// selectedSubSkills={selectedSubSkills}
41-
// titleItem={'abbreviated_key'}
42-
// />
43-
// </Grid>
44-
// </Grid>
45-
// </div>
46-
// );
4723
}
4824

4925
}

‎frontend/src/components/shiptalent/forms/adminTalentTitle.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class AdminTalentTitle extends Component {
3030

3131
<Grid item xs={12}>
3232
<Grid container spacing={0} direction="row" justify="center" alignItems="center">
33-
<Grid item xs/>
34-
<Grid item xs>
33+
<Grid item lg md={12} xs={12}/>
34+
<Grid item lg md={12} xs={12}>
3535
<PositionsSelection
3636
selectedPositions={talent.talent_position_types}
3737
selectedSubPositions={talent.talent_position_sub_types}
@@ -40,7 +40,7 @@ class AdminTalentTitle extends Component {
4040
loading={!allPositionTypes.isFetched}
4141
/>
4242
</Grid>
43-
<Grid item xs>
43+
<Grid item lg md={12} xs={12}>
4444
<SkillsSelection
4545
selectedSkills={talent.talent_skills}
4646
selectedSubSkills={talent.talent_sub_skills}
@@ -49,7 +49,7 @@ class AdminTalentTitle extends Component {
4949
loading={!allSkills.isFetched}
5050
/>
5151
</Grid>
52-
<Grid item xs/>
52+
<Grid item lg md={12} xs={12}/>
5353
</Grid>
5454
</Grid>
5555
</Grid>

‎frontend/src/containers/admin/Editprofiles/EditProfile.jsx

+12-146
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import Panel from "components/general/panel";
88
import AdminForm from 'components/shiptalent/forms/adminForm';
99
import ProfileTable from "containers/admin/ProfileSearch/ProfileTable";
1010
import Spacer from 'components/general/spacer';
11-
import Card from "components/admin/Card/Card.jsx";
12-
import CardBody from "components/admin/Card/CardBody.jsx";
1311
import Grid from '@material-ui/core/Grid';
1412
import GridItem from "components/admin/Grid/GridItem.jsx";
1513
import GridContainer from "components/admin/Grid/GridContainer.jsx";
1614
import Button from '@material-ui/core/Button';
1715
import Checkbox from '@material-ui/core/Checkbox';
16+
import ProfileStatusButtons from './ProfileStatusButtons';
17+
import ProfileCurrentStatus from './ProfileCurrentStatus';
1818
import * as talentActions from 'actions/talentActions';
1919
import AdminAPI from 'apis/adminAPIs';
2020
import { adminStyles } from 'styles';
@@ -68,163 +68,29 @@ class EditProfile extends React.Component {
6868
return (
6969
<Panel>
7070
<Grid container spacing={40}>
71-
<Grid item xs={6}>
72-
<Grid container item xs={12} spacing={16} >
73-
<Grid item xs={4} >
74-
<Link to="/admin/head-line">
75-
<Button variant="contained" size="large" className={classes.agent}>
76-
Headline, Bio& Resume
77-
</Button>
78-
</Link>
79-
</Grid>
80-
<Grid item xs={4} >
81-
<Button variant="contained" size="large" className={classes.agent} style={{backgroundColor: 'red'}}>
82-
Pictures
83-
</Button>
84-
</Grid>
85-
<Grid item xs={4} >
86-
<Button variant="contained" size="large" className={classes.agent} style={{backgroundColor: 'red'}}>
87-
Videos
88-
</Button>
89-
</Grid>
90-
<Grid item xs={4}>
91-
<Button variant="contained" size="large" className={classes.agent} style={{backgroundColor: 'yellow'}}>
92-
Casting Requests
93-
</Button>
94-
</Grid>
95-
<Grid item xs={4}>
96-
<Button variant="contained" size="large" className={classes.agent}>
97-
Profile Notes
98-
</Button>
99-
</Grid>
100-
<Grid item xs={4}>
101-
<Button variant="contained" size="large" className={classes.agent}>
102-
Logs & Lockouts
103-
</Button>
104-
</Grid>
105-
<Grid item xs={4}>
106-
<Button variant="contained" size="large" className={classes.agent}>
107-
Search/Views
108-
</Button>
109-
</Grid>
110-
<Grid item xs={4}>
111-
<Button variant="contained" size="large" className={classes.agent}>
112-
Shares
113-
</Button>
114-
</Grid>
115-
<Grid item xs={4}>
116-
<Button variant="contained" size="large" className={classes.agent}>
117-
Blocks
118-
</Button>
119-
</Grid>
120-
<Grid item xs={4}>
121-
<Button variant="contained" size="large" className={classes.agent}>
122-
Ratings
123-
</Button>
124-
</Grid>
125-
<Grid item xs={4}>
126-
<Button variant="contained" size="large" className={classes.agent}>
127-
Contracts
128-
</Button>
129-
</Grid>
130-
<Grid item xs={4}>
131-
<Button variant="contained" size="large" className={classes.agent} style={{backgroundColor: 'red'}}>
132-
Medical
133-
</Button>
134-
</Grid>
135-
<Grid item xs={4}>
136-
<Button variant="contained" size="large" className={classes.agent}>
137-
Credentials
138-
</Button>
139-
</Grid>
140-
<Grid item xs={4}>
141-
<Button variant="contained" size="large" className={classes.agent}>
142-
Personal Info
143-
</Button>
144-
</Grid>
145-
<Grid item xs={4}>
146-
<Button variant="contained" size="large" className={classes.agent}>
147-
Immigration
148-
</Button>
149-
</Grid>
150-
<Grid item xs={4}>
151-
<Button variant="contained" size="large" className={classes.agent}>
152-
Languages
153-
</Button>
154-
</Grid>
155-
<Grid item xs={4}>
156-
<Button variant="contained" size="large" className={classes.agent}>
157-
Finance
158-
</Button>
159-
</Grid>
160-
<Grid item xs={4}>
161-
<Button variant="contained" size="large" className={classes.agent}>
162-
Calendar
163-
</Button>
164-
</Grid>
165-
</Grid>
166-
</Grid>
167-
<Grid item xs={6} >
168-
<Grid container spacing={0}>
169-
<Grid item xs={12} style={{textAlign:'left'}}>
170-
<h3> CURRENT STATUS</h3>
171-
</Grid>
172-
<Grid container spacing={0}>
173-
<Grid item xs={12}>
174-
<Checkbox value="checkedC" />Avaliable
175-
</Grid>
176-
<Grid item xs={12}>
177-
<Checkbox value="checkedC" />Not Avaliable(Talent Calendar)
178-
</Grid>
179-
<Grid item xs={12}>
180-
<Checkbox value="checkedC" />Active Casting Request
181-
</Grid>
182-
<Grid item xs={12}>
183-
<Checkbox value="checkedC" />Contracted
184-
</Grid>
185-
<Grid item xs={12}>
186-
<Checkbox value="checkedC" />Deployed until
187-
</Grid>
188-
</Grid>
189-
</Grid>
71+
<Grid item lg md={12} xs={12} />
72+
<Grid item lg={7} md={12} xs={12}>
73+
<Spacer size={43} />
74+
<ProfileStatusButtons profile={profile} loading={isLoading} />
75+
</Grid>
76+
<Grid item lg md={12} xs={12} />
77+
<Grid item lg={3} md={12} xs={12} >
78+
<ProfileCurrentStatus profile={profile} loading={isLoading} />
19079
</Grid>
191-
<Grid container spacing={8}>
192-
<Grid item xs={3} style={{textAlign:'center'}}/>
193-
<Grid item xs={3} style={{textAlign:'center'}}/>
194-
<Grid item xs={3} style={{textAlign:'center'}}/>
195-
<Grid item xs={3} style={{textAlign:'right'}}>
196-
<Link to="/admin/new-profiles">
197-
<Button variant="contained" style={{width: '250px'}}>
198-
New Profiles
199-
</Button>
200-
</Link>
201-
</Grid>
202-
<Grid item xs={3} style={{textAlign:'center'}}/>
203-
<Grid item xs={3} style={{textAlign:'center'}}/>
204-
<Grid item xs={3} style={{textAlign:'center'}}/>
205-
<Grid item xs={3} style={{textAlign:'right'}}>
206-
<Link to="/admin/dashboard">
207-
<Button variant="contained" style={{width: '250px'}}>
208-
Agetn Dashbord
209-
</Button>
210-
</Link>
211-
</Grid>
212-
</Grid>
213-
</Grid>
80+
</Grid>
21481
</Panel>
21582
);
21683
}
21784

21885
render = () => {
21986
const { profile, isLoading } = this.state;
22087
const { allPositionTypes, allSkills } = this.props;
221-
console.log('==== isLoading: ', isLoading);
22288
return (
22389
<AdminForm
22490
talent={profile}
22591
allPositionTypes={allPositionTypes}
22692
allSkills={allSkills}
227-
loading={ isLoading /*!(allPositionTypes.isFetched && allSkills.isFetched)*/}
93+
loading={isLoading}
22894
showMale
22995
showPosition
23096
backLink="/admin/new-profiles"

‎frontend/src/containers/admin/Editprofiles/ProfileCurrentStatus.js

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import React, {Component} from 'react'
2+
import { Link } from 'react-router-dom';
3+
import { withStyles } from '@material-ui/core/styles';
4+
import Typography from '@material-ui/core/Typography';
5+
import FormControlLabel from '@material-ui/core/FormControlLabel';
6+
import Grid from '@material-ui/core/Grid';
7+
import Checkbox from '@material-ui/core/Checkbox';
8+
import { adminStyles } from 'styles';
9+
10+
11+
class ProfileCurrentStatus extends Component {
12+
13+
renderCheckbox = (name, title, value, className) => {
14+
return (
15+
<Grid item xs={12}>
16+
<FormControlLabel
17+
control={
18+
<Checkbox checked={true} value={value} className={className} />
19+
} label={
20+
<Typography className={[this.props.classes.adminGeneralText]}>
21+
{title}
22+
</Typography>
23+
}
24+
/>
25+
</Grid>
26+
);
27+
};
28+
29+
render() {
30+
const { profile, classes } = this.props;
31+
32+
return (
33+
<Grid container spacing={0} justify="flex-start">
34+
<Grid item xs={12}>
35+
<Typography className={[classes.bold, classes.adminTalentViewButtonText]}>
36+
CURRENT STATUS
37+
</Typography>
38+
</Grid>
39+
<Grid container spacing={0}>
40+
{ this.renderCheckbox('isAvailable', 'Available', false, classes.adminTalentCurrentStatusCheckboxAvailable) }
41+
{ this.renderCheckbox('notAvailable', 'Not Avaliable (Talent Calendar)', false, classes.adminTalentCurrentStatusCheckboxNotAvailable) }
42+
{ this.renderCheckbox('isActiveCastingRequest', 'Active Casting Request', false, classes.adminTalentCurrentStatusCheckboxActiveCastingRequest) }
43+
{ this.renderCheckbox('isContracted', 'Contracted', false, classes.adminTalentCurrentStatusCheckboxContracted) }
44+
{ this.renderCheckbox('isDeployed', 'Deployed until', false, classes.adminTalentCurrentStatusCheckboxDeployed) }
45+
</Grid>
46+
</Grid>
47+
);
48+
}
49+
}
50+
51+
export default withStyles(adminStyles)(ProfileCurrentStatus);

‎frontend/src/containers/admin/Editprofiles/ProfileStatusButton.js

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import React, {Component} from 'react'
2+
import { Link } from 'react-router-dom';
3+
import { withStyles } from '@material-ui/core/styles';
4+
import Typography from '@material-ui/core/Typography';
5+
import Button from '@material-ui/core/Button';
6+
import { adminStyles } from 'styles';
7+
8+
9+
class ProfileStatusButton extends Component {
10+
11+
render() {
12+
const { link, title, requireApproval, profileId, classes } = this.props;
13+
let buttonClasses = [classes.button, classes.adminTalentStatusButton];
14+
15+
if (requireApproval) buttonClasses.push(classes.adminTalentStatusApproved);
16+
17+
return (
18+
<Link
19+
to={{
20+
pathname: link,
21+
state: { profileId: profileId }
22+
}}
23+
>
24+
<Button variant="contained" size="large" fullWidth className={buttonClasses}>
25+
<Typography className={[classes.bold, classes.adminTalentStatusButtonText]}>
26+
{ title }
27+
</Typography>
28+
</Button>
29+
</Link>
30+
);
31+
}
32+
}
33+
34+
export default withStyles(adminStyles)(ProfileStatusButton);

0 commit comments

Comments
 (0)