diff --git a/resources/lang/de/job.php b/resources/lang/de/job.php
index ef5efe6..44eb826 100644
--- a/resources/lang/de/job.php
+++ b/resources/lang/de/job.php
@@ -39,6 +39,8 @@ return [
     'type'              => 'Beschäftigungstyp',
     'target_start_date' => 'Target Start Date',
     'target_end_date'   => 'Target End Date',
+    'actual_start_date' => 'Actual Start Date',
+    'actual_end_date'   => 'Actual End Date',
 
     // Types
     'main'       => 'Haupt',
diff --git a/resources/lang/en/job.php b/resources/lang/en/job.php
index 525a79b..b62b7da 100644
--- a/resources/lang/en/job.php
+++ b/resources/lang/en/job.php
@@ -41,6 +41,8 @@ return [
     'type'              => 'Job Type',
     'target_start_date' => 'Target Start Date',
     'target_end_date'   => 'Target End Date',
+    'actual_start_date' => 'Actual Start Date',
+    'actual_end_date'   => 'Actual End Date',
 
     // Types
     'main'       => 'Main',
diff --git a/resources/lang/id/job.php b/resources/lang/id/job.php
index c4005d2..4ee7636 100644
--- a/resources/lang/id/job.php
+++ b/resources/lang/id/job.php
@@ -39,8 +39,10 @@ return [
     'worker'            => 'Pekerja',
     'price'             => 'Biaya Pengerjaan',
     '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
     'main'       => 'Utama',
diff --git a/resources/views/jobs/edit.blade.php b/resources/views/jobs/edit.blade.php
index 291b138..7ce27a6 100755
--- a/resources/views/jobs/edit.blade.php
+++ b/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']) !!}
                     </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')]) !!}
             </div>
 
@@ -40,6 +48,23 @@
 </div>
 @endsection
 
+@section('ext_css')
+    {!! Html::style(url('assets/css/plugins/jquery.datetimepicker.css')) !!}
+@endsection
+
 @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
diff --git a/tests/Feature/ManageJobsTest.php b/tests/Feature/ManageJobsTest.php
index 568cc9d..728aaf7 100644
--- a/tests/Feature/ManageJobsTest.php
+++ b/tests/Feature/ManageJobsTest.php
@@ -43,11 +43,13 @@ class ManageJobsTest extends TestCase
         $this->see(trans('job.created'));
 
         $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->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));
@@ -77,11 +83,15 @@ class ManageJobsTest extends TestCase
         $this->see(trans('job.updated'));
 
         $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',
         ]);
     }