TIMOR-TELECOM/gps-frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
meusinfirmary
2025-05-30 01:46:11 +07:00
parent 470e132ff5
commit 3ccb887a31
2 changed files with 171 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Controllers/VehiclesController.php
View File

@ -119,8 +119,8 @@ class VehiclesController extends Controller
"stnk_photo" => $req->stnk_base64,
"stnk_exp" => $req->stnk_exp,
"nopol1" => $req->nopol1,
"nopol2" => $req->nopol2,
"nopol3" => $req->nopol3,
// "nopol2" => $req->nopol2,
// "nopol3" => $req->nopol3,
"manufacture_year" => $req->stnk_vyear,
"cylinder_capacity" => $req->cc,
"vehicle_identity_number" => $req->vin,
@ -130,7 +130,7 @@ class VehiclesController extends Controller
"license_plat_color" => $req->tnkb_color,
"regis_year" => $req->regis_year,
"tax_exp" => $req->tax_exp,
"kir_exp" => $req->kir_exp,
// "kir_exp" => $req->kir_exp,
// "vendor_id" => $req->vendor_id,
];
$rulesInput = [
@ -150,9 +150,9 @@ class VehiclesController extends Controller
"assign_driver" => "nullable|integer",
"stnk_photo" => "required|string",
"stnk_exp" => "required|date_format:Y-m-d",
"nopol1" => "required|string|max:2",
"nopol2" => "required|string|max:4",
"nopol3" => "required|string|max:3",
"nopol1" => "required|string",
// "nopol2" => "required|string|max:4",
// "nopol3" => "required|string|max:3",
"manufacture_year" => "required|digits:4",
"cylinder_capacity" => "required|integer",
"vehicle_identity_number" => "required|string|min:17|max:45",
@ -162,7 +162,7 @@ class VehiclesController extends Controller
"license_plat_color" => "required|string|min:3|max:25",
"regis_year" => "required|digits:4",
"tax_exp" => "required|date_format:Y-m-d",
"kir_exp" => "required|date_format:Y-m-d",
// "kir_exp" => "required|date_format:Y-m-d",
// "vendor_id" => "nullable|integer|not_in:0",
];
@ -213,8 +213,8 @@ class VehiclesController extends Controller
"brand_id" => $req->brand_id,
"type_id" => $req->type_id,
"nopol1" => strtoupper($req->nopol1),
"nopol2" => strtoupper($req->nopol2),
"nopol3" => strtoupper($req->nopol3),
// "nopol2" => strtoupper($req->nopol2),
// "nopol3" => strtoupper($req->nopol3),
"c_did" => $req->d_current ?? 0,
"a_did" => $req->d_assign ?? 0,
"is_track_holiday" => Vehicles::DEFAULT_TRACK_HOLIDAY,
@ -336,8 +336,8 @@ class VehiclesController extends Controller
"stnk_photo" => $req->stnk_base64,
"stnk_exp" => $req->stnk_exp,
"nopol1" => $req->nopol1,
"nopol2" => $req->nopol2,
"nopol3" => $req->nopol3,
// "nopol2" => $req->nopol2,
// "nopol3" => $req->nopol3,
"manufacture_year" => $req->stnk_vyear,
"cylinder_capacity" => $req->cc,
"vehicle_identity_number" => $req->vin,
@ -347,7 +347,7 @@ class VehiclesController extends Controller
"license_plat_color" => $req->tnkb_color,
"regis_year" => $req->regis_year,
"tax_exp" => $req->tax_exp,
"kir_exp" => $req->kir_exp,
// "kir_exp" => $req->kir_exp,
// "vendor_id" => $req->vendor_id,
];
$rulesInput = [
@ -368,9 +368,9 @@ class VehiclesController extends Controller
"assign_driver" => "nullable|integer",
"stnk_photo" => "nullable|string",
"stnk_exp" => "required|date_format:Y-m-d",
"nopol1" => "required|string|max:2",
"nopol2" => "required|string|max:4",
"nopol3" => "required|string|max:3",
"nopol1" => "required|string",
// "nopol2" => "required|string|max:4",
// "nopol3" => "required|string|max:3",
"manufacture_year" => "required|digits:4",
"cylinder_capacity" => "required|integer",
"vehicle_identity_number" => "required|string|min:17|max:45",
@ -380,7 +380,7 @@ class VehiclesController extends Controller
"license_plat_color" => "required|string|min:3|max:25",
"regis_year" => "required|digits:4",
"tax_exp" => "required|date_format:Y-m-d",
"kir_exp" => "required|date_format:Y-m-d",
// "kir_exp" => "required|date_format:Y-m-d",
// "vendor_id" => "nullable|integer|not_in:0",
];

