Fakultas Ilmu Komputer UI

Skip to content
GitLab
Commit ed2d3da3 authored by sirinbaisa's avatar sirinbaisa
Browse files

Merge branch 'Features/CompanyBrowseByVacancy' of... 

Merge branch 'Features/CompanyBrowseByVacancy' of https://gitlab.com/PPL2017csui/PPLA1 into Features/CompanyBrowseByVacancy

# Conflicts:
#	assets/css/custom.css
parents 7fd05f05 d3695a34
Hide whitespace changes
Inline Side-by-side
assets/js/AdminVacancyPage.jsx 0 → 100644
View file @ ed2d3da3
import React from 'react';
import Tabs from './components/Tabs';
import Pane from './components/Pane';
import AdminVacancy from './components/AdminVacancy';
import { Item } from 'semantic-ui-react';
export default class AdminVacancyPage extends React.Component {
render() {
return (
<Tabs selected={0}>
<Pane label="Lowongan Belum Terferivikasi" >
<Item.Group>
<AdminVacancy />
</Item.Group>
</Pane>
<Pane label=" Semua Lamaran" />
</Tabs>
);
}
}
assets/js/ApplicantPage.jsx
View file @ ed2d3da3
import React from 'react'; import React from 'react';
import { Grid, Dropdown } from 'semantic-ui-react'; import { Dropdown } from 'semantic-ui-react';
import Tabs from './components/Tabs'; import Tabs from './components/Tabs';
import ApplicantList from './components/ApplicantList'; import ApplicantList from './components/ApplicantList';
import Applicant from './components/Applicant'; import Applicant from './components/Applicant';
...@@ -29,9 +29,6 @@ export default class ApplicantPage extends React.Component { ...@@ -29,9 +29,6 @@ export default class ApplicantPage extends React.Component {
this.getVacancyList(); this.getVacancyList();
} }
handleChange = (e, data) => {
this.setState({ selected: data.value, refresh: this.state.refresh + 5 });
};
getVacancyList= () => Server.get(`/companies/${this.props.user.data.company.id}/vacancies/`, false).then((data) => { getVacancyList= () => Server.get(`/companies/${this.props.user.data.company.id}/vacancies/`, false).then((data) => {
const results = data.results; const results = data.results;
...@@ -41,7 +38,7 @@ export default class ApplicantPage extends React.Component { ...@@ -41,7 +38,7 @@ export default class ApplicantPage extends React.Component {
value: `/companies/${this.props.user.data.company.id}/applications/`, value: `/companies/${this.props.user.data.company.id}/applications/`,
text: 'Semua Lowongan', text: 'Semua Lowongan',
}]; }];
results.map( (vacancy) => { results.map((vacancy) => {
names.push(vacancy.name); names.push(vacancy.name);
const url = `/companies/${this.props.user.data.company.id}/applications/${vacancy.id}/by_vacancy/`; const url = `/companies/${this.props.user.data.company.id}/applications/${vacancy.id}/by_vacancy/`;
const info = { const info = {
...@@ -51,14 +48,16 @@ export default class ApplicantPage extends React.Component { ...@@ -51,14 +48,16 @@ export default class ApplicantPage extends React.Component {
}; };
urls.push(info); urls.push(info);
return urls; return urls;
} ); });
this.setState({ urls }); this.setState({ urls });
console.log('hasil');
console.log(this.state.urls);
}, error => error.then((r) => { }, error => error.then((r) => {
this.modalAlert.open('Gagal mendapatkan daftar lowongan', r.detail); this.modalAlert.open('Gagal mendapatkan daftar lowongan', r.detail);
})); }));
handleChange = (e, data) => {
this.setState({ selected: data.value, refresh: this.state.refresh + 5 });
};
render() { render() {
const company = this.props.user.data.company; const company = this.props.user.data.company;
return ( return (
......
assets/js/CompanyPage.jsx
View file @ ed2d3da3
...@@ -12,6 +12,7 @@ export default class CompanyPage extends React.Component { ...@@ -12,6 +12,7 @@ export default class CompanyPage extends React.Component {
}; };
handleClick = () => window.open('/admin/'); handleClick = () => window.open('/admin/');
handleVacancy = () => window.open('/lowongan');
render() { render() {
return ( return (
...@@ -19,6 +20,11 @@ export default class CompanyPage extends React.Component { ...@@ -19,6 +20,11 @@ export default class CompanyPage extends React.Component {
<div className="button-administrasi"> <div className="button-administrasi">
<Button onClick={this.handleClick} icon="dashboard" labelPosition="left" color="facebook" content="Buka Menu Administrasi" /> <Button onClick={this.handleClick} icon="dashboard" labelPosition="left" color="facebook" content="Buka Menu Administrasi" />
</div> </div>
<div style={{ paddingLeft: '10px', paddingTop : '10px'}}>
<Button onClick={this.handleVacancy} icon="dashboard" labelPosition="left" color="facebook" content="Halaman Verifikasi Lowongan" />
</div>
<Tabs selected={0}> <Tabs selected={0}>
<Pagination <Pagination
key={1} key={1}
......
assets/js/CreateVacancy.jsx
View file @ ed2d3da3
...@@ -19,7 +19,6 @@ export default class CreateVacancy extends React.Component { ...@@ -19,7 +19,6 @@ export default class CreateVacancy extends React.Component {
/* istanbul ignore next */ /* istanbul ignore next */
this.handleChange = this.handleChange.bind(this); this.handleChange = this.handleChange.bind(this);
this.handleSubmit = this.handleSubmit.bind(this); this.handleSubmit = this.handleSubmit.bind(this);
this.handleEditorChange = this.handleEditorChange.bind(this);
this.handleEditor = this.handleEditor.bind(this); this.handleEditor = this.handleEditor.bind(this);
this.setCloseTime = this.setCloseTime.bind(this); this.setCloseTime = this.setCloseTime.bind(this);
this.setOpenTime = this.setOpenTime.bind(this); this.setOpenTime = this.setOpenTime.bind(this);
...@@ -62,17 +61,10 @@ export default class CreateVacancy extends React.Component { ...@@ -62,17 +61,10 @@ export default class CreateVacancy extends React.Component {
handleEditor(value) { handleEditor(value) {
this.setState({ description: value }); this.setState({ description: value });
console.log('dor');
} }
handleEditorChange = (e) => {
this.setState({ description: e.target.getContent() });
console.log('Content was updated:', this.state.description);
};
handleSubmit = (e) => { handleSubmit = (e) => {
e.preventDefault(); e.preventDefault();
console.log(this.state);
this.setState({ formLoading: true }); this.setState({ formLoading: true });
const data = {}; const data = {};
...@@ -95,21 +87,6 @@ export default class CreateVacancy extends React.Component { ...@@ -95,21 +87,6 @@ export default class CreateVacancy extends React.Component {
})); }));
}; };
modules = {
toolbar: [
[{ header: [1, 2, false] }],
['bold', 'italic', 'underline', 'strike', 'blockquote'],
[{ list: 'ordered' }, { list: 'bullet' }, { indent: '-1' }, { indent: '+1' }],
['link', 'image'],
['clean'],
],
};
formats = ['header', 'bold', 'italic', 'underline', 'strike', 'blockquote',
'list', 'bullet', 'indent',
'link', 'image',
];
render = () => ( render = () => (
<div className="create-lowongan" > <div className="create-lowongan" >
<ModalAlert ref={(modal) => { this.modalAlert = modal; }} /> <ModalAlert ref={(modal) => { this.modalAlert = modal; }} />
...@@ -122,22 +99,8 @@ export default class CreateVacancy extends React.Component { ...@@ -122,22 +99,8 @@ export default class CreateVacancy extends React.Component {
</Header> </Header>
<Form loading={this.state.formLoading} onSubmit={this.handleSubmit}> <Form loading={this.state.formLoading} onSubmit={this.handleSubmit}>
<Form.Field label="Posisi" name="name" control={Input} onChange={this.handleChange} value={this.state.name} required /> <Form.Field label="Posisi" name="name" control={Input} onChange={this.handleChange} value={this.state.name} required />
{ !this.state.loading && <CKEditor value={this.state.description} onChange={this.handleEditor} /> } { !this.state.loading &&
{/*<TinyMCE*/} <CKEditor value={this.state.description} onChange={this.handleEditor} /> }
{/*content={this.state.description}*/}
{/*config={{*/}
{/*plugins: 'link image code',*/}
{/*toolbar: 'undo redo | bold italic | alignleft aligncenter alignright | code image',*/}
{/*}}*/}
{/*onChange={this.handleEditorChange}*/}
{/*/>*/}
{/*<Form.TextArea*/}
{/*name="description"*/}
{/*label="Deskripsi"*/}
{/*placeholder="Deskripsi Lowongan..."*/}
{/*onChange={this.handleChange}*/}
{/*value={this.state.description} required*/}
{/*/>*/}
<script>CKEDITOR.replace( 'description' );</script> <script>CKEDITOR.replace( 'description' );</script>
<Form.Group widths="equal"> <Form.Group widths="equal">
<Form.Field <Form.Field
......
assets/js/Dashboard.jsx
View file @ ed2d3da3
import React from 'react'; import React from 'react';
import TopMenu from './components/TopMenu'; import TopMenu from './components/TopMenu';
import Server from './lib/Server';
import Footer from './components/Footer'; import Footer from './components/Footer';
export default class Dashboard extends React.Component { export default class Dashboard extends React.Component {
static propTypes = { static propTypes = {
user: React.PropTypes.object.isRequired,
route: React.PropTypes.object.isRequired,
params: React.PropTypes.object.isRequired,
children: React.PropTypes.oneOfType([ children: React.PropTypes.oneOfType([
React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.arrayOf(React.PropTypes.node),
React.PropTypes.node, React.PropTypes.node,
]).isRequired, ]).isRequired,
user: React.PropTypes.object.isRequired,
}; };
constructor(props) {
super(props);
/* istanbul ignore next */
}
render = () => ( render = () => (
<div> <div>
<TopMenu user={this.props.user} /> <TopMenu user={this.props.user} />
<div className="content"> {this.props.children} </div> {this.props.children}
<Footer />
</div> </div>
) )
} }
assets/js/ProfilePage.jsx
View file @ ed2d3da3
import React from 'react'; import React from 'react';
import { Segment, Image, Header, Icon, Checkbox, Container, Button, Form } from 'semantic-ui-react'; import { Segment, Image, Header, Icon, Checkbox, Container, Button, Form, Grid } from 'semantic-ui-react';
import Server from './lib/Server'; import Server from './lib/Server';
import Storage from './lib/Storage'; import Storage from './lib/Storage';
import ModalAlert from './components/ModalAlert'; import ModalAlert from './components/ModalAlert';
...@@ -168,29 +168,79 @@ export default class ProfilePage extends React.Component { ...@@ -168,29 +168,79 @@ export default class ProfilePage extends React.Component {
const defaultPicture = 'http://semantic-ui.com/images/wireframe/square-image.png'; const defaultPicture = 'http://semantic-ui.com/images/wireframe/square-image.png';
return ( return (
<div className="profilePage"> <div className="profilePage">
<Segment className="biodata-section"> <Segment className="biodata-section" >
<Header as="h2" icon textAlign="center"> <Grid>
<Image src={this.state.photo ? this.state.photo : defaultPicture} size="small" shape="circular" /> <Grid.Column width={7}>
</Header> <Header as="h2" icon textAlign="center">
<Container textAlign="center" className="profile-biodata"> <br />
<div className="biodata"> <Image src={this.state.photo || defaultPicture} size="medium" />
<h3> { this.state.name } </h3> </Header>
<h5> { this.state.major }, { this.state.batch } </h5> </Grid.Column>
<h5> { this.state.email } </h5>
<h5> { this.state.phone_number } </h5> <Grid.Column width={6}>
<h5> { this.state.cityOfBirth}, { this.state.dateOfBirth } </h5> <Container textAlign="left" className="profile-biodata">
<p>Sudah diterima di { this.state.acceptedNo } perusahaan</p> <div className="biodata">
</div> <Segment basic textAlign="center">
<div className="button-profile"> <h1> { this.state.name } </h1>
<a target="_blank" rel="noopener noreferrer" href={this.state.resume ? this.state.resume : '#'} > </Segment>
<Button primary size="small">Resume</Button>
</a> <Segment basic vertical>
</div> <Grid>
<div> <Grid.Column width={2}>
<br /> <Icon name="university" size="big" />
Bagikan Transkrip: <b>{ this.state.bagikanTranskrip ? 'Ya' : 'Tidak'}</b> </Grid.Column>
</div> <Grid.Column width={13}>
</Container> <h3> { this.state.major }, { this.state.batch } </h3>
</Grid.Column>
</Grid>
</Segment>
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
<Icon name="mail" size="big" />
</Grid.Column>
<Grid.Column width={13}>
<h3> { this.state.email } </h3>
</Grid.Column>
</Grid>
</Segment>
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
<Icon name="phone" size="big" />
</Grid.Column>
<Grid.Column width={13}>
<h3> { this.state.phone_number }</h3>
</Grid.Column>
</Grid>
</Segment>
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
<Icon name="gift" size="big" />
</Grid.Column>
<Grid.Column width={13}>
<h3> { this.state.cityOfBirth}, { this.state.dateOfBirth } </h3>
</Grid.Column>
</Grid>
</Segment>
</div>
<Container textAlign="center">
<div className="button-profile">
<a href={this.state.resume || '#'} ><Button primary size="small">Resume</Button></a>
</div>
<div>
<h4> Bagikan Transkrip : { this.state.bagikanTranskrip }</h4>
</div>
</Container>
</Container>
</Grid.Column >
</Grid>
</Segment > </Segment >
{ this.updateForm(this.props.route.own) } { this.updateForm(this.props.route.own) }
</div> </div>
......
assets/js/SupervisorPage.jsx 0 → 100644
View file @ ed2d3da3
import React from 'react';
import { Header, Icon, Grid } from 'semantic-ui-react';
import Pagination from './components/Pagination';
import Server from './lib/Server';
import ApplicationList from './components/ApplicationList';
const cols = [
{ key: 'StudentName', label: 'Nama' },
{ key: 'StudentID', label: 'NPM' },
{ key: 'Perusahaan', label: 'Perusahaan' },
{ key: 'Posisi', label: 'Posisi' },
{ key: 'Status', label: 'Status' },
];
export default class SupervisorPage extends React.Component {
constructor(props) {
super(props);
/* istanbul ignore next */
this.state = { list: [] };
}
componentDidMount() {
this.UserList();
}
UserList() {
Server.get('/student-applications/', false).then((data) => {
this.setState({ list: data.results });
});
}
render = () => {
return (
<Grid container columns="eleven" doubling>
<Grid.Row>
<br />
</Grid.Row>
<Grid.Row>
<Header as="h2">
<Icon name="list" />
Daftar Mahasiswa
</Header>
</Grid.Row>
<Grid.Row>
<div id="layout-content" className="layout-content-wrapper">
<Pagination url={'/student-applications/'} child={<ApplicationList cols={cols} />} />
</div>
</Grid.Row>
</Grid>
);
}
}
assets/js/VacancyPage.jsx
View file @ ed2d3da3
...@@ -15,8 +15,10 @@ export default class VacancyPage extends React.Component { ...@@ -15,8 +15,10 @@ export default class VacancyPage extends React.Component {
const role = user.role; const role = user.role;
if (role === 'student') { if (role === 'student') {
return user.data.student.id; return user.data.student.id;
} else if (role === 'company' || role === 'admin') { } else if (role === 'company' || (role === 'admin' && user.data.company != null)) {
return user.data.company.id; return user.data.company.id;
} else if (role === 'supervisor' || (role === 'admin' && user.data.supervisor != null)) {
return user.data.supervisor.id;
} }
return 0; return 0;
...@@ -31,6 +33,7 @@ export default class VacancyPage extends React.Component { ...@@ -31,6 +33,7 @@ export default class VacancyPage extends React.Component {
}; };
} }
generateVacancies() { generateVacancies() {
if (this.props.user.role === 'student') { if (this.props.user.role === 'student') {
return ( return (
...@@ -76,7 +79,8 @@ export default class VacancyPage extends React.Component { ...@@ -76,7 +79,8 @@ export default class VacancyPage extends React.Component {
</Pane> </Pane>
</Tabs> </Tabs>
); );
} else if (this.props.user.role === 'company' || this.props.user.role === 'admin') { } else if ((this.props.user.role === 'admin' && this.props.user.data.company != null)
|| this.props.user.role === 'company') {
return ( return (
<Segment className="paginationCompany"> <Segment className="paginationCompany">
<Pagination <Pagination
...@@ -93,6 +97,37 @@ export default class VacancyPage extends React.Component { ...@@ -93,6 +97,37 @@ export default class VacancyPage extends React.Component {
/> />
</Segment> </Segment>
); );
} else if (this.props.user.role === 'admin' || this.props.user.role === 'supervisor') {
return (
<Tabs selected={0}>
<Pane label="Lowongan Belum Terverifikasi" >
<Pagination
key={1}
url="/vacancies/?verified=false"
child={
<VacancyList
user={this.props.user}
key={1}
userId={this.state.id}
/>
}
/>
</Pane>
<Pane label="Lowongan Terverifikasi" >
<Pagination
key={2}
url="/vacancies/?verified=true"
child={
<VacancyList
user={this.props.user}
key={2}
userId={this.state.id}
/>
}
/>
</Pane>
</Tabs>
);
} }
return ( return (
......
assets/js/__test__/ApplicantPage-test.jsx
View file @ ed2d3da3
...@@ -4,7 +4,6 @@ import fetchMock from 'fetch-mock'; ...@@ -4,7 +4,6 @@ import fetchMock from 'fetch-mock';
import ApplicantPage from '../ApplicantPage'; import ApplicantPage from '../ApplicantPage';
describe('ApplicantPage', () => { describe('ApplicantPage', () => {
fetchMock.get('*', { data: 'value' });
const companyUser = { const companyUser = {
role: 'company', role: 'company',
...@@ -34,9 +33,174 @@ describe('ApplicantPage', () => { ...@@ -34,9 +33,174 @@ describe('ApplicantPage', () => {
}, },
}; };
const newResponse = [
{
company: {
id: 3,
user: {
url: 'http://localhost:8000/api/users/8/',
username: 'Tutuplapak',
email: '',
is_staff: false,
},
name: 'Tutuplapak',
created: '2017-03-28T07:30:10.535240Z',
updated: '2017-05-07T13:22:19.175033Z',
description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet semper neque a fermentum. Duis ac tellus vitae augue iaculis ultrices. Curabitur commodo et neque nec feugiat. Morbi ac diam vel nunc commodo cursus. Phasellus nulla sapien, hendrerit vitae bibendum at, sollicitudin eu ante. Maecenas maximus, ante eu sollicitudin convallis, mauris nunc posuere risus, eu porttitor diam lacus vitae enim. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse at lectus a elit sollicitudin tempor. Nullam condimentum, justo nec tincidunt maximus, neque mi vulputate leo, sit amet lacinia massa ex eget sem. Duis ac erat facilisis, fringilla mauris in, consequat neque. In et neque consequat, vehicula magna at, efficitur ante. Mauris ac lacinia nibh.\r\n\r\nProin sagittis, lectus quis maximus varius, libero justo sollicitudin augue, non lacinia risus orci a enim. Curabitur iaculis enim quis ullamcorper commodo. Vivamus id nisi rhoncus, dignissim tellus quis, interdum est. Fusce sollicitudin eu libero ac feugiat. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas semper posuere ex, sed accumsan libero iaculis faucibus. Fusce laoreet ac ligula ut consectetur. Donec tortor mauris, rutrum at sodales et, viverra in dolor. Sed bibendum elit et maximus volutpat. Phasellus justo ipsum, laoreet sit amet faucibus eu, ultricies suscipit mauris. Nullam aliquam libero eu ante ultrices mattis. Donec non justo hendrerit neque volutpat placerat. Ut euismod est nec sem mollis, sit amet porttitor massa rhoncus. Aenean id erat sit amet nunc ultrices scelerisque non in ipsum. Curabitur sollicitudin nulla id mi accumsan venenatis.',
registeredStatus: 1,
logo: null,
address: 'Jl. Kebayoran Baru nomor 13, Jakarta Barat',
},
verified: true,
open_time: '2017-04-26T03:39:11Z',
description: 'deskripsi',
close_time: '2017-04-30T03:39:11Z',
created: '2017-04-26T03:39:39.916758Z',
updated: '2017-04-26T03:41:07.157634Z',
name: 'Kepala Sekolah',
status: 0,
bookmarked: false,
id: 4,
},
{
company: {
id: 3,
user: {
url: 'http://localhost:8000/api/users/8/',
username: 'Tutuplapak',
email: '',
is_staff: false,
},
name: 'Tutuplapak',
created: '2017-03-28T07:30:10.535240Z',
updated: '2017-05-07T13:22:19.175033Z',
description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet semper neque a fermentum. Duis ac tellus vitae augue iaculis ultrices. Curabitur commodo et neque nec feugiat. Morbi ac diam vel nunc commodo cursus. Phasellus nulla sapien, hendrerit vitae bibendum at, sollicitudin eu ante. Maecenas maximus, ante eu sollicitudin convallis, mauris nunc posuere risus, eu porttitor diam lacus vitae enim. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse at lectus a elit sollicitudin tempor. Nullam condimentum, justo nec tincidunt maximus, neque mi vulputate leo, sit amet lacinia massa ex eget sem. Duis ac erat facilisis, fringilla mauris in, consequat neque. In et neque consequat, vehicula magna at, efficitur ante. Mauris ac lacinia nibh.\r\n\r\nProin sagittis, lectus quis maximus varius, libero justo sollicitudin augue, non lacinia risus orci a enim. Curabitur iaculis enim quis ullamcorper commodo. Vivamus id nisi rhoncus, dignissim tellus quis, interdum est. Fusce sollicitudin eu libero ac feugiat. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas semper posuere ex, sed accumsan libero iaculis faucibus. Fusce laoreet ac ligula ut consectetur. Donec tortor mauris, rutrum at sodales et, viverra in dolor. Sed bibendum elit et maximus volutpat. Phasellus justo ipsum, laoreet sit amet faucibus eu, ultricies suscipit mauris. Nullam aliquam libero eu ante ultrices mattis. Donec non justo hendrerit neque volutpat placerat. Ut euismod est nec sem mollis, sit amet porttitor massa rhoncus. Aenean id erat sit amet nunc ultrices scelerisque non in ipsum. Curabitur sollicitudin nulla id mi accumsan venenatis.',
registeredStatus: 1,
logo: 'http://localhost:8000/files/company-logo/8a258a48-3bce-4873-b5d1-538b360d0059.png',
address: 'Jl. Kebayoran Baru nomor 13, Jakarta Barat',
},
verified: true,
open_time: '2017-04-26T03:39:11Z',
description: 'deskripsi',
close_time: '2017-04-30T03:39:11Z',
created: '2017-04-26T03:39:39.916758Z',
updated: '2017-04-26T03:41:07.157634Z',
name: 'Kepala Sekolah',
status: 1,
bookmarked: false,
id: 4,
<