Browse Source

Add job dates entry on job edit page

pull/12/head
Nafies Luthfi 8 years ago
parent
commit
98e2be110b
  1. 2
      resources/lang/de/job.php
  2. 2
      resources/lang/en/job.php
  3. 6
      resources/lang/id/job.php
  4. 27
      resources/views/jobs/edit.blade.php
  5. 38
      tests/Feature/ManageJobsTest.php

2
resources/lang/de/job.php

@ -39,6 +39,8 @@ return [
'type' => 'Beschäftigungstyp', 'type' => 'Beschäftigungstyp',
'target_start_date' => 'Target Start Date', 'target_start_date' => 'Target Start Date',
'target_end_date' => 'Target End Date', 'target_end_date' => 'Target End Date',
'actual_start_date' => 'Actual Start Date',
'actual_end_date' => 'Actual End Date',
// Types // Types
'main' => 'Haupt', 'main' => 'Haupt',

2
resources/lang/en/job.php

@ -41,6 +41,8 @@ return [
'type' => 'Job Type', 'type' => 'Job Type',
'target_start_date' => 'Target Start Date', 'target_start_date' => 'Target Start Date',
'target_end_date' => 'Target End Date', 'target_end_date' => 'Target End Date',
'actual_start_date' => 'Actual Start Date',
'actual_end_date' => 'Actual End Date',
// Types // Types
'main' => 'Main', 'main' => 'Main',

6
resources/lang/id/job.php

@ -39,8 +39,10 @@ return [
'worker' => 'Pekerja', 'worker' => 'Pekerja',
'price' => 'Biaya Pengerjaan', 'price' => 'Biaya Pengerjaan',
'type' => 'Jenis Job', 'type' => 'Jenis Job',
'target_start_date' => 'Tanggal Target Mulai',
'target_end_date' => 'Tanggal Target Selesai',
'target_start_date' => 'Tanggal Mulai Target',
'target_end_date' => 'Tanggal Selesai Target',
'actual_start_date' => 'Tanggal Mulai Aktual',
'actual_end_date' => 'Tanggal Selesai Aktual',
// Types // Types
'main' => 'Utama', 'main' => 'Utama',

27
resources/views/jobs/edit.blade.php

@ -21,6 +21,14 @@
{!! FormField::radios('type_id', [1 => __('job.main'), __('job.additional')], ['value' => 1, 'label' => __('job.type'), 'list_style' => 'unstyled']) !!} {!! FormField::radios('type_id', [1 => __('job.main'), __('job.additional')], ['value' => 1, 'label' => __('job.type'), 'list_style' => 'unstyled']) !!}
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-4">{!! FormField::text('target_start_date', ['label' => __('job.target_start_date'), 'class' => 'date-select']) !!}</div>
<div class="col-md-4">{!! FormField::text('target_end_date', ['label' => __('job.target_end_date'), 'class' => 'date-select']) !!}</div>
</div>
<div class="row">
<div class="col-md-4">{!! FormField::text('actual_start_date', ['label' => __('job.actual_start_date'), 'class' => 'date-select']) !!}</div>
<div class="col-md-4">{!! FormField::text('actual_end_date', ['label' => __('job.actual_end_date'), 'class' => 'date-select']) !!}</div>
</div>
{!! FormField::textarea('description', ['label' => __('job.description')]) !!} {!! FormField::textarea('description', ['label' => __('job.description')]) !!}
</div> </div>
@ -40,6 +48,23 @@
</div> </div>
@endsection @endsection
@section('ext_css')
{!! Html::style(url('assets/css/plugins/jquery.datetimepicker.css')) !!}
@endsection
@section('ext_js') @section('ext_js')
{!! Html::script(url('assets/js/plugins/autoNumeric.min.js')) !!}
{!! Html::script(url('assets/js/plugins/jquery.datetimepicker.js')) !!}
@endsection
@section('script')
<script>
(function() {
$('.date-select').datetimepicker({
timepicker:false,
format:'Y-m-d',
closeOnDateSelect: true,
scrollInput: false
});
})();
</script>
@endsection @endsection

38
tests/Feature/ManageJobsTest.php

@ -43,11 +43,13 @@ class ManageJobsTest extends TestCase
$this->see(trans('job.created')); $this->see(trans('job.created'));
$this->seeInDatabase('jobs', [ $this->seeInDatabase('jobs', [
'name' => 'Nama Fitur Baru',
'price' => 100000,
'worker_id' => $worker->id,
'type_id' => 1,
'project_id' => $project->id,
'name' => 'Nama Fitur Baru',
'price' => 100000,
'worker_id' => $worker->id,
'type_id' => 1,
'project_id' => $project->id,
'target_start_date' => '2017-04-04',
'target_end_date' => '2017-07-07',
]); ]);
} }
@ -66,10 +68,14 @@ class ManageJobsTest extends TestCase
$this->visit(route('jobs.edit', $job->id)); $this->visit(route('jobs.edit', $job->id));
$this->submitForm(trans('job.update'), [ $this->submitForm(trans('job.update'), [
'name' => 'Nama Fitur Edit',
'price' => 33333,
'worker_id' => $users[2]->id,
'type_id' => 2,
'name' => 'Nama Fitur Edit',
'price' => 33333,
'worker_id' => $users[2]->id,
'type_id' => 2,
'target_start_date' => '2017-04-04',
'target_end_date' => '2017-07-07',
'actual_start_date' => '2017-04-04',
'actual_end_date' => '2017-07-07',
]); ]);
$this->seePageIs(route('jobs.show', $job->id)); $this->seePageIs(route('jobs.show', $job->id));
@ -77,11 +83,15 @@ class ManageJobsTest extends TestCase
$this->see(trans('job.updated')); $this->see(trans('job.updated'));
$this->seeInDatabase('jobs', [ $this->seeInDatabase('jobs', [
'name' => 'Nama Fitur Edit',
'price' => 33333,
'worker_id' => $users[2]->id,
'project_id' => $project->id,
'type_id' => 2,
'name' => 'Nama Fitur Edit',
'price' => 33333,
'worker_id' => $users[2]->id,
'project_id' => $project->id,
'type_id' => 2,
'target_start_date' => '2017-04-04',
'target_end_date' => '2017-07-07',
'actual_start_date' => '2017-04-04',
'actual_end_date' => '2017-07-07',
]); ]);
} }

Loading…
Cancel
Save