diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 1c7f352..586a47e 100755 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -13,6 +13,7 @@ use App\Models\Users; use Illuminate\Support\Facades\Auth; use Illuminate\Http\JsonResponse; use Illuminate\Validation\ValidationException; +use App\Models\UserLogs; class LoginController extends Controller { @@ -143,6 +144,7 @@ class LoginController extends Controller // return $req->wantsJson() // ? new JsonResponse([], 204) // : redirect(route('view_dashboard')); + UserLogs::insert(Auth::user()->id, "User login"); if ($req->wantsJson()) { return new JsonResponse([], 204); @@ -173,7 +175,9 @@ class LoginController extends Controller public function logout(Request $req) { $user = Auth::user(); - if ($user->role == Users::ROLE_ADMIN) { + UserLogs::insert(Auth::user()->id, "User logout"); + + if ($user->role == Users::ROLE_ADMIN) { $this->guard()->logout(); $req->session()->invalidate(); $req->session()->regenerateToken(); diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 4619582..1953239 100755 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -12,6 +12,8 @@ use App\Responses; use App\Helper; use App\Models\Clients; use App\Models\Users; +use App\Models\UserLogs; +use Auth; class ClientController extends Controller { @@ -25,6 +27,7 @@ class ClientController extends Controller $data = [ "disc_types" => Clients::select2DiscountTypes(), ]; + UserLogs::insert(Auth::user()->id, "Access Company menu"); return view("menu_v1.clients", $data); } @@ -250,6 +253,7 @@ class ClientController extends Controller $apiResp = Responses::created("success add new client"); DB::commit(); + UserLogs::insert(Auth::user()->id, "Add new company: ".$req->cname); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { Storage::disk("public")->delete($url_clogo); @@ -481,6 +485,7 @@ class ClientController extends Controller DB::commit(); $apiResp = Responses::success("success update client"); + UserLogs::insert(Auth::user()->id, "Edit company: ".$req->cname); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { Storage::disk("public")->delete($url_clogo); @@ -541,6 +546,7 @@ class ClientController extends Controller DB::commit(); $apiResp = Responses::success("success delete client"); + UserLogs::insert(Auth::user()->id, "Delete company: ".$client[0]->c_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/ConfDistributionController.php b/app/Http/Controllers/ConfDistributionController.php index ffdfd81..bd3ddb3 100644 --- a/app/Http/Controllers/ConfDistributionController.php +++ b/app/Http/Controllers/ConfDistributionController.php @@ -15,6 +15,8 @@ use App\Helper; use App\Models\ConfRates; use App\Models\ConfTruckTypes; use App\Models\Vehicles; +use App\Models\UserLogs; +use Auth; class ConfDistributionController extends Controller { @@ -26,6 +28,7 @@ class ConfDistributionController extends Controller { $data = []; + UserLogs::insert(Auth::user()->id, "Access Distribution Category menu"); return view("menu_v1.configs.distribution_category", $data); } @@ -99,6 +102,7 @@ class ConfDistributionController extends Controller $apiResp = Responses::created("success " . ($tipe == "new" ? "add new" : "edit") . " distribution category"); DB::commit(); + UserLogs::insert(Auth::user()->id, "".($tipe == "new" ? "Add new" : "Edit")." distribution category: ".$req->dc_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -200,6 +204,7 @@ class ConfDistributionController extends Controller DB::commit(); $apiResp = Responses::success("success delete vehicle type"); + UserLogs::insert(Auth::user()->id, "Delete distribution category: ".$dtl[0]->dc_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/ConfPoolController.php b/app/Http/Controllers/ConfPoolController.php index 4c317c0..c83a7d3 100644 --- a/app/Http/Controllers/ConfPoolController.php +++ b/app/Http/Controllers/ConfPoolController.php @@ -15,6 +15,8 @@ use App\Helper; use App\Models\ConfRates; use App\Models\ConfTruckTypes; use App\Models\Vehicles; +use App\Models\UserLogs; +use Auth; class ConfPoolController extends Controller { @@ -26,6 +28,7 @@ class ConfPoolController extends Controller { $data = []; + UserLogs::insert(Auth::user()->id, "Access Pool menu"); return view("menu_v1.configs.pool", $data); } @@ -99,6 +102,7 @@ class ConfPoolController extends Controller $apiResp = Responses::created("success " . ($tipe == "new" ? "add new" : "edit") . " distribution category"); DB::commit(); + UserLogs::insert(Auth::user()->id, ($tipe == "new" ? "Add new" : "Edit")." pool: ".$req->pool_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -200,6 +204,7 @@ class ConfPoolController extends Controller DB::commit(); $apiResp = Responses::success("success delete vehicle type"); + UserLogs::insert(Auth::user()->id, "Delete pool: ".$dtl[0]->pool_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/ConfTruckTypeController.php b/app/Http/Controllers/ConfTruckTypeController.php index fc075d1..47d98c8 100755 --- a/app/Http/Controllers/ConfTruckTypeController.php +++ b/app/Http/Controllers/ConfTruckTypeController.php @@ -15,6 +15,8 @@ use App\Helper; use App\Models\ConfRates; use App\Models\ConfTruckTypes; use App\Models\Vehicles; +use App\Models\UserLogs; +use Auth; class ConfTruckTypeController extends Controller { @@ -26,6 +28,7 @@ class ConfTruckTypeController extends Controller { $data = []; + UserLogs::insert(Auth::user()->id, "Access Vehicle Type menu"); return view("menu_v1.configs.truck_types", $data); } @@ -163,6 +166,7 @@ class ConfTruckTypeController extends Controller $apiResp = Responses::created("success add new vehicle type"); DB::commit(); + UserLogs::insert(Auth::user()->id, "Add new vehicle type: ".$req->type_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -256,6 +260,7 @@ class ConfTruckTypeController extends Controller $apiResp = Responses::created("success update vehicle type"); DB::commit(); + UserLogs::insert(Auth::user()->id, "Edit vehicle type: ".$req->type_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -310,6 +315,7 @@ class ConfTruckTypeController extends Controller DB::commit(); $apiResp = Responses::success("success delete vehicle type"); + UserLogs::insert(Auth::user()->id, "Delete vehicle type: ".$truckType[0]->name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/DevicesController.php b/app/Http/Controllers/DevicesController.php index 108d9a9..21acdeb 100755 --- a/app/Http/Controllers/DevicesController.php +++ b/app/Http/Controllers/DevicesController.php @@ -11,6 +11,8 @@ use App\Responses; use App\Helper; use App\Models\Devices; use App\Models\Vehicles; +use App\Models\UserLogs; +use Auth; class DevicesController extends Controller { @@ -20,6 +22,7 @@ class DevicesController extends Controller $data = [ "vhcs" => $vhcs, ]; + UserLogs::insert(Auth::user()->id, "Access Device menu"); return view("menu_v1.configs.devices", $data); } @@ -202,6 +205,7 @@ class DevicesController extends Controller $apiResp = Responses::created("success add new device"); DB::commit(); + UserLogs::insert(Auth::user()->id, "Add new device : ".$device_id); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -354,6 +358,7 @@ class DevicesController extends Controller $apiResp = Responses::created("success update device"); DB::commit(); + UserLogs::insert(Auth::user()->id, "Edit device : ".$device_id); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -403,6 +408,7 @@ class DevicesController extends Controller DB::commit(); $apiResp = Responses::success("success delete device"); + UserLogs::insert(Auth::user()->id, "Delete device : ".$device[0]->device_id); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/DriversController.php b/app/Http/Controllers/DriversController.php index 5c053e8..aee32e0 100755 --- a/app/Http/Controllers/DriversController.php +++ b/app/Http/Controllers/DriversController.php @@ -16,6 +16,7 @@ use App\Models\Drivers; use App\Models\DriversDetail; use App\Models\Users; use App\Models\DrvPhoneDevices; +use App\Models\UserLogs; class DriversController extends Controller { @@ -252,6 +253,7 @@ class DriversController extends Controller $apiResp = Responses::created("success add new driver"); DB::commit(); + UserLogs::insert(Auth::user()->id, "Add new driver : ".$req->fullname); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { Storage::disk("public")->delete($url_ktp); @@ -451,6 +453,7 @@ class DriversController extends Controller DB::commit(); $apiResp = Responses::success("success update driver"); + UserLogs::insert(Auth::user()->id, "Edit driver : ".$req->fullname); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { Storage::disk("public")->delete($url_ktp); @@ -501,6 +504,7 @@ class DriversController extends Controller DB::commit(); $apiResp = Responses::success("success delete driver"); + UserLogs::insert(Auth::user()->id, "Delete driver : ".$driver[0]->fullname); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/MenuController.php b/app/Http/Controllers/MenuController.php index 8862cf2..650f26b 100755 --- a/app/Http/Controllers/MenuController.php +++ b/app/Http/Controllers/MenuController.php @@ -30,12 +30,16 @@ use App\Models\Finance; use App\Models\OrdersCheckpoints; use App\Models\OrdersInvoices; use App\Models\OrdersDriversUploads; +use App\Models\UserLogs; +use Auth; class MenuController extends Controller { public function view_dashboard(Request $req) { - $data = [ + UserLogs::insert($req->auth->uid, "Access Dashboard menu"); + + $data = [ "client_group" => Clients::getClientById($req->auth->client_group_id), ]; @@ -45,12 +49,15 @@ class MenuController extends Controller $data["client_group"] = null; } + return view("menu_v1.dashboard", $data); } public function view_drivers(Request $req) { - $data = [ + UserLogs::insert($req->auth->uid, "Access Driver menu"); + + $data = [ "bloods" => Helper::listBloods(), "relationships" => Drivers::listRelationships(), "vendors" => Users::listUsersByRole(Users::ROLE_VENDOR), @@ -61,6 +68,8 @@ class MenuController extends Controller public function view_vehicles(Request $req) { + UserLogs::insert($req->auth->uid, "Access Vehicle menu"); + $listPool = DB::select("SELECT * FROM t_conf_pool WHERE dlt IS NULL ORDER BY pool_code ASC"); $listDistribution = DB::select("SELECT * FROM t_conf_distribution_category WHERE dlt IS NULL ORDER BY dc_code ASC"); @@ -89,6 +98,8 @@ class MenuController extends Controller public function view_transactions() { + UserLogs::insert(Auth::user()->id, "Access Transactions menu"); + $data = [ "availOrdToMerge" => Finance::availOrdToMerge(), ]; @@ -174,6 +185,9 @@ class MenuController extends Controller } public function view_transactions_view(Request $req) { + UserLogs::insert($req->auth->uid, "Access Transactions ".$req->code); + + $codes = explode(",", $req->code); $limit = count($codes); if ($limit > 2) { @@ -335,6 +349,8 @@ class MenuController extends Controller public function view_logs_gps() { + UserLogs::insert(Auth::user()->id, "Access Logs GPS menu"); + return view("menu_v1.configs.index_logs_gps"); } diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 989d4b6..f768cfd 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -18,6 +18,7 @@ use Maatwebsite\Excel\Concerns\WithStyles; use Maatwebsite\Excel\Concerns\WithCustomStartCell; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; use Carbon\Carbon; +use App\Models\UserLogs; class ReportsController extends Controller { @@ -30,6 +31,7 @@ class ReportsController extends Controller 'listNopol' => $listNopol, ]; + UserLogs::insert(Auth::user()->id, "Access Vehicle Trips Report menu"); return view('menu_v1.reports.vehicle_trips', $data); } public function api_report_vehicle_trips_list(Request $req) @@ -298,6 +300,7 @@ class ReportsController extends Controller 'listNopol' => $listNopol, ]; + UserLogs::insert(Auth::user()->id, "Access Abnormalities Report menu"); return view('menu_v1.reports.abnormalities', $data); } public function api_report_abnormalities_list(Request $req) diff --git a/app/Http/Controllers/RolesController.php b/app/Http/Controllers/RolesController.php index 7bf5821..6c09b04 100755 --- a/app/Http/Controllers/RolesController.php +++ b/app/Http/Controllers/RolesController.php @@ -15,6 +15,8 @@ use App\Models\Vehicles; use App\Models\Banks; use App\Models\UsersMenuPermissions; use Spatie\Permission\PermissionRegistrar; +use Illuminate\Support\Facades\Auth; +use App\Models\UserLogs; class RolesController extends Controller { @@ -34,6 +36,8 @@ class RolesController extends Controller }), ]; + UserLogs::insert(Auth::user()->id, "Access Role menu"); + return view("menu_v1.roles", $data); } @@ -118,6 +122,9 @@ class RolesController extends Controller app()[PermissionRegistrar::class]->forgetCachedPermissions(); $apiResp = Responses::created("success add new role"); + + UserLogs::insert(Auth::user()->id, "Add new role : ".$req->name); + return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -156,6 +163,7 @@ class RolesController extends Controller app()[PermissionRegistrar::class]->forgetCachedPermissions(); $apiResp = Responses::created("success update role"); + UserLogs::insert(Auth::user()->id, "Edit role : ".$req->name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -198,6 +206,7 @@ class RolesController extends Controller app()[PermissionRegistrar::class]->forgetCachedPermissions(); $apiResp = Responses::created("success delete role"); + UserLogs::insert(Auth::user()->id, "Delete role : ".$role[0]->name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 85e3e6a..6806a37 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -15,6 +15,8 @@ use App\Models\Clients; use App\Models\Vehicles; use App\Models\Banks; use App\Models\UsersMenuPermissions; +use Illuminate\Support\Facades\Auth; +use App\Models\UserLogs; class UsersController extends Controller { @@ -50,6 +52,8 @@ class UsersController extends Controller $data["clients"] = Clients::select2Client($req->auth->client_group_id); } + UserLogs::insert(Auth::user()->id, "Access User menu"); + return view("menu_v1.users", $data); } @@ -328,6 +332,9 @@ class UsersController extends Controller $apiResp = Responses::created("success add new user"); DB::commit(); + + UserLogs::insert(Auth::user()->id, "Add new user : ".$req->email); + return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -529,7 +536,10 @@ class UsersController extends Controller $apiResp = Responses::created("success update user"); DB::commit(); - return new Response($apiResp, $apiResp["meta"]["code"]); + + UserLogs::insert(Auth::user()->id, "Edit user : ".$req->email); + + return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); $apiResp = Responses::error($e->getMessage()); @@ -710,6 +720,9 @@ class UsersController extends Controller $apiResp = Responses::created("success delete user"); DB::commit(); + + UserLogs::insert(Auth::user()->id, "Delete user : ".$getUser[0]->email); + return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); @@ -776,4 +789,38 @@ class UsersController extends Controller return new Response($apiResp, $apiResp["meta"]["code"]); } } + + public function view_user_logs(Request $req) + { + $id = $req->id; + + $user = Users::getUserById($id)[0]; + $data = [ + 'user' => $user + ]; + // dd($dtl); + return view('menu_v1._userLogs', $data); + } + public function api_user_logs(Request $req) + { + try { + $id = $req->id; + $tgl0 = $req->tgl0; + $tgl1 = $req->tgl1; + + $d = [$id, $tgl0, $tgl1]; + $list = DB::select("SELECT * FROM t_user_log + WHERE userId = ? AND crt BETWEEN ? AND ? + order by crt desc + ", $d); + + $apiResp = Responses::success("success user logs"); + $apiResp["data"] = $list; + return new Response($apiResp, $apiResp["meta"]["code"]); + } catch (\Exception $e) { + DB::rollBack(); + $apiResp = Responses::error($e->getMessage()); + return new Response($apiResp, $apiResp["meta"]["code"]); + } + } } diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php index f1c5924..c1f5299 100755 --- a/app/Http/Controllers/VehiclesController.php +++ b/app/Http/Controllers/VehiclesController.php @@ -15,6 +15,7 @@ use App\Models\Vehicles; use App\Models\Devices; use App\Models\VehiclesDetail; use App\Models\Users; +use App\Models\UserLogs; class VehiclesController extends Controller { @@ -330,7 +331,10 @@ class VehiclesController extends Controller $apiResp = Responses::created("success add new vehicle"); DB::commit(); - return new Response($apiResp, $apiResp["meta"]["code"]); + + UserLogs::insert(Auth::user()->id, "Add new vehicle : ".$req->vhc_name); + + return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { Storage::disk("public")->delete($url_fvhc); Storage::disk("public")->delete($url_stnk); @@ -589,6 +593,7 @@ class VehiclesController extends Controller DB::commit(); $apiResp = Responses::success("success update vehicle"); + UserLogs::insert(Auth::user()->id, "Edit vehicle : ".$req->vhc_name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { Storage::disk("public")->delete($url_fvhc); @@ -646,6 +651,7 @@ class VehiclesController extends Controller DB::commit(); $apiResp = Responses::success("success delete vehicle"); + UserLogs::insert(Auth::user()->id, "Delete vehicle : ".$vehicle[0]->name); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/ZoneController.php b/app/Http/Controllers/ZoneController.php index 1c30915..0a00344 100755 --- a/app/Http/Controllers/ZoneController.php +++ b/app/Http/Controllers/ZoneController.php @@ -17,6 +17,8 @@ use App\Models\Orders; use App\Models\OrdersDrops; // use App\Models\OrdersPckDrop; use App\Models\OrdersAItems; +use App\Models\UserLogs; + class ZoneController extends Controller { @@ -25,8 +27,9 @@ class ZoneController extends Controller * * @return \Illuminate\Http\Response */ - public function view_zone() + public function view_zone(Request $req) { + UserLogs::insert($req->auth->uid, "Access Zone"); return view("menu_v1.zone"); } @@ -355,6 +358,8 @@ class ZoneController extends Controller $apiResp = Responses::created("success add new zone"); + UserLogs::insert($req->auth->uid, "Add Zone ".$req->zone_name); + DB::commit(); return new Response($apiResp, $apiResp["meta"]["code"]); } catch (\Exception $e) { @@ -481,7 +486,9 @@ class ZoneController extends Controller Zone::updateZone($zid, $updtZone); - DB::commit(); + UserLogs::insert($req->auth->uid, "Update Zone ".$req->zone_name); + + DB::commit(); $apiResp = Responses::success("success update zone"); return new Response($apiResp, $apiResp["meta"]["code"]); @@ -523,6 +530,8 @@ class ZoneController extends Controller "dlt" => $now, "dlt_by" => $req->auth->uid, ]); + + UserLogs::insert($req->auth->uid, "Delete Zone ".$zone[0]->name); DB::commit(); diff --git a/app/Models/UserLogs.php b/app/Models/UserLogs.php new file mode 100644 index 0000000..efffb18 --- /dev/null +++ b/app/Models/UserLogs.php @@ -0,0 +1,20 @@ + + #map { + height: 100%; + margin: 0; + } + .my-leaflet-map-container img { + max-height: none; + } + .dtl-text{ + font-size: 11px; + } + .head-text{ + font-size: 12px !important; + } + /* .leaflet-overlay-pane svg { + transform: none !important; + } */ + .leaflet-routing-container { + display: none !important; + } + + #viewPdf { + display: flex; + justify-content: center; + width: 794px; + /* height: auto; */ + max-width: 100%; /* Ensures it is responsive */ + } + /* .modal-dialog{ + width: 794px; + } */ + + + + +