From 14d75efdc52d7fc672c36715e1a0ba1ebbdd8bbb Mon Sep 17 00:00:00 2001 From: farhantock Date: Wed, 27 Dec 2023 19:06:09 +0700 Subject: [PATCH] remove company_id ospro general --- app/Http/Controllers/CompanyController.php | 110 ---------- app/Http/Controllers/Controller.php | 1 - .../Controllers/MenuCompanyController.php | 195 ------------------ app/Models/Company.php | 37 ---- app/Models/HumanResource.php | 1 - app/Models/MenuCompany.php | 27 --- app/Models/ProjectRole.php | 2 +- app/Models/Role.php | 2 +- app/Models/RoleMenu.php | 2 +- app/Models/Satuan.php | 2 +- 10 files changed, 4 insertions(+), 375 deletions(-) delete mode 100644 app/Http/Controllers/CompanyController.php delete mode 100644 app/Http/Controllers/MenuCompanyController.php delete mode 100644 app/Models/Company.php delete mode 100644 app/Models/MenuCompany.php diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php deleted file mode 100644 index 7e8938d..0000000 --- a/app/Http/Controllers/CompanyController.php +++ /dev/null @@ -1,110 +0,0 @@ -validate($request, [ - 'name' => 'required', - 'description' => 'required' - ]); - - $data = $request->all(); - - $data['created_by'] = $this->currentName; - - $result = Company::create($data); - - if ($result) { - return response()->json(['status' => 'success', 'message' => 'add Company successfully!', 'code' => 200], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'add data Company failed!', 'code' => 400], 400); - } - } - - public function edit($id) - { - if (!$id || (int) $id < 0 || $id == "") { - return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400); - die(); - } - - $result = Company::find($id); - - if ($result) { - return response()->json(['status' => 'success', 'code' => 200, 'data' => $result], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'failed get data Company, please try again later!', 'code' => 400], 400); - } - } - - public function update(Request $request, $id) - { - if (!$id || (int) $id < 0 || $id == "") { - return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400); - } - - $data = Company::find($id); - - if ($data) { - $result = $data->update($request->all()); - } else { - return response()->json(['status' => 'failed', 'message' => 'data Company not found!', 'code' => 400], 400); - die(); - } - - - if ($result) { - return response()->json(['status' => 'success', 'message' => 'data Company successfully updated!', 'code' => 200], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'data Company failed updated!', 'code' => 400], 400); - } - } - - public function delete($id) - { - $data = Company::find($id); - - if ($data) { - $delete = $data->delete(); - } else { - return response()->json(['status' => 'failed', 'message' => 'data Company not found!', 'code' => 400], 400); - die(); - } - - - if ($delete) { - return response()->json(['status' => 'success', 'message' => 'data Company successfully deleted!', 'code' => 200], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'data Company failed deleted!', 'code' => 400], 400); - } - } - - public function search(Request $request) - { - $payload = $request->all(); - $dataBuilder = $this->setUpPayload($payload, 'm_company'); - $builder = $dataBuilder['builder']; - $countBuilder = $dataBuilder['count']; - $dataGet = $builder->get(); - $totalRecord = $countBuilder->count(); - return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200); - } - - public function list() - { - $data = Company::all(); - $countData = $data->count(); - - if ($data) { - return response()->json(['status' => 'success', 'code' => 200, 'data' => $data, 'totalRecord' => $countData], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'failed get list Company, please try again later!', 'code' => 400], 400); - } - } -} diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 50966ce..a084601 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -33,7 +33,6 @@ class Controller extends BaseController $this->currentDate = date("Y-m-d H:i:s"); $this->currentName = auth()->user() ? auth()->user()->name : "system"; $this->currentId = auth()->user() ? auth()->user()->id : 0; - $this->companyId = auth()->user() ? auth()->user()->company_id : 0; $this->pathImage = config('assets.image'); $this->pathDocument = config('assets.project'); $this->pathActivityDocument = config('assets.activity'); diff --git a/app/Http/Controllers/MenuCompanyController.php b/app/Http/Controllers/MenuCompanyController.php deleted file mode 100644 index 2b79748..0000000 --- a/app/Http/Controllers/MenuCompanyController.php +++ /dev/null @@ -1,195 +0,0 @@ -validate($request, [ - // 'icon' => 'required', - // 'name' => 'string|required', - // 'url' => 'required|unique:m_company_menu,url', - // 'sequence' => 'required|integer', - // ]); - - // $data = $request->all(); - - // $data['created_by'] = $this->currentName; - - // $result = MenuCompany::create($data); - - // if ($result) { - // return response()->json(['status' => 'success', 'message' => 'add data menu successfully!', 'code' => 200], 200); - // } else { - // return response()->json(['status' => 'failed', 'message' => 'add data menu failed!', 'code' => 400], 400); - // } - // } - - public function addMultiple(Request $request) - { - $menus = $request->all(); - - if (is_array($menus) && count($menus) > 0) { - $countRes = 0; - foreach ($menus as $menu) { - - $dataInsert = array( - "menu_id" => $menu['menu_id'], - "parent_menu_id" => $menu['parent_id'], - "company_id" => $menu['company_id'], - "icon" => $menu['icon'], - "alias_name" => $menu['alias_name'], - "url" => $menu['url'], - "sequence" => $menu['sequence'], - "created_by" => $this->currentName - ); - - $result = MenuCompany::create($dataInsert); - - if ($result) { - $countRes++; - } else { - $countRes--; - } - } - - if ($countRes > 0) { - return response()->json(['status' => 'success', 'message' => 'add data menu successfully!', 'code' => 200]); - } else { - return response()->json(['status' => 'failed', 'message' => 'add data menu failed created!', 'code' => 400]); - } - } else { - return response()->json(['status' => 'failed', 'message' => 'add data menu failed created!', 'code' => 400]); - } - } - - - public function edit($id) - { - if (!$id || (int) $id < 0 || $id == "") { - return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400); - die(); - } - - $result = MenuCompany::find($id); - - if ($result) { - return response()->json(['status' => 'success', 'code' => 200, 'data' => $result], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'failed get data menu, please try again later!', 'code' => 400], 400); - } - } - - public function update(Request $request, $id) - { - if (!$id || (int) $id < 0 || $id == "") { - return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400); - } - $this->validate($request, [ - 'icon' => 'required', - 'sequence' => 'required|integer', - ]); - $data = MenuCompany::find($id); - - - if ($data) { - $result = $data->update($request->all()); - } else { - return response()->json(['status' => 'failed', 'message' => 'data menu not found!', 'code' => 400], 400); - die(); - } - - - if ($result) { - return response()->json(['status' => 'success', 'message' => 'data menu successfully updated!', 'code' => 200], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'data menu failed updated!', 'code' => 400], 400); - } - } - - public function delete($id) - { - $data = MenuCompany::find($id); - - if ($data) { - $delete = $data->delete(); - } else { - return response()->json(['status' => 'failed', 'message' => 'data menu not found!', 'code' => 400], 400); - die(); - } - - - if ($delete) { - return response()->json(['status' => 'success', 'message' => 'data menu successfully deleted!', 'code' => 200], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'data menu failed deleted!', 'code' => 400], 400); - } - } - - public function search(Request $request) - { - $payload = $request->all(); - $dataBuilder = $this->setUpPayload($payload, 'm_company_menu'); - $builder = $dataBuilder['builder']; - $countBuilder = $dataBuilder['count']; - $dataGet = $builder->get(); - $totalRecord = $countBuilder->count(); - return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200); - } - - public function listMenu($id) - { - $dataParent = RoleMenu::select("m_company_menu.*") - ->join('m_company_menu', 'm_company_menu.id', '=', 't_roles_menu.menu_id') - ->join('m_roles', 'm_roles.id', '=', 't_roles_menu.role_id') - ->whereNull('m_company_menu.parent_id') - ->where('m_roles.id', $id) - ->orderBy('m_company_menu.sequence', 'ASC') - ->get(); - - $finalData = []; - foreach ($dataParent as $data) { - $data->children = $this->getChildrenMenu($data->id, $id); - $finalData[] = $data; - } - - return response()->json(['status' => 'success', 'code' => 200, 'data' => $finalData], 200); - } - - protected function getChildrenMenu($id, $role_id) - { - $dataChildren = RoleMenu::select("m_company_menu.*") - ->join('m_company_menu', 'm_company_menu.id', '=', 't_roles_menu.menu_id') - ->join('m_roles', 'm_roles.id', '=', 't_roles_menu.role_id') - ->where('m_roles.id', $role_id) - ->where('m_company_menu.parent_id', $id) - ->orderBy('m_company_menu.sequence', 'ASC') - ->get(); - $children = []; - if ($dataChildren) { - foreach ($dataChildren as $data) { - $data->children = $this->getChildrenMenu($data->id, $role_id); - $children[] = $data; - } - } - return $children; - } - - public function list() - { - $data = MenuCompany::all(); - $countData = $data->count(); - - if ($data) { - return response()->json(['status' => 'success', 'code' => 200, 'data' => $data, 'totalRecord' => $countData], 200); - } else { - return response()->json(['status' => 'failed', 'message' => 'failed get list menu, please try again later!', 'code' => 400], 400); - } - } -} diff --git a/app/Models/Company.php b/app/Models/Company.php deleted file mode 100644 index db52f7d..0000000 --- a/app/Models/Company.php +++ /dev/null @@ -1,37 +0,0 @@ -