Fakultas Ilmu Komputer UI

Commit adf2c345 authored by M. Reza Qorib's avatar M. Reza Qorib
Browse files

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

parents 2ec7d73c 1ba487e1
......@@ -32,7 +32,7 @@ padding-right:15%;
background: #fff;
border: 1px solid #e5e5e5;
border-radius: 3px;
margin: 100px 100px 30px;
margin: 80px 100px 30px;
}
.tabs__labels {
margin: 0;
......@@ -193,15 +193,16 @@ card .formRegis{
height: auto !important; /* real browsers */
min-height: 100%; /* real browsers */
background-color: #EEEEEE;
padding-bottom: 5%;
}
.footer{
background-color: #031634;
position: relative;
position: absolute;
bottom: 0;
width: 100%;
padding: 1%;
margin-top: 5%;
}
.footer h5{
......
......@@ -6,6 +6,11 @@ import ApplicantList from './components/ApplicantList';
import Applicant from './components/Applicant';
export default class ApplicantPage extends React.Component {
static propTypes = {
user: React.PropTypes.object.isRequired,
};
constructor(props) {
super(props);
/* istanbul ignore next */
......@@ -21,7 +26,7 @@ export default class ApplicantPage extends React.Component {
handleItemClick = (e, { name }) => this.setState({ activeItem: name });
render() {
const company = Storage.get('user-data').company;
const company = this.props.user.data.company;
return (
<Tabs selected={0}>
<Pane label="Lamaran Baru" >
......
......@@ -12,6 +12,7 @@ export default class CreateVacancy extends React.Component {
static propTypes = {
params: React.PropTypes.object.isRequired,
user: React.PropTypes.object.isRequired,
};
constructor(props) {
......@@ -22,7 +23,7 @@ export default class CreateVacancy extends React.Component {
this.state = {
formLoading: false,
company: Storage.get('user-data').company,
company: this.props.user.data.company,
vacancyId: this.props.params.id,
open_time: moment(),
close_time: moment(),
......
from rest_framework import serializers
from core.models import Company
from core.models.vacancies import Vacancy, Application
from core.serializers.accounts import StudentSerializer, CompanySerializer
class VacancySerializer(serializers.ModelSerializer):
company = CompanySerializer()
company = serializers.PrimaryKeyRelatedField(queryset=Company.objects.all())
class Meta:
model = Vacancy
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment