Browse Source

Update job type selection using lang file

pull/6/head
Nafies Luthfi 8 years ago
parent
commit
088cb9d956
  1. 2
      app/Entities/Projects/Job.php
  2. 5
      resources/lang/en/job.php
  3. 1
      resources/lang/en/project.php
  4. 5
      resources/lang/id/job.php
  5. 1
      resources/lang/id/project.php
  6. 2
      resources/views/jobs/create.blade.php
  7. 2
      resources/views/jobs/edit.blade.php
  8. 2
      resources/views/projects/jobs/index.blade.php

2
app/Entities/Projects/Job.php

@ -45,7 +45,7 @@ class Job extends Model
public function type() public function type()
{ {
return $this->type_id == 1 ? 'Project' : 'Additional';
return $this->type_id == 1 ? trans('job.main') : trans('job.additional');
} }
public function getProgressAttribute() public function getProgressAttribute()

5
resources/lang/en/job.php

@ -4,7 +4,6 @@ return [
// Labels // Labels
'job' => 'Job', 'job' => 'Job',
'list' => 'Job List', 'list' => 'Job List',
'additional' => 'Additional Job List',
'on_progress' => 'Job on Progress', 'on_progress' => 'Job on Progress',
'detail' => 'Job Detail', 'detail' => 'Job Detail',
'search' => 'Ssearch Job', 'search' => 'Ssearch Job',
@ -36,4 +35,8 @@ return [
'worker' => 'Worker', 'worker' => 'Worker',
'price' => 'Price', 'price' => 'Price',
'type' => 'Job Type', 'type' => 'Job Type',
// Types
'main' => 'Main',
'additional' => 'Additional',
]; ];

1
resources/lang/en/project.php

@ -18,6 +18,7 @@ return [
'receiveable_earnings' => 'Receiveable Earning', 'receiveable_earnings' => 'Receiveable Earning',
'payment_remaining' => 'Payment Remaining', 'payment_remaining' => 'Payment Remaining',
'earnings_calculation' => 'Earnings Calculation', 'earnings_calculation' => 'Earnings Calculation',
'additional_jobs' => 'Additional Job List',
// Payments // Payments
'payment_summary' => 'Payment Summary', 'payment_summary' => 'Payment Summary',

5
resources/lang/id/job.php

@ -4,7 +4,6 @@ return [
// Labels // Labels
'job' => 'Job', 'job' => 'Job',
'list' => 'Daftar Job', 'list' => 'Daftar Job',
'additional' => 'Daftar Job Tambahan',
'on_progress' => 'Job on Progress', 'on_progress' => 'Job on Progress',
'detail' => 'Detail Job', 'detail' => 'Detail Job',
'search' => 'Cari Job', 'search' => 'Cari Job',
@ -36,4 +35,8 @@ return [
'worker' => 'Pekerja', 'worker' => 'Pekerja',
'price' => 'Biaya Pengerjaan', 'price' => 'Biaya Pengerjaan',
'type' => 'Jenis Job', 'type' => 'Jenis Job',
// Types
'main' => 'Utama',
'additional' => 'Tambahan',
]; ];

1
resources/lang/id/project.php

@ -18,6 +18,7 @@ return [
'receiveable_earnings' => 'Pendapatan', 'receiveable_earnings' => 'Pendapatan',
'payment_remaining' => 'Sisa', 'payment_remaining' => 'Sisa',
'earnings_calculation' => 'Rumus Pendapatan', 'earnings_calculation' => 'Rumus Pendapatan',
'additional_jobs' => 'Daftar Job Tambahan',
// Payments // Payments
'payment_summary' => 'Summary Pembayaran', 'payment_summary' => 'Summary Pembayaran',

2
resources/views/jobs/create.blade.php

@ -20,7 +20,7 @@
{!! FormField::select('worker_id', $workers, ['label' => trans('job.worker'), 'value' => 1]) !!} {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker'), 'value' => 1]) !!}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
{!! FormField::radios('type_id', [1 => 'Project', 'Tambahan'], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
{!! FormField::radios('type_id', [1 => trans('job.main'), trans('job.additional')], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
</div> </div>
</div> </div>
{!! FormField::textarea('description', ['label' => trans('job.description')]) !!} {!! FormField::textarea('description', ['label' => trans('job.description')]) !!}

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

@ -18,7 +18,7 @@
{!! FormField::select('worker_id', $workers, ['label' => trans('job.worker')]) !!} {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker')]) !!}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
{!! FormField::radios('type_id', [1 => 'Project', 'Tambahan'], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
{!! FormField::radios('type_id', [1 => trans('job.main'), trans('job.additional')], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
</div> </div>
</div> </div>
{!! FormField::textarea('description', ['label' => trans('job.description')]) !!} {!! FormField::textarea('description', ['label' => trans('job.description')]) !!}

2
resources/views/projects/jobs/index.blade.php

@ -29,7 +29,7 @@
@endif @endif
</div> </div>
<h3 class="panel-title"> <h3 class="panel-title">
{{ $key == 1 ? trans('job.list') : trans('job.additional') }}
{{ $key == 1 ? trans('project.jobs') : trans('project.additional_jobs') }}
</h3> </h3>
</div> </div>
<table class="table table-condensed table-striped"> <table class="table table-condensed table-striped">

Loading…
Cancel
Save