cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-25 07:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

update containers page add days ago

Browse Source
This commit is contained in:
edmondlang
2022-01-12 22:26:28 +08:00
parent b94b87c1b7
commit 9fe86c52bd
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/ScheduleResource.php
+5
View File
@@ -3,6 +3,7 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use Carbon\Carbon;
class ScheduleResource extends JsonResource
{
@@ -18,6 +19,10 @@ class ScheduleResource extends JsonResource
'id' => $this->id,
'etd' => $this->etd ? $this->etd->format('d-m-Y') : 'n/a',
'eta' => $this->eta ? $this->eta->format('d-m-Y') : 'n/a',
'billing_days_left' => [
'value' => (Carbon::parse($this->eta)->subDays(7)->gt(Carbon::now())) ? '+' : '-' ,
'duration' => Carbon::parse($this->eta)->subDays(7)->diffInDays(Carbon::now()),
],
'status' => $this->status,
];
}
resources/assets/vue/components/containers/elements/ContainerComponent.vue
+9 -1
View File
@@ -22,10 +22,18 @@
<p class="no-margin fs-10 all-caps">ETD</p>
<p class="no-margin">{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}</p>
</div>
<div class="col">
<div class="col-auto">
<p class="no-margin fs-10 all-caps">ETA</p>
<p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
</div>
<div class="col">
<p class="no-margin fs-10 all-caps">Days Ago</p>
<p class="no-margin">
{{item.transport ? item.transport.current_schedule.billing_days_left.value : 'n/a'}}
{{item.transport ? item.transport.current_schedule.billing_days_left.duration: ''}}
{{item.transport ? 'days' : ''}}
</p>
</div>
<div class="col-auto">
<p class="no-margin fs-10 all-caps">Packages</p>
<p class="no-margin">{{ item.packing_lists.reduce((total, obj) => total + obj.packages.reduce((total, obj) => obj.quantity + total, 0), 0) }}</p>