diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php new file mode 100644 index 0000000..d71519b --- /dev/null +++ b/app/Http/Controllers/CompanyController.php @@ -0,0 +1,85 @@ +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'); @@ -36,41 +40,41 @@ class Controller extends BaseController protected function setUpPayload($condition, $tableSelf) { $alias = "selfTable"; - $builder = DB::table($tableSelf." AS ".$alias); + $builder = DB::table($tableSelf . " AS " . $alias); // $builder = $builder->select($alias.".*"); - if($condition){ - if(isset($condition['select'])){ - foreach($condition['select'] as $select){ - $builder = $builder->addSelect($alias.".".$select); + if ($condition) { + if (isset($condition['select'])) { + foreach ($condition['select'] as $select) { + $builder = $builder->addSelect($alias . "." . $select); } - }else{ - $builder = $builder->addSelect($alias.".*"); + } else { + $builder = $builder->addSelect($alias . ".*"); } - if(isset($condition['joins'])){ + if (isset($condition['joins'])) { $selectColumn = []; $no = 0; - foreach($condition['joins'] as $join){ + foreach ($condition['joins'] as $join) { $tableJoin = isset($join['name1']) ? $join['name1'] : $alias; $tableName = $join['name']; $columnJoin = $join['column_join']; // foreign key table sini $columnSelf = isset($join['column_self']) ? $join['column_self'] : "id"; // primary key table lawan $columnResult = $join['column_results']; - foreach($columnResult as $sColumn){ - $builder = $builder->addSelect($tableName.".".$sColumn." as join_".$this->listJoinAll[$no]."_".$sColumn); + foreach ($columnResult as $sColumn) { + $builder = $builder->addSelect($tableName . "." . $sColumn . " as join_" . $this->listJoinAll[$no] . "_" . $sColumn); } - $builder = $builder->leftJoin($tableName, $tableJoin.".".$columnJoin, '=', $tableName.'.'.$columnSelf); + $builder = $builder->leftJoin($tableName, $tableJoin . "." . $columnJoin, '=', $tableName . '.' . $columnSelf); $no++; } } - if(isset($condition['columns'])){ + if (isset($condition['columns'])) { $listWhere = $condition['columns']; - $builder = $builder->where(function ($query) use($listWhere, $alias){ - foreach($listWhere as $where){ + $builder = $builder->where(function ($query) use ($listWhere, $alias) { + foreach ($listWhere as $where) { $value = $where['value']; - if($value && $value!="" && $value!=" "){ + if ($value && $value != "" && $value != " ") { $column = $where['name']; $operator = strtolower($where['logic_operator']); // like, =, <>, range $value2 = isset($where['value1']) ? $where['value1'] : ""; @@ -81,22 +85,22 @@ class Controller extends BaseController }); } - if(isset($condition['group_column'])){ + if (isset($condition['group_column'])) { $builder = $this->groupWhere($builder, $condition['group_column'], $alias); } $data['count'] = clone $builder; - if(isset($condition['paging'])){ + if (isset($condition['paging'])) { $builder = $builder->offset($condition['paging']['start'])->limit($condition['paging']['length']); } - if(isset($condition['orders'])){ + if (isset($condition['orders'])) { $orders = $condition['orders']; $sortBy = $orders['ascending'] ? "ASC" : "DESC"; $columnOrder = $orders['columns']; - foreach($columnOrder as $column){ - $builder = $builder->orderBy($alias.".".$column, $sortBy); + foreach ($columnOrder as $column) { + $builder = $builder->orderBy($alias . "." . $column, $sortBy); } } } @@ -111,8 +115,8 @@ class Controller extends BaseController $operator = $listGroupWhere['operator']; $operatorGroup = $listGroupWhere['group_operator']; $listWhere = $listGroupWhere['where']; - if(strtolower($operator)=="and"){ - $builder = $builder->where(function($query) use($operatorGroup, $listWhere, $alias){ + if (strtolower($operator) == "and") { + $builder = $builder->where(function ($query) use ($operatorGroup, $listWhere, $alias) { $no = 1; foreach ($listWhere as $where) { $value = $where['value']; @@ -120,22 +124,22 @@ class Controller extends BaseController $operator = strtolower($where['logic_operator']); $value2 = isset($where['value1']) ? $where['value1'] : ""; $tableColumn = isset($where['table_name']) ? $where['table_name'] : $alias; - if($value && $value!="" && $value!=" "){ - if($operatorGroup=="and"){ + if ($value && $value != "" && $value != " ") { + if ($operatorGroup == "and") { $query = $this->whereCondition($query, $operator, $tableColumn, $column, $value, $value2); - }else{ - if($no==1){ + } else { + if ($no == 1) { $query = $this->whereCondition($query, $operator, $tableColumn, $column, $value, $value2); - }else{ + } else { $query = $this->orWhereCondition($query, $operator, $tableColumn, $column, $value, $value2); } } } - $no = $no+1; + $no = $no + 1; } }); - }else if(strtolower($operator)=="or"){ - $builder = $builder->orWhere(function($query) use($operatorGroup, $listWhere, $alias){ + } else if (strtolower($operator) == "or") { + $builder = $builder->orWhere(function ($query) use ($operatorGroup, $listWhere, $alias) { $no = 1; foreach ($listWhere as $where) { $value = $where['value']; @@ -143,13 +147,13 @@ class Controller extends BaseController $operator = strtolower($where['logic_operator']); $value2 = isset($where['value1']) ? $where['value1'] : ""; $tableColumn = isset($where['table_name']) ? $where['table_name'] : $alias; - if($value && $value!="" && $value!=" "){ - if($operatorGroup=="and"){ + if ($value && $value != "" && $value != " ") { + if ($operatorGroup == "and") { $query = $this->whereCondition($query, $operator, $tableColumn, $column, $value, $value2); - }else{ - if($no==1){ + } else { + if ($no == 1) { $query = $this->whereCondition($query, $operator, $tableColumn, $column, $value, $value2); - }else{ + } else { $query = $this->orWhereCondition($query, $operator, $tableColumn, $column, $value, $value2); } } @@ -164,39 +168,40 @@ class Controller extends BaseController private function whereCondition($oldQuery, $operator, $tableColumn, $column, $value, $value2) { $query = $oldQuery; - if($operator=="range"){ - $query = $query->whereBetween($tableColumn.".".$column, [$value, $value2]); - }else if($operator=="like"){ - $query = $query->where($tableColumn.".".$column, 'like', '%'.$value.'%'); - }else if($operator=="ilike"){ - $query = $query->where($tableColumn.".".$column, '~*', $value); - }else if($operator=="="){ - $query = $query->where($tableColumn.".".$column, $value); - }else if($operator=="in"){ - $query = $query->whereIn($tableColumn.".".$column, $value); - }else if($operator=="notin"){ - $query = $query->whereNotIn($tableColumn.".".$column, $value); - }else{ - $query = $query->where($tableColumn.".".$column, $operator, $value); + if ($operator == "range") { + $query = $query->whereBetween($tableColumn . "." . $column, [$value, $value2]); + } else if ($operator == "like") { + $query = $query->where($tableColumn . "." . $column, 'like', '%' . $value . '%'); + } else if ($operator == "ilike") { + $query = $query->where($tableColumn . "." . $column, '~*', $value); + } else if ($operator == "=") { + $query = $query->where($tableColumn . "." . $column, $value); + } else if ($operator == "in") { + $query = $query->whereIn($tableColumn . "." . $column, $value); + } else if ($operator == "notin") { + $query = $query->whereNotIn($tableColumn . "." . $column, $value); + } else { + $query = $query->where($tableColumn . "." . $column, $operator, $value); } return $query; } - private function whereConditionSingleTable($oldQuery, $operator, $column, $value, $value2){ + private function whereConditionSingleTable($oldQuery, $operator, $column, $value, $value2) + { $query = $oldQuery; - if($operator=="range"){ + if ($operator == "range") { $query = $query->whereBetween($column, [$value, $value2]); - }else if($operator=="like"){ - $query = $query->where($column, 'like', '%'.$value.'%'); - }else if($operator=="ilike"){ + } else if ($operator == "like") { + $query = $query->where($column, 'like', '%' . $value . '%'); + } else if ($operator == "ilike") { $query = $query->where($column, '~*', $value); - }else if($operator=="="){ + } else if ($operator == "=") { $query = $query->where($column, $value); - }else if($operator=="in"){ + } else if ($operator == "in") { $query = $query->whereIn($column, $value); - }else if($operator=="notin"){ + } else if ($operator == "notin") { $query = $query->whereNotIn($column, $value); - }else{ + } else { $query = $query->where($column, $operator, $value); } return $query; @@ -205,25 +210,26 @@ class Controller extends BaseController private function orWhereCondition($oldQuery, $operator, $tableColumn, $column, $value, $value2) { $query = $oldQuery; - if($operator=="range"){ - $query = $query->orWhereBetween($tableColumn.".".$column, [$value, $value2]); - }else if($operator=="like"){ - $query = $query->orWhere($tableColumn.".".$column, 'like', '%'.$value.'%'); - }else if($operator=="ilike"){ - $query = $query->where($tableColumn.".".$column, '~*', $value); - }else if($operator=="="){ - $query = $query->orWhere($tableColumn.".".$column, $value); - }else if($operator=="in"){ - $query = $query->orWhereIn($tableColumn.".".$column, $value); - }else if($operator=="notin"){ - $query = $query->orWhereNotIn($tableColumn.".".$column, $value); - }else{ - $query = $query->orWhere($tableColumn.".".$column, $operator, $value); + if ($operator == "range") { + $query = $query->orWhereBetween($tableColumn . "." . $column, [$value, $value2]); + } else if ($operator == "like") { + $query = $query->orWhere($tableColumn . "." . $column, 'like', '%' . $value . '%'); + } else if ($operator == "ilike") { + $query = $query->where($tableColumn . "." . $column, '~*', $value); + } else if ($operator == "=") { + $query = $query->orWhere($tableColumn . "." . $column, $value); + } else if ($operator == "in") { + $query = $query->orWhereIn($tableColumn . "." . $column, $value); + } else if ($operator == "notin") { + $query = $query->orWhereNotIn($tableColumn . "." . $column, $value); + } else { + $query = $query->orWhere($tableColumn . "." . $column, $operator, $value); } return $query; } - protected function calculateAllCost($activity_id, $proyek_id){ + protected function calculateAllCost($activity_id, $proyek_id) + { $humanCostPlanning = $this->calculateAllHumanCost($activity_id, $proyek_id); $materialCostPlanning = $this->calculateMaterialCost($activity_id, $proyek_id); $toolsCostPlanning = 0; @@ -234,11 +240,11 @@ class Controller extends BaseController private function calculateAllHumanCost($activity_id, $proyek_id) { - $dataHuman = UserToActivity::select("ahp.standart_rate as standart_rate","ahp.max_used as max_used", "ahp.cost_per_used as cost_per_used", "ahp.uom_standart_rate as uom_standart_rate") - ->leftJoin("assign_hr_to_proyek as ahp", "assign_hr_to_activity.user_id", "=", "ahp.user_id") - ->where("assign_hr_to_activity.activity_id", $activity_id)->where("assign_hr_to_activity.proyek_id", $proyek_id) - ->where("ahp.proyek_id", $proyek_id) - ->get(); + $dataHuman = UserToActivity::select("ahp.standart_rate as standart_rate", "ahp.max_used as max_used", "ahp.cost_per_used as cost_per_used", "ahp.uom_standart_rate as uom_standart_rate") + ->leftJoin("assign_hr_to_proyek as ahp", "assign_hr_to_activity.user_id", "=", "ahp.user_id") + ->where("assign_hr_to_activity.activity_id", $activity_id)->where("assign_hr_to_activity.proyek_id", $proyek_id) + ->where("ahp.proyek_id", $proyek_id) + ->get(); $totalCost = 0; foreach ($dataHuman as $human) { @@ -253,58 +259,61 @@ class Controller extends BaseController $activity = Activity::find($activity_id); $duration = $activity->duration; $standarRate = $human->standart_rate; - $maxUsed = $human->max_used/100; + $maxUsed = $human->max_used / 100; if ($human->uom_standart_rate == "Hour") { - $totalCost = ($standarRate*8*$duration)*$maxUsed; - return $totalCost; + $totalCost = ($standarRate * 8 * $duration) * $maxUsed; + return $totalCost; } - $totalCost = ($standarRate*$duration)*$maxUsed; + $totalCost = ($standarRate * $duration) * $maxUsed; return $totalCost; } private function calculateMaterialCost($activity_id, $proyek_id) { - $totalCost = AssignMaterial::selectRaw("COALESCE(qty_planning,0)*COALESCE(budget,0) as totalCost") - ->where("proyek_id", $proyek_id) - ->where("activity_id", $activity_id) - ->sum(AssignMaterial::raw("COALESCE(qty_planning, 0) * COALESCE(budget, 0)")); + $totalCost = AssignMaterial::selectRaw("COALESCE(qty_planning,0)*COALESCE(budget,0) as totalCost") + ->where("proyek_id", $proyek_id) + ->where("activity_id", $activity_id) + ->sum(AssignMaterial::raw("COALESCE(qty_planning, 0) * COALESCE(budget, 0)")); return $totalCost; } - protected function getLoc($lat, $lng){ + protected function getLoc($lat, $lng) + { // $response = Http::get(config('api.nominatim') . "/reverse?lat=".$lat."&lon=".$lng."&format=json"); // return $response->json; - $url = config('api.nominatim') . "/reverse?lat=".$lat."&lon=".$lng."&format=json"; - // $token = config('api.adw_token'); - $response = $this->curlRequest($url); + $url = config('api.nominatim') . "/reverse?lat=" . $lat . "&lon=" . $lng . "&format=json"; + // $token = config('api.adw_token'); + $response = $this->curlRequest($url); return $response; } - private function curlRequest($url){ - $ch = curl_init(); - // $headers = [ - // 'Authorization: '.$token - // ]; - curl_setopt($ch, CURLOPT_URL, $url); - // curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + private function curlRequest($url) + { + $ch = curl_init(); + // $headers = [ + // 'Authorization: '.$token + // ]; + curl_setopt($ch, CURLOPT_URL, $url); + // curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - $response = curl_exec($ch); - if ($response === false) - $response = curl_error($ch); - curl_close($ch); + $response = curl_exec($ch); + if ($response === false) + $response = curl_error($ch); + curl_close($ch); - return json_decode($response); - } + return json_decode($response); + } - protected function addDetailK3($dataDetail, $report_id){ + protected function addDetailK3($dataDetail, $report_id) + { foreach ($dataDetail as $value) { $dataNew = array( - "report_k3_id"=>$report_id, - "checklist_k3_id"=>$value['checklist_id'], - "name_checklist_k3"=>$value['checklist_name'], - "created_by"=>$this->currentName + "report_k3_id" => $report_id, + "checklist_k3_id" => $value['checklist_id'], + "name_checklist_k3" => $value['checklist_name'], + "created_by" => $this->currentName ); ReportK3Detail::create($dataNew); diff --git a/app/Models/Company.php b/app/Models/Company.php new file mode 100644 index 0000000..7b85e58 --- /dev/null +++ b/app/Models/Company.php @@ -0,0 +1,37 @@ +children()->delete(); }); } public function parent() { - return $this->belongsTo('App\Models\Divisi','parent')->where('parent', null)->with('parent'); + return $this->belongsTo('App\Models\Divisi', 'parent')->where('parent', null)->with('parent'); } public function children() { - return $this->hasMany('App\Models\Divisi','parent')->with('children'); + return $this->hasMany('App\Models\Divisi', 'parent')->with('children'); } } diff --git a/app/Models/Menu.php b/app/Models/Menu.php index a507545..951f6da 100644 --- a/app/Models/Menu.php +++ b/app/Models/Menu.php @@ -13,6 +13,6 @@ class Menu extends Model protected $fillable = [ 'parent_id', 'icon', 'name', 'alias_name', 'url', 'sequence', - 'created_at', 'created_by', 'updated_at', 'updated_by' + 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id' ]; } diff --git a/app/Models/ProjectPhase.php b/app/Models/ProjectPhase.php index 1a82a81..ffe1ed4 100644 --- a/app/Models/ProjectPhase.php +++ b/app/Models/ProjectPhase.php @@ -12,6 +12,6 @@ class ProjectPhase extends Model const UPDATED_AT = 'updated_at'; protected $fillable = [ - 'name', 'color', 'order', 'created_at', 'created_by', 'updated_at', 'updated_by' + 'name', 'color', 'order', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id' ]; } diff --git a/app/Models/ProjectRole.php b/app/Models/ProjectRole.php index 52a7b46..9d15c1a 100644 --- a/app/Models/ProjectRole.php +++ b/app/Models/ProjectRole.php @@ -12,6 +12,6 @@ class ProjectRole extends Model const UPDATED_AT = 'updated_at'; protected $fillable = [ - 'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by' + 'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id' ]; } diff --git a/app/Models/ProjectType.php b/app/Models/ProjectType.php index 9edca0e..f6e9604 100644 --- a/app/Models/ProjectType.php +++ b/app/Models/ProjectType.php @@ -12,6 +12,6 @@ class ProjectType extends Model const UPDATED_AT = 'updated_at'; protected $fillable = [ - 'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by' + 'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id' ]; } diff --git a/app/Models/Role.php b/app/Models/Role.php index 73de4a2..4fdc897 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -12,6 +12,6 @@ class Role extends Model const UPDATED_AT = 'updated_at'; protected $fillable = [ - 'name', 'description', 'default_page', 'created_at', 'created_by', 'updated_at', 'updated_by' + 'name', 'description', 'default_page', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id' ]; } diff --git a/app/Models/RoleMenu.php b/app/Models/RoleMenu.php index 3540ea6..2a59ede 100644 --- a/app/Models/RoleMenu.php +++ b/app/Models/RoleMenu.php @@ -12,6 +12,6 @@ class RoleMenu extends Model const UPDATED_AT = 'updated_at'; protected $fillable = [ - 'role_id', 'menu_id', 'created_at', 'created_by', 'updated_at', 'updated_by' + 'role_id', 'menu_id', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id', "create", "read", "update", "delete" ]; } diff --git a/app/Models/Satuan.php b/app/Models/Satuan.php index 05305af..9779db6 100644 --- a/app/Models/Satuan.php +++ b/app/Models/Satuan.php @@ -12,6 +12,6 @@ class Satuan extends Model const UPDATED_AT = 'updated_at'; protected $fillable = [ - 'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by' + 'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id' ]; }