Compare commits

...

2 Commits

Author SHA1 Message Date
a0ce09cdda update latitude and longitude for trips 2026-07-13 10:48:38 +07:00
a19e12ec7b update vehicle maintenance type done 2026-07-13 09:51:20 +07:00
6 changed files with 962 additions and 103 deletions

View File

@ -178,6 +178,10 @@ class ReportsController extends Controller
)
SELECT
t.*,
ttll.start_latitude,
ttll.start_longitude,
ttll.finish_latitude,
ttll.finish_longitude,
tm.total_mileage,
tm.total_trip,
vt.name AS type_name,
@ -189,6 +193,7 @@ class ReportsController extends Controller
JOIN TotalMileage tm ON t.id = tm.id
LEFT JOIN t_vehicles tvt ON tvt.id = t.vhc_id
LEFT JOIN t_vehicles_cats vt ON vt.id = tvt.cat_id
LEFT JOIN t_trips_latitude_longitude ttll ON t.id = ttll.tripsid
WHERE
t.start BETWEEN ? AND ?
AND (? IS NULL OR t.id = ?)

View File

@ -0,0 +1,225 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\UserLogs;
use Auth;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\DB;
use App\Responses;
use Validator;
class VehicleMaintenanceController extends Controller
{
public function api_show_maintenance_type(Request $req, $id)
{
try {
$data = DB::table('t_maintenance_vhc_type')
->where('id', $id)
->first();
if (!$data) {
$apiResp = Responses::error("Truck type not found", 404);
return new Response($apiResp, $apiResp["meta"]["code"]);
}
$apiResp = [
"meta" => [
"code" => 200,
"type" => "success",
"message" => "success",
],
"data" => $data,
];
return new Response($apiResp, $apiResp["meta"]["code"]);
} catch (\Exception $e) {
$apiResp = Responses::error($e->getMessage());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
}
/**
* View
*/
public function view_vehicle_maintenance_type(Request $req)
{
$data = [];
$log = [
"module" => "Vehicle Maintenance Type",
"action" => "View",
"desc" => "Open Vehicle Maintenance Type",
];
UserLogs::insert(Auth::user()->id, $log);
return view("menu_v1.configs.vehicle_maintenance", $data);
}
/**
* API
*/
public function api_list_vehicle_maintenance_type(Request $req)
{
try {
$datas = DB::table('t_maintenance_vhc_type')
->where('isdeleted', 0)
->get();
foreach ($datas as $key => $row) {
$datas[$key]->DT_RowIndex = $key + 1;
$datas[$key]->action = "-";
}
$apiResp = Responses::success("success list vehicle maintenance");
$apiResp["count"] = count($datas);
$apiResp["data"] = $datas;
return new Response($apiResp, $apiResp["meta"]["code"]);
} catch (\Exception $e) {
$apiResp = Responses::error($e->getMessage());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
}
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function api_add_vehicle_maintenance_type(Request $req)
{
try {
$now = time();
$input = [
"service_type" => $req->service_type,
];
$rulesInput = [
"service_type" => "required|string",
];
// validasi input
$isValidInput = Validator::make($input, $rulesInput);
if (!$isValidInput->passes()) {
$apiResp = Responses::bad_input($isValidInput->messages()->first());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
DB::beginTransaction();
$insert = [
"service_type" => $req->service_type,
"created_at" => date("Y-m-d H:i:s", $now),
"udt" => date("Y-m-d H:i:s", $now),
"created_by" => Auth::user()->id,
"uby" => Auth::user()->id
];
DB::table('t_maintenance_vhc_type')->insert($insert);
$apiResp = Responses::created("success add new vehicle maintenance type");
DB::commit();
$log = [
"module" => "Vehicle Type",
"action" => "Create",
"desc" => "Add new vehicle maintenance type: " . $req->service_type,
];
UserLogs::insert(Auth::user()->id, $log);
return new Response($apiResp, $apiResp["meta"]["code"]);
} catch (\Exception $e) {
DB::rollBack();
$apiResp = Responses::error($e->getMessage());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
}
/**
* Update the specified resource in storage.
*
* @param Request $req
* @param int $id
* @return Response
*/
public function api_edit_vehicle_maintenance_type(Request $req, $id)
{
try {
$now = time();
$input = [
"service_type" => $req->service_type,
];
$rulesInput = [
"service_type" => "required|string",
];
// validasi input
$isValidInput = Validator::make($input, $rulesInput);
if (!$isValidInput->passes()) {
$apiResp = Responses::bad_input($isValidInput->messages()->first());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
DB::beginTransaction();
$update = [
"service_type" => $req->service_type,
"udt" => date("Y-m-d H:i:s", $now),
"uby" => Auth::user()->id
];
DB::table('t_maintenance_vhc_type')->where('id', $id)->update($update);
$apiResp = Responses::created("success update vehicle meintenance type");
DB::commit();
$log = [
"module" => "Vehicle Type",
"action" => "Update",
"desc" => "Update vehicle maintenance type: " . $req->type_name,
];
UserLogs::insert(Auth::user()->id, $log);
return new Response($apiResp, $apiResp["meta"]["code"]);
} catch (\Exception $e) {
DB::rollBack();
$apiResp = Responses::error($e->getMessage());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return Response
*/
public function api_del_vehicle_maintenance_type($id)
{
try {
DB::beginTransaction();
DB::table('t_maintenance_vhc_type')->where('id', $id)->update([
'isdeleted' => 1,
'ddt' => date("Y-m-d H:i:s", time()),
'dby' => Auth::user()->id
]);
DB::commit();
$apiResp = Responses::success("success delete vehicle maintenance type");
$log = [
"module" => "Vehicle Type",
"action" => "Delete",
"desc" => "Delete vehicle maintenance type: " . $id,
];
UserLogs::insert(Auth::user()->id, $log);
return new Response($apiResp, $apiResp["meta"]["code"]);
} catch (\Exception $e) {
DB::rollBack();
$apiResp = Responses::error($e->getMessage());
return new Response($apiResp, $apiResp["meta"]["code"]);
}
}
}

View File

@ -0,0 +1,576 @@
@extends('app.app')
@section('title')
Conf Vehicle Types
@endsection
@section('customcss')
<style>
</style>
@endsection
@section('content')
<div class="container-fluid">
<div class="content">
<div class="card">
<div class="card-header">
<div class="row d-flex align-items-center">
<div class="col-3">
{{-- <p class="card-title text-bold mb-0">Vehicle Types (<span id="count_trucktypes">0</span>)</p> --}}
<p class="card-title text-bold mb-0">Vehicle Maintenance Types</p>
</div>
@can('config_truck_type.create')
<div class="col text-end">
<button id="btnMdlNewTruckType" class="btn btn-sm btn-danger">Add New Vehicle Maintenance
Type</button>
</div>
@endcan
<div class="col-auto text-end ps-0">
{{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
{{-- <button class="btn btn-sm btn-danger">Download</button> --}}
</div>
</div>
</div>
<div class="card-body">
<div class="table-responsive">
<table id="tTruckTypes" class="table table-hover dataTable">
<thead>
<tr class="">
<th class="">#</th>
<th class="text-center">Action</th>
<th class="w-100">Service Type Name</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlNewTruckType"
aria-labelledby="mdlNewTruckTypeLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="mdlNewTruckTypeLabel">Add New Maintenance Vehicle Type</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form>
{{-- Maintenance Type Name Type --}}
<div class="mb-3">
<div class="border-bottom">
<h6>Maintenance Vehicle Type</h6>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<label for="service_type" class="col-form-label">Maintenance Type Name:</label>
<input type="text" name="service_type" id="service_type" class="form-control"
placeholder="Please consider use english language">
</div>
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
<button id="btnSubmitNewTruckType" type="button" class="btn btn-sm btn-danger">Submit data</button>
</div>
</div>
</div>
</div>
<div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlEdtTruckType"
aria-labelledby="mdlEdtTruckTypeLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="mdlEdtTruckTypeLabel">Edit Vehicle Maintenance Type</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form>
{{-- Truck Type --}}
<div class="mb-3">
<div class="border-bottom">
<h6>Maintenance Type</h6>
</div>
<div class="row">
<div class="col-sm-6 col-md-6">
<label for="service_type_edit" class="col-form-label">Maintenance Type Name:</label>
<input type="text" name="service_type" id="service_type_edit" class="form-control"
placeholder="Please consider use english language">
</div>
</div>
</div>
</form>
</div>
<div class="modal-footer">
@can('config_truck_type.delete')
<button type="button" id="btnDelTruckType_updt" class="btn btn-sm btn-warning">Delete ?</button>
@endcan
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
@can('config_truck_type.edit')
<button id="btnSubmitEdtTruckType" type="button" class="btn btn-sm btn-danger">Update data</button>
@endcan
</div>
</div>
</div>
</div>
<div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlDelTruckType"
aria-labelledby="mdlDelTruckTypeLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-sm">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="mdlDelTruckTypeLabel">Delete Maintenance Vehicle</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="d-flex justify-content-center">
<p class="mb-0">
Are you sure want to delete this maintenance vehicle type
<a href="#" class="text-danger">
<span id="del-type_name"></span>
</a>
</p>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal">Close</button>
<button id="btnSubmitDelTruckType" type="button" class="btn btn-sm btn-secondary">Yes,
delete</button>
</div>
</div>
</div>
</div>
@endsection
@section('customjs')
<script src="{{ asset('assets/js/load-image.all.min.js') }}"></script>
<script>
'use strict';
const State = {
file_jimp_worker: "{{ asset('assets/js/worker/jimp.js') }}",
storage_lara: "{{ asset('storage') }}/",
stts_conf: {
active: "{{ App\Models\ConfTruckTypes::IS_ACTIVE }}",
inactive: "{{ App\Models\ConfTruckTypes::IS_INACTIVE }}",
publish: "{{ App\Models\ConfTruckTypes::IS_PUBLISH }}",
unpublish: "{{ App\Models\ConfTruckTypes::IS_UNPUBLISH }}",
},
delay_typing_front: 1000,
};
const Wrapper = {
activate: function() {
Wrapper.event();
DTable.activate();
RNew.activate();
RUpdt.activate();
RDel.activate();
},
event: function() {
$('#add-status').bind('change', function() {
if ($(this).is(':checked'))
$('#add-txtStatus').html('Active')
else
$('#add-txtStatus').html('Inactive')
});
$('#updt-status').bind('change', function() {
if ($(this).is(':checked'))
$('#updt-txtStatus').html('Active')
else
$('#updt-txtStatus').html('Inactive')
});
$('#add-publish').bind('change', function() {
if ($(this).is(':checked'))
$('#add-txtPublish').html('Publish')
else
$('#add-txtPublish').html('Unpublish')
});
$('#updt-publish').bind('change', function() {
if ($(this).is(':checked'))
$('#updt-txtPublish').html('Publish')
else
$('#updt-txtPublish').html('Unpublish')
});
},
};
const DTable = {
activate: function() {
DTable.reload();
},
reload: function() {
// $('#tTruckTypes').DataTable();
// if (Driver.Table.firstInitDataTable == 1) { loadTableSkeletonLoading() } else { Driver.Table.firstInitDataTable = 1; }
$('#tTruckTypes').DataTable({
processing: true,
serverSide: false,
bLengthChange: true,
deferRender: true,
destroy: true,
ajax: {
url: "{{ route('api_list_vehicle_maintenance_type') }}",
type: 'GET',
complete: function(jqXHR, textStatus, c) {
let count = jqXHR.responseJSON.count;
if (typeof count != 'undefined') {
$('#count_trucktypes').text(count);
}
// removeTableSkeletonLoading()
},
},
deferRender: true,
columns: [{
data: 'DT_RowIndex',
className: 'text-end',
visible: true,
orderable: true,
searchable: true,
},
{
data: 'action',
className: 'text-center',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
let action = `
<a href="#" class="text-decoration-none me-1 btnUpdtTruckType">
<span class="icon ion-eye fz-16"></span>
</a>
`;
// <a href="#" class="text-decoration-none text-danger btnDelTruckType">
// <span class="icon ion-trash-b fz-16"></span>
// </a>
return action;
}
},
{
data: 'service_type',
className: 'text-left text-nowrap',
visible: true,
orderable: true,
searchable: true,
createdCell: function(td, cellData, rowData, row, col) {
$(td).attr('data-ttid', rowData.id);
$(td).attr('data-type_name', rowData.type_name);
},
},
],
});
},
};
const RNew = {
activate: function() {
RNew.event();
},
event: function() {
// modal
$('#btnMdlNewTruckType').on('click', function() {
$('#mdlNewTruckType').modal('show');
});
$('#mdlNewTruckType').on('shown.bs.modal', function() {
// init select2
});
// button
$('#btnSubmitNewTruckType').on('click', function() {
let data = RNew.getData();
RNew.submitData(data);
});
// input
},
getData: function() {
let data = {};
data.service_type = $('#service_type').val();
return data;
},
submitData: async function(data) {
return new Promise((resolve, reject) => {
if (typeof $('#btnSubmitNewTruckType').attr('disabed') != 'undefined') {
resolve({
type: 'fail'
});
return false;
}
$('#btnSubmitNewTruckType').attr('disabed', true);
$.ajax({
url: "{{ route('api_add_vehicle_maintenance_type') }}",
method: 'POST',
crossDomain: true,
processData: true,
headers: {
'x-api-key': Helper.getCookie('_trtk'),
'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
},
data: data,
success: (data, textStatus, jqXHR) => {
$('#btnSubmitNewTruckType').removeAttr('disabed');
if (data.meta.type != 'success') {
resolve({
type: 'fail'
});
Helper.toast('Warning', 'just now', data.meta.message);
return false;
}
Helper.toast('Success', 'just now',
'success add new vehicle maintenance type');
$('#mdlNewTruckType').modal('hide');
DTable.reload();
resolve({
type: 'success'
});
},
error: (jqXHR, textStatus, error) => {
$('#btnSubmitNewTruckType').removeAttr('disabed');
if (jqXHR.status >= 500) {
Helper.toast('Error', 'just now', 'Please try again');
} else {
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
.message);
}
resolve({
type: 'error'
});
}
})
})
},
}
const RUpdt = {
activate: function() {
RUpdt.event();
},
event: function() {
// modal
$('#tTruckTypes').on('click', '.btnUpdtTruckType', async function(e) {
let ttid = $(e.target).closest('tr').find('td[data-ttid]').data('ttid');
let resp = await RUpdt.reqData({
ttid
});
if (resp.type != 'success') {
Helper.toast('Vehicle Type Not Found', 'just now', 'please try again');
return false;
}
RUpdt.passDataToView(resp.data);
});
$('#mdlEdtTruckType').on('shown.bs.modal', function() {
// init select2
});
// button
$('#btnSubmitEdtTruckType').on('click', function() {
let data = RUpdt.getData();
RUpdt.submitData(data);
});
// input
},
reqData: function(params) {
return new Promise((resolve, reject) => {
$.ajax({
url: "{{ route('api_show_maintenance_type', '') }}/" + params.ttid,
method: 'GET',
crossDomain: true,
processData: true,
headers: {
'x-api-key': Helper.getCookie('_trtk'),
},
data: params,
success: (data, textStatus, jqXHR) => {
if (data.meta.type != 'success') {
resolve({
type: 'fail'
});
Helper.toast('Warning', 'just now', data.meta.message);
return false;
}
resolve({
type: 'success',
data: data.data
});
},
error: (jqXHR, textStatus, error) => {
if (jqXHR.status >= 500) {
Helper.toast('Error', 'just now', 'please try again');
} else {
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
.message);
}
resolve({
type: 'error'
});
}
})
});
},
passDataToView: async function(data) {
$('#service_type_edit').val(data.service_type);
$('#mdlEdtTruckType').data('id', data.id);
$('#mdlEdtTruckType').modal('show');
},
getData: function() {
let data = {};
data.ttid = $('#mdlEdtTruckType').data('id');
data.service_type = $('#service_type_edit').val();
return data;
},
submitData: async function(data) {
return new Promise((resolve, reject) => {
if (typeof $('#btnSubmitEdtTruckType').attr('disabed') != 'undefined') {
resolve({
type: 'fail'
});
return false;
}
$('#btnSubmitEdtTruckType').attr('disabed', true);
$.ajax({
url: "{{ route('api_edit_vehicle_maintenance_type', '') }}/" + data.ttid,
method: 'PUT',
crossDomain: true,
processData: true,
headers: {
'x-api-key': Helper.getCookie('_trtk'),
'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
},
data: data,
success: (data, textStatus, jqXHR) => {
$('#btnSubmitEdtTruckType').removeAttr('disabed');
if (data.meta.type != 'success') {
resolve({
type: 'fail'
});
Helper.toast('Warning', 'just now', data.meta.message);
return false;
}
Helper.toast('Success', 'just now', 'success update maintenance vehicle type');
$('#mdlEdtTruckType').modal('hide');
DTable.reload();
resolve({
type: 'success'
});
},
error: (jqXHR, textStatus, error) => {
$('#btnSubmitEdtTruckType').removeAttr('disabed');
if (jqXHR.status >= 500) {
Helper.toast('Error', 'just now', 'Please try again');
} else {
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
.message);
}
resolve({
type: 'error'
});
}
})
})
},
}
const RDel = {
activate: function() {
RDel.event();
},
event: function() {
// on table
$('#tTruckTypes').on('click', '.btnDelTruckType', function(e) {
let row = $(e.target).closest('tr');
let ttid = row.find('td[data-ttid]').data('ttid');
let type_name = row.find('td[data-type_name]').data('type_name');
RDel.passDataToView({
ttid,
type_name,
});
$('#mdlDelTruckType').data('id', ttid);
$('#mdlDelTruckType').modal('show');
});
$('#btnSubmitDelTruckType').on('click', function() {
let data = {
ttid: $('#mdlDelTruckType').data('id'),
};
RDel.submitData(data);
});
// on modal update
$('#btnDelTruckType_updt').on('click', function(e) {
let data = RUpdt.getData();
RDel.passDataToView({
ttid: data.ttid,
type_name: data.type_name,
});
$('#mdlDelTruckType').data('id', data.ttid);
$('#mdlDelTruckType').modal('show');
});
},
passDataToView: function(data) {
$('#del-type_name').text(data.service_type);
},
submitData: async function(data) {
return new Promise((resolve, reject) => {
if (typeof $('#btnSubmitDelTruckType').attr('disabed') != 'undefined') {
resolve({
type: 'fail'
});
return false;
}
$('#btnSubmitDelTruckType').attr('disabed', true);
$.ajax({
url: "{{ route('api_del_vehicle_maintenance_type', '') }}/" + data.ttid,
method: 'DELETE',
crossDomain: true,
processData: true,
headers: {
'x-api-key': Helper.getCookie('_trtk'),
'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
},
data: data,
success: (data, textStatus, jqXHR) => {
$('#btnSubmitDelTruckType').removeAttr('disabed');
if (data.meta.type != 'success') {
resolve({
type: 'fail'
});
Helper.toast('Warning', 'just now', data.meta.message);
return false;
}
Helper.toast('Success', 'just now', 'success delete vehicle type');
$('#mdlDelTruckType').modal('hide');
$('#mdlEdtTruckType').modal('hide');
DTable.reload();
resolve({
type: 'success'
});
},
error: (jqXHR, textStatus, error) => {
$('#btnSubmitDelTruckType').removeAttr('disabed');
if (jqXHR.status >= 500) {
Helper.toast('Error', 'just now', 'Please try again');
} else {
Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
.message);
}
resolve({
type: 'error'
});
}
})
})
},
}
Wrapper.activate();
</script>
@endsection

View File

@ -25,8 +25,8 @@
@if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN)
@can('vehicle.create')
<!-- <div class="col text-end">
<button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
</div> -->
<button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
</div> -->
@endcan
{{-- <div class="col-auto text-end ps-0">
@ -129,73 +129,73 @@
</tr>
</thead>
<!-- <tbody>
<tr>
<td>24-679</td>
<td>24-679</td>
<td>26</td>
<td>442.3</td>
</tr>
<tr>
<td>24-682</td>
<td>24-682</td>
<td>28</td>
<td>312.7</td>
</tr>
<tr>
<td>24-877</td>
<td>24-877</td>
<td>15</td>
<td>276.4</td>
</tr>
<tr>
<td>A.16-347</td>
<td>A.16-347</td>
<td>37</td>
<td>543.2</td>
</tr>
<tr>
<td>AL2025-B21</td>
<td>AL2025-B21</td>
<td>18</td>
<td>295.4</td>
</tr>
<tr>
<td>B.16-542</td>
<td>B.16-542</td>
<td>32</td>
<td>478.2</td>
</tr>
<tr>
<td>B.24-264</td>
<td>B.24-264</td>
<td>24</td>
<td>188.4</td>
</tr>
<tr>
<td>B.24-274</td>
<td>B.24-274</td>
<td>33</td>
<td>440.1</td>
</tr>
<tr>
<td>Ford Ranger</td>
<td>26-199</td>
<td>30</td>
<td>631.4</td>
</tr>
<tr>
<td>Nissan AD</td>
<td>B.10-517</td>
<td>27</td>
<td>375.9</td>
</tr>
<tr>
<td>Triton</td>
<td>A.29-127</td>
<td>26</td>
<td>508.2</td>
</tr>
</tbody> -->
<tr>
<td>24-679</td>
<td>24-679</td>
<td>26</td>
<td>442.3</td>
</tr>
<tr>
<td>24-682</td>
<td>24-682</td>
<td>28</td>
<td>312.7</td>
</tr>
<tr>
<td>24-877</td>
<td>24-877</td>
<td>15</td>
<td>276.4</td>
</tr>
<tr>
<td>A.16-347</td>
<td>A.16-347</td>
<td>37</td>
<td>543.2</td>
</tr>
<tr>
<td>AL2025-B21</td>
<td>AL2025-B21</td>
<td>18</td>
<td>295.4</td>
</tr>
<tr>
<td>B.16-542</td>
<td>B.16-542</td>
<td>32</td>
<td>478.2</td>
</tr>
<tr>
<td>B.24-264</td>
<td>B.24-264</td>
<td>24</td>
<td>188.4</td>
</tr>
<tr>
<td>B.24-274</td>
<td>B.24-274</td>
<td>33</td>
<td>440.1</td>
</tr>
<tr>
<td>Ford Ranger</td>
<td>26-199</td>
<td>30</td>
<td>631.4</td>
</tr>
<tr>
<td>Nissan AD</td>
<td>B.10-517</td>
<td>27</td>
<td>375.9</td>
</tr>
<tr>
<td>Triton</td>
<td>A.29-127</td>
<td>26</td>
<td>508.2</td>
</tr>
</tbody> -->
</table>
</div>
</div>
@ -207,17 +207,17 @@
<div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlDetailTrip"
aria-labelledby="mdlDetailTripLabel" aria-hidden="true">
<!-- <div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="mdlDetailTripLabel">-----</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
</div>
</div>
</div> -->
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="mdlDetailTripLabel">-----</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
</div>
</div>
</div> -->
</div>
@endsection
@ -472,30 +472,46 @@
render: (data, type, row, meta) => {
// saat export, hanya tampilkan lokasi tanpa tanggal/jam
if (type === 'export') {
const nearestSite = findNearestSite(
row.start_latitude,
row.start_longitude
);
if (nearestSite) {
return formatSiteLabel(nearestSite);
}
return Helper.shortenText(decodeURIComponent(row.startLoc ||
'address'), 255) || "-";
}
const nearestSite = findNearestSite(
row.start_latitude,
row.start_longitude
);
if (nearestSite) {
return formatSiteLabel(nearestSite);
}
return `
${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
${Helper.shortenText(decodeURIComponent(row.startLoc || 'address'), 255) || "-"}
`;
}
},
// {
// data: 'finish',
// render: (data, type, row, meta) => {
// console.log(row)
// // saat export, hanya tampilkan lokasi tanpa tanggal/jam
// if (type === 'export') {
// return Helper.shortenText(decodeURIComponent(row.finishLoc ||
// 'address'), 255) || "-";
// }
// return `
// {
// data: 'finish',
// render: (data, type, row, meta) => {
// console.log(row)
// // saat export, hanya tampilkan lokasi tanpa tanggal/jam
// if (type === 'export') {
// return Helper.shortenText(decodeURIComponent(row.finishLoc ||
// 'address'), 255) || "-";
// }
// return `
// ${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
// ${Helper.shortenText(decodeURIComponent(row.finishLoc || 'address'), 255) || "-"}
// `;
// }
// },
// }
// },
{
data: 'finish',
render: (data, type, row) => {
@ -507,14 +523,14 @@
// Saat export Excel
if (type === 'export') {
// const nearestSite = findNearestSite(
// row.latitude,
// row.longitude
// );
const nearestSite = findNearestSite(
row.finish_latitude,
row.finish_longitude
);
// if (nearestSite) {
// return formatSiteLabel(nearestSite);
// }
if (nearestSite) {
return formatSiteLabel(nearestSite);
}
return Helper.shortenText(
decodeURIComponent(row.finishLoc || 'address'),
@ -522,6 +538,15 @@
) || '-';
}
const nearestSite = findNearestSite(
row.finish_latitude,
row.finish_longitude
);
if (nearestSite) {
return formatSiteLabel(nearestSite);
}
// Tampilan di tabel
return `
${moment.unix(data + AppState.TIMEFIX)
@ -536,7 +561,7 @@
`;
}
},
{
{
className: 'text-start',
render: function(data, type, row, meta) {
const start = moment.unix(row.start);

View File

@ -69,12 +69,13 @@
</li>
@endif
@if (
auth()->user()->can('config_truck_type.view') ||
auth()->user()->can('config_master_device.view') ||
auth()->user()->can('config_truck_type.view') ||
auth()->user()->can('config_master_device.view') ||
auth()->user()->can('config_logs_gps.view') ||
auth()->user()->can('config_distribution_category.view') ||
auth()->user()->can('config_pool.view') ||
auth()->user()->can('user_logs.view')
|| auth()->user()->can('config_vehicle_maintenance_type.view')
)
<li class="nav-item dropdown {{ Request::segment(1) == 'config' ? 'active' : '' }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdownConfig" role="button" data-bs-toggle="dropdown" aria-expanded="false">
@ -86,12 +87,17 @@
<a class="dropdown-item {{ Request::segment(2) == 'truck_types' ? 'active' : '' }}" href="{{ route('view_config_truck_types') }}" title="">Vehicle Type</a>
</li>
@endcan
@can('vehicle_maintenance_type.view')
<li>
<a class="dropdown-item {{ Request::segment(2) == 'maintenance_type' ? 'active' : '' }}" href="{{ route('view_vehicle_maintenance_type') }}" title="">Maintenance Type</a>
</li>
@endcan
@can('config_master_device.view')
<li>
<a class="dropdown-item {{ Request::segment(2) == 'devices' ? 'active' : '' }}" href="{{ route('view_config_devices') }}" title="">Master Devices</a>
</li>
@endcan
@can('config_logs_gps.view')
@can('config_logs_gps.view')
<li>
<a class="dropdown-item {{ Request::segment(2) == 'logs_gps' ? 'active' : '' }}" href="{{ route('view_config_logs_gps') }}" title="">Logs Gps</a>
</li>

View File

@ -141,6 +141,10 @@ Route::middleware(["auth", "auth.user"])->group(function () {
->name("view_config_truck_types")
->middleware("permission:config_truck_type.view");
Route::get("/config/maintenance_type", "VehicleMaintenanceController@view_vehicle_maintenance_type")
->name("view_vehicle_maintenance_type")
->middleware("permission:vehicle_maintenance_type.view");
Route::get("/config/devices", "DevicesController@view_devices")
->name("view_config_devices")
->middleware("permission:config_master_device.view");
@ -611,6 +615,24 @@ Route::middleware(["auth", "auth.user"])->group(function () {
"api_conf_del_truck_type"
);
Route::get("/api/conf/maintenance_type/{id}", "VehicleMaintenanceController@api_show_maintenance_type")->name(
"api_show_maintenance_type"
);
Route::get("/api/conf/maintenance_type", "VehicleMaintenanceController@api_list_vehicle_maintenance_type")->name(
"api_list_vehicle_maintenance_type"
);
Route::post("/api/conf/maintenance_type", "VehicleMaintenanceController@api_add_vehicle_maintenance_type")->name(
"api_add_vehicle_maintenance_type"
);
Route::put("/api/conf/maintenance_type/{id}", "VehicleMaintenanceController@api_edit_vehicle_maintenance_type")->name(
"api_edit_vehicle_maintenance_type"
);
Route::delete("/api/conf/maintenance_type/{id}", "VehicleMaintenanceController@api_del_vehicle_maintenance_type")->name(
"api_del_vehicle_maintenance_type"
);
Route::get("/api/devices", "DevicesController@api_list_devices")->name("api_list_devices");
Route::get("/api/devices/{id}", "DevicesController@api_show_device")->name("api_show_device");
Route::post("/api/devices", "DevicesController@api_add_device")->name("api_add_device");