diff --git a/assets/js/__test__/components/ApplyModal-test.jsx b/assets/js/__test__/components/ApplyModal-test.jsx index 1119ff7caf68e2043b4803570fb7d64bdd3f3a76..cb640147717eba3cb96e2019389e4c3f890232d7 100755 --- a/assets/js/__test__/components/ApplyModal-test.jsx +++ b/assets/js/__test__/components/ApplyModal-test.jsx @@ -49,4 +49,11 @@ describe('ApplyModal', () => { expect(modalPendaftaran.state.modalOpen).to.equal(false); }); + it('shows company description', () => { + const modalPendaftaran = ReactTestUtils.renderIntoDocument( + ); + + modalPendaftaran.handleChange({ target: { value: 'duar' } }); + expect(modalPendaftaran.props.data.companydescription).to.equal('compdesc'); + }); }); diff --git a/assets/js/components/ApplyModal.jsx b/assets/js/components/ApplyModal.jsx index 813eb2d04e9291dffbff6cd076846462993a483f..8004bff4abb7d350b1cfafc072603efadf50e1a9 100755 --- a/assets/js/components/ApplyModal.jsx +++ b/assets/js/components/ApplyModal.jsx @@ -80,6 +80,8 @@ export default class ApplyModal extends React.Component {

Deskripsi Lowongan

{
} +

Deskripsi Perusahaan

+ {
}

Tanggung Jawab Lowongan

diff --git a/assets/js/components/Vacancy.jsx b/assets/js/components/Vacancy.jsx index 8aed3c71059369339c6ec4a5b5459286fad906b7..06cce57ff436bfa15d6616722718dba7d54e26bc 100755 --- a/assets/js/components/Vacancy.jsx +++ b/assets/js/components/Vacancy.jsx @@ -95,9 +95,10 @@ export default class Vacancy extends React.Component { data={{ header: this.props.data.name, description: this.props.data.description, + companydescription: this.props.data.company.description, responsibilities: this.props.data.responsibilities, id: this.props.data.id, - close_time: this.props.data.close_time + close_time: this.props.data.close_time, }} resume={this.props.user.data.student.resume} buttonTitle="Detail" diff --git a/core/migrations/0020_merge_20191006_2225.py b/core/migrations/0020_merge_20191006_2225.py new file mode 100644 index 0000000000000000000000000000000000000000..f059945aea523e0caada0678bea95f03453ac68c --- /dev/null +++ b/core/migrations/0020_merge_20191006_2225.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2019-10-06 15:25 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0017_vacancy_amount'), + ('core', '0019_merge_20191006_0852'), + ('core', '0014_auto_20191004_1340'), + ] + + operations = [ + ] diff --git a/core/migrations/0051_merge_20191011_1730.py b/core/migrations/0051_merge_20191011_1730.py new file mode 100644 index 0000000000000000000000000000000000000000..8dd7d432f09b79527f21d3d8e19fa88cf18fb134 --- /dev/null +++ b/core/migrations/0051_merge_20191011_1730.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-10-11 10:30 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0050_merge_20191011_1609'), + ('core', '0020_merge_20191006_2225'), + ] + + operations = [ + ]