Browse Source

adding company_id

pull/1/head
wahyun 10 months ago
parent
commit
3cac7e2363
  1. 5
      app/Http/Controllers/HumanResourceController.php
  2. 5
      app/Http/Controllers/ProjectController.php
  3. 3
      app/Http/Controllers/ProjectRoleController.php
  4. 3
      app/Http/Controllers/RoleController.php

5
app/Http/Controllers/HumanResourceController.php

@ -16,7 +16,8 @@ class HumanResourceController extends Controller
'role_id' => 'required',
'name' => 'required',
'ktp_number' => 'required|numeric|unique:m_users,ktp_number',
'employee_type' => 'required'
'employee_type' => 'required',
'company_id' => 'required'
]);
$data = $request->all();
@ -118,7 +119,7 @@ class HumanResourceController extends Controller
public function list()
{
$data = HumanResource::select('id', 'name', 'role_id')->get();
$data = HumanResource::select('id', 'name', 'role_id','company_id')->get();
$countData = $data->count();
if ($data) {

5
app/Http/Controllers/ProjectController.php

@ -53,7 +53,8 @@ class ProjectController extends Controller
'mulai_proyek' => 'required',
'akhir_proyek' => 'required',
'rencana_biaya' => 'required',
'type_proyek_id' => 'required'
'type_proyek_id' => 'required',
'company_id' => 'required'
]);
$data = $request->all();
@ -83,7 +84,7 @@ class ProjectController extends Controller
$result = Project::query()
->from('m_proyek AS mp')
->where('mp.id', $id)
->selectRaw('value_proyek,scoupe_of_work,kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,rencana_biaya,biaya_actual,company,pm_id,type_proyek_id,divisi_id,persentase_progress,keterangan,durasi_proyek,progress_by_worklog,currency_symbol,late_consequence,assumtion,currency_code,currency_name,project_objectives,considered_success_when,potential_risk,testing_environment,budget_health,phase_id,calculation_status');
->selectRaw('value_proyek,mp.company_id,scoupe_of_work,kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,rencana_biaya,biaya_actual,company,pm_id,type_proyek_id,divisi_id,persentase_progress,keterangan,durasi_proyek,progress_by_worklog,currency_symbol,late_consequence,assumtion,currency_code,currency_name,project_objectives,considered_success_when,potential_risk,testing_environment,budget_health,phase_id,calculation_status');
if (!is_null($result->first()['divisi_id'])) {
$result->leftJoin('m_divisi', 'mp.divisi_id', '=', 'm_divisi.id')

3
app/Http/Controllers/ProjectRoleController.php

@ -11,7 +11,8 @@ class ProjectRoleController extends Controller
{
$this->validate($request, [
'name' => 'required',
'description' => 'required'
'description' => 'required',
'company_id' => 'required'
]);
$data = $request->all();

3
app/Http/Controllers/RoleController.php

@ -12,7 +12,8 @@ class RoleController extends Controller
{
$this->validate($request, [
'name' => 'string|required|unique:m_roles,name,NULL,id,company_id,' . $request->input('company_id'),
'description' => 'required'
'description' => 'required',
'company_id' => 'required'
]);
$data = $request->all();

Loading…
Cancel
Save