232
resources/views/menu_v1/vehicles.blade.php
View File

@ -57,37 +57,15 @@
<th class="text-center">Action</th>
<th class="">Vehicle</th>
<th class="">Tax Exp</th>
<th class="">Kir Exp</th>
{{-- <th class="">Kir Exp</th> --}}
<th class="">Service Start</th>
@if ($user_role != \App\Models\Users::ROLE_VENDOR)
<th class="">Device ID</th>
@endif
{{-- <th class="">Current Driver</th> --}}
{{-- <th class="">Assign Driver</th> --}}
<th class="">Type</th>
<th class="">Manufacture Year</th>
{{-- <th class="">Cylinder Capacity</th> --}}
{{-- <th class="">Vehicle Identity Number</th> --}}
{{-- <th class="">Engine Number</th> --}}
{{-- <th class="">Vehicle Color</th> --}}
{{-- <th class="">Type Fuel</th> --}}
{{-- <th class="">License Plat Color</th> --}}
{{-- <th class="">Registration Year</th> --}}
{{-- <th class="">Tax Exp</th> --}}
{{-- <th class="">Speed <span class="text-nowrap">Limit <span
class="text-lowercase">(kph)</span></span></th> --}}
{{-- <th class="">Fuel <span class="text-nowrap">Capacity (L)</span></th> --}}
{{-- <th class="">Fuel Drop <span class="text-nowrap">Treshold (L)</span>
</th> --}}
{{-- <th class="">Maximum <span class="text-nowrap">Presure <span
class="text-capitalize">(Bar)</span></span></th> --}}
{{-- <th class="">Alert Zones</th> --}}
{{-- <th class="">Track <span class="text-nowrap">On Holidays</span></th> --}}
{{-- <th class="">Tracking Schedule</th> --}}
<th class=""><span class="text-nowrap">Mileage <span class="text-lowercase">(km)</span></span></th>
{{-- <th class="text-center">Cameras</th> --}}
<th class="">Company</th>
{{-- <th class="">Group</th> --}}
</tr>
</thead>
<tbody>
@ -115,10 +93,10 @@
<h6>Vehicle Data</h6>
</div>
<div class="row mb-3">
<div class="col-6">
<div class="col-5">
<label for="add-fvhc-img" class="col-form-label">Front Vehicle Photo:</label>
<br>
<img id="add-fvhc-img" class="img-fluid landscape-photo" src="https://products.unitedtractors.com/wp-content/uploads/2021/03/udtruck-GWE370.png" alt="add-fvhc-img">
<img id="add-fvhc-img" class="img-fluid landscape-photo" style="max-height: 19.6vh" src="https://products.unitedtractors.com/wp-content/uploads/2021/03/udtruck-GWE370.png" alt="add-fvhc-img">
<div id="add-group_fvhc_spinner" class="d-none">
<div class="spinner-border" role="status">
<span class="visually-hidden">Loading...</span>
@ -135,7 +113,7 @@
<span id="add-fvhc-filesize"></span>
</div>
</div>
<div class="col-6">
<div class="col-7">
{{-- <div class="mb-3">
<label for="add-deviceid" class="col-form-label">Device ID:</label>
<select id="add-deviceid" class="form-control" style="width:100%;">
@ -145,23 +123,11 @@
@endforeach
</select>
</div> --}}
<div class="mb-3">
<div class="mb-0">
<label for="add-vhcname" class="col-form-label">Vehicle Name:</label>
<input type="text" id="add-vhcname" class="form-control" placeholder="">
</div>
</div>
</div>
<div class="row mb-3">
{{-- <div class="col-6">
<div class="mb-3">
<label for="add-model" class="col-form-label">Model:</label>
<select id="add-model" class="form-control" style="width:100%;">
<option value="">Choose</option>
</select>
</div>
</div> --}}
<div class="col-6">
<div class="mb-3">
<div class="mb-0">
<label for="add-brand" class="col-form-label">Brand:</label>
<select id="add-brand" class="form-control" style="width:100%;">
<option value="">Choose</option>
@ -170,9 +136,7 @@
@endforeach
</select>
</div>
</div>
<div class="col-6">
<div class="mb-3">
<div class="mb-0">
<label for="add-type" class="col-form-label">Type:</label>
<select id="add-type" class="form-control" style="width:100%;">
<option value="">Choose</option>
@ -181,23 +145,11 @@
@endforeach
</select>
</div>
</div>
<div class="col-6">
<div class="mb-0">
<label for="add-speedlimit" class="col-form-label">Speed Limit (kph):</label>
<input type="number" id="add-speedlimit" class="form-control">
</div>
{{-- <div class="col-6">
<label for="add-fuelcapacity" class="col-form-label">Fuel Capacity (L):</label>
<input type="number" id="add-fuelcapacity" class="form-control">
</div>
<div class="col-6">
<label for="add-fueldroptreshold" class="col-form-label">Fuel Drop Treshold (L):</label>
<input type="number" id="add-fueldroptreshold" class="form-control">
</div>
<div class="col-6">
<label for="add-maxpressure" class="col-form-label">Maximum Pressure (Bar):</label>
<input type="number" id="add-maxpressure" class="form-control">
</div> --}}
</div>
</div>
{{-- Job Data --}}
@ -233,11 +185,11 @@
{{-- STNK Data --}}
<div class="mb-3">
<div class="border-bottom">
<h6>STNK Data</h6>
<h6>Certificate of Vehicle (CoV)</h6>
</div>
<div class="row">
<div class="col-6">
<label for="add-stnk-img" class="col-form-label">STNK Photo:</label>
<div class="col-5">
<label for="add-stnk-img" class="col-form-label">CoV Photo:</label>
<br>
<img id="add-stnk-img" class="img-fluid landscape-photo" src="https://cdn-2.tstatic.net/kaltim/foto/bank/images/ilustrasi-surat-tanda-nomor-kendaraan-bermotor-stnk.jpg" alt="add-stnk-img">
<div id="add-group_stnk_spinner" class="d-none">
@ -256,19 +208,25 @@
<span id="add-stnk-filesize"></span>
</div>
</div>
<div class="col-6">
<div class="mb-3">
<label for="add-stnk-exp" class="col-form-label">STNK Expired:</label>
<div class="col-7">
<div class="mb-2">
<label for="add-stnk-exp" class="col-form-label">CoV Expired Date</label>
<input type="text" id="add-stnk-exp" class="form-control" readonly>
</div>
<div class="mb-3">
<label for="add-nopol1" class="col-form-label">Plat Number:</label>
<input type="text" id="add-nopol1" class="form-control" placeholder="ex: B">
<label for="add-stnk-taxexp" class="col-form-label">Tax Expired Date</label>
<input type="string" id="add-stnk-taxexp" class="form-control" readonly>
</div>
<div class="mb-3">
<div class="mb-0">
<label for="add-nopol1" class="colr-form-label">License Plate Number</label>
<div class="row">
<div class="col">
<input type="text" id="add-nopol1" class="form-control" placeholder="ex: A-25-391">
</div>
<div class="col d-none">
<input type="number" id="add-nopol2" class="form-control" placeholder="ex: 3633">
</div>
<div class="mb-3">
<div class="col d-none">
<input type="text" id="add-nopol3" class="form-control" placeholder="ex: EEV">
</div>
</div>
@ -306,41 +264,10 @@
<label for="add-stnk-regisyear" class="col-form-label">Registration Year:</label>
<input type="number" id="add-stnk-regisyear" class="form-control">
</div>
{{-- <div class="col-6">
<label for="add-stnk-bpkbnumber" class="col-form-label">BPKB Number:</label>
<input type="string" id="add-stnk-bpkbnumber" class="form-control" placeholder="If not bpkp number, don't fill this">
</div> --}}
<div class="col-6">
<label for="add-stnk-taxexp" class="col-form-label">Tax Expired:</label>
<input type="string" id="add-stnk-taxexp" class="form-control" readonly>
</div>
<div class="col-6">
<label for="add-kirexp" class="col-form-label">Kir Expired:</label>
<input type="string" id="add-kirexp" class="form-control" readonly>
</div>
</div>
</div>
{{-- Other Data --}}
{{-- @if ($user_role != \App\Models\Users::ROLE_VENDOR)
<div class="mb-3">
<div class="border-bottom">
<h6>Other Data</h6>
</div>
<div class="row">
<div class="col-6">
<label for="add-vendor_id" class="col-form-label">Vendor:</label>
<select id="add-vendor_id" class="form-control" style="width:100%;">
<option value="">Vendor belum dipilih</option>
@foreach ($vendors as $vendor)
<option value="{{ $vendor->id }}">
{{ $vendor->first_name . ' (+' . $vendor->phone_code . implode(' ', str_split($vendor->phone, 4)) . ')' }}
</option>
@endforeach
</select>
</div>
</div>
</div>
@endif --}}
</form>
</div>
<div class="modal-footer">
@ -371,10 +298,10 @@
<h6>Vehicle Data</h6>
</div>
<div class="row mb-3">
<div class="col-6">
<div class="col-5">
<label for="edt-fvhc-img" class="col-form-label">Front Vehicle Photo:</label>
<br>
<img id="edt-fvhc-img" class="img-fluid landscape-photo" src="https://products.unitedtractors.com/wp-content/uploads/2021/03/udtruck-GWE370.png" alt="edt-fvhc-img">
<img id="edt-fvhc-img" class="img-fluid landscape-photo" style="max-height: 19.6vh" src="https://products.unitedtractors.com/wp-content/uploads/2021/03/udtruck-GWE370.png" alt="edt-fvhc-img">
<div id="edt-group_fvhc_spinner" class="d-none">
<div class="spinner-border" role="status">
<span class="visually-hidden">Loading...</span>
@ -391,7 +318,7 @@
<span id="edt-fvhc-filesize"></span>
</div>
</div>
<div class="col-6">
<div class="col-7">
<div class="mb-3 d-none">
<label for="edt-deviceid" class="col-form-label">Device ID:</label>
<select id="edt-deviceid" class="form-control" style="width:100%;">
@ -401,23 +328,11 @@
@endforeach
</select>
</div>
<div class="mb-3">
<div class="mb-0">
<label for="edt-vhcname" class="col-form-label">Vehicle Name:</label>
<input type="text" id="edt-vhcname" class="form-control" placeholder="">
</div>
</div>
</div>
<div class="row mb-3">
{{-- <div class="col-6">
<div class="mb-3">
<label for="edt-model" class="col-form-label">Model:</label>
<select id="edt-model" class="form-control" style="width:100%;">
<option value="">Choose</option>
</select>
</div>
</div> --}}
<div class="col-6">
<div class="mb-3">
<div class="mb-0">
<label for="edt-brand" class="col-form-label">Brand:</label>
<select id="edt-brand" class="form-control" style="width:100%;">
<option value="">Choose</option>
@ -426,9 +341,7 @@
@endforeach
</select>
</div>
</div>
<div class="col-6">
<div class="mb-3">
<div class="mb-0">
<label for="edt-type" class="col-form-label">Type:</label>
<select id="edt-type" class="form-control" style="width:100%;">
<option value="">Choose</option>
@ -437,24 +350,11 @@
@endforeach
</select>
</div>
</div>
<div class="col-6">
<div class="mb-0">
<label for="edt-speedlimit" class="col-form-label">Speed Limit (kph):</label>
<input type="number" id="edt-speedlimit" class="form-control">
</div>
{{-- <div class="col-6">
<label for="edt-fuelcapacity" class="col-form-label">Fuel Capacity (L):</label>
<input type="number" id="edt-fuelcapacity" class="form-control">
</div>
<div class="col-6">
<label for="edt-fueldroptreshold" class="col-form-label">Fuel Drop Treshold
(L):</label>
<input type="number" id="edt-fueldroptreshold" class="form-control">
</div>
<div class="col-6">
<label for="edt-maxpressure" class="col-form-label">Maximum Pressure (Bar):</label>
<input type="number" id="edt-maxpressure" class="form-control">
</div> --}}
</div>
</div>
{{-- Job Data --}}
@ -490,10 +390,10 @@
{{-- STNK Data --}}
<div class="mb-3">
<div class="border-bottom">
<h6>STNK Data</h6>
<h6>Certificate of Vehicle (CoV)</h6>
</div>
<div class="row">
<div class="col-6">
<div class="col-5">
<label for="edt-stnk-img" class="col-form-label">STNK Photo:</label>
<br>
<img id="edt-stnk-img" class="img-fluid landscape-photo" src="https://cdn-2.tstatic.net/kaltim/foto/bank/images/ilustrasi-surat-tanda-nomor-kendaraan-bermotor-stnk.jpg" alt="edt-stnk-img">
@ -513,19 +413,25 @@
<span id="edt-stnk-filesize"></span>
</div>
</div>
<div class="col-6">
<div class="mb-3">
<label for="edt-stnk-exp" class="col-form-label">STNK Expired:</label>
<div class="col-7">
<div class="mb-2">
<label for="add-stnk-exp" class="col-form-label">CoV Expired Date</label>
<input type="text" id="edt-stnk-exp" class="form-control" readonly>
</div>
<div class="mb-3">
<label for="edt-nopol1" class="col-form-label">Plat Number:</label>
<label for="edt-stnk-taxexp" class="col-form-label">Tax Expired:</label>
<input type="string" id="edt-stnk-taxexp" class="form-control" readonly>
</div>
<div class="mb-0">
<label for="add-nopol1" class="colr-form-label">License Plate Number</label>
<div class="row">
<div class="col">
<input type="text" id="edt-nopol1" class="form-control" placeholder="ex: B">
</div>
<div class="mb-3">
<div class="col d-none">
<input type="number" id="edt-nopol2" class="form-control" placeholder="ex: 3633">
</div>
<div class="mb-3">
<div class="col d-none">
<input type="text" id="edt-nopol3" class="form-control" placeholder="ex: EEV">
</div>
</div>
@ -563,17 +469,7 @@
<label for="edt-stnk-regisyear" class="col-form-label">Registration Year:</label>
<input type="number" id="edt-stnk-regisyear" class="form-control">
</div>
{{-- <div class="col-6">
<label for="edt-stnk-bpkbnumber" class="col-form-label">BPKB Number:</label>
<input type="string" id="edt-stnk-bpkbnumber" class="form-control" placeholder="If not bpkp number, don't fill this">
</div> --}}
<div class="col-6">
<label for="edt-stnk-taxexp" class="col-form-label">Tax Expired:</label>
<input type="string" id="edt-stnk-taxexp" class="form-control" readonly>
</div>
<div class="col-6">
<label for="edt-kirexp" class="col-form-label">Kir Expired:</label>
<input type="string" id="edt-kirexp" class="form-control" readonly>
</div>
</div>
</div>
@ -807,16 +703,16 @@
return (`${moment(data).format('DD MMM YYYY') || '-'}`);
},
},
{
data: 'kir_exp',
className: 'text-end text-nowrap',
visible: true,
orderable: true,
searchable: true,
render: function(data, type, row, meta) {
return (`${moment(data).format('DD MMM YYYY') || '-'}`);
},
},
// {
// data: 'kir_exp',
// className: 'text-end text-nowrap',
// visible: true,
// orderable: true,
// searchable: true,
// render: function(data, type, row, meta) {
// return (`${moment(data).format('DD MMM YYYY') || '-'}`);
// },
// },
{
data: 'crt',
className: 'text-end text-nowrap',
@ -1077,11 +973,11 @@
startDate: moment().add(1, 'days').toDate(),
endDate: moment().add(6, 'month').toDate(),
});
$('#add-kirexp').datepicker({
format: 'dd-mm-yyyy',
startDate: moment().add(1, 'days').toDate(),
endDate: moment().add(1, 'year').toDate(),
});
// $('#add-kirexp').datepicker({
// format: 'dd-mm-yyyy',
// startDate: moment().add(1, 'days').toDate(),
// endDate: moment().add(1, 'year').toDate(),
// });
// file
$('#add-fvhc-file').on('click', function() {
$('#add-fvhc-file').val('');
@ -1115,8 +1011,8 @@
data.stnk_base64 = $('#add-stnk-base64').val().replace(/^data:image\/(png|jpg|jpeg);base64,/, '');
data.stnk_exp = $('#add-stnk-exp').val().split('-').reverse().join('-');
data.nopol1 = $('#add-nopol1').val();
data.nopol2 = $('#add-nopol2').val();
data.nopol3 = $('#add-nopol3').val();
// data.nopol2 = $('#add-nopol2').val();
// data.nopol3 = $('#add-nopol3').val();
data.stnk_vyear = $('#add-stnk-vyear').val();
data.cc = $('#add-stnk-cc').val();
@ -1127,7 +1023,7 @@
data.tnkb_color = $('#add-stnk-tnkbcolor').val();
data.regis_year = $('#add-stnk-regisyear').val();
data.tax_exp = $('#add-stnk-taxexp').val().split('-').reverse().join('-');
data.kir_exp = $('#add-kirexp').val().split('-').reverse().join('-');
// data.kir_exp = $('#add-kirexp').val().split('-').reverse().join('-');
data.vendor_id = $('#add-vendor_id').val();
return data;
@ -1377,7 +1273,7 @@
data.tnkb_color = $('#edt-stnk-tnkbcolor').val();
data.regis_year = $('#edt-stnk-regisyear').val();
data.tax_exp = $('#edt-stnk-taxexp').val().split('-').reverse().join('-');
data.kir_exp = $('#edt-kirexp').val().split('-').reverse().join('-');
// data.kir_exp = $('#edt-kirexp').val().split('-').reverse().join('-');
data.vendor_id = $('#edt-vendor_id').val();
return data;