Browse Source

Merge pull request 'dev-msy' (#2) from dev-msy into staging

Reviewed-on: OSPRO/ADW-Backend#2
pull/3/head
yusuf 2 years ago
parent
commit
c54235b7ba
  1. 1
      .gitignore
  2. 14
      app/Http/Controllers/ActivityController.php
  3. 19
      app/Http/Controllers/AssignMaterialController.php
  4. 30
      app/Http/Controllers/DivisiController.php
  5. 7
      app/Http/Controllers/MaterialResourceController.php
  6. 385
      app/Http/Controllers/ReportActivityMaterialController.php
  7. 3
      app/Http/Controllers/RequestMaterialController.php
  8. 3
      app/Models/AssignMaterial.php
  9. 29
      app/Models/Divisi.php
  10. 41
      app/Models/ReportActivityMaterial.php
  11. 3
      app/Models/RequestMaterial.php

1
.gitignore vendored

@ -10,3 +10,4 @@ Homestead.yaml
api-testing.http api-testing.http
bootstrap/backup bootstrap/backup
.config-prod.json .config-prod.json
activity_log.txt

14
app/Http/Controllers/ActivityController.php

@ -325,8 +325,8 @@ class ActivityController extends Controller
} }
$data = Activity::find($id); $data = Activity::find($id);
$oldRencanaBiaya = (int)$data->rencana_biaya; $oldRencanaBiaya = $data->rencana_biaya;
$newRencanaBiaya = (int)$request->rencana_biaya; $newRencanaBiaya = str_replace(",",".",$request->rencana_biaya);
if($oldRencanaBiaya==$newRencanaBiaya){ if($oldRencanaBiaya==$newRencanaBiaya){
$updateBobot = false; $updateBobot = false;
}else{ }else{
@ -341,7 +341,6 @@ class ActivityController extends Controller
$dataUpdate['type_activity'] = $request->type; $dataUpdate['type_activity'] = $request->type;
} }
if($data){ if($data){
$upactual = false;
$result = $data->update($dataUpdate); $result = $data->update($dataUpdate);
if($result){ if($result){
if($parent && (int)$parent > 0){ if($parent && (int)$parent > 0){
@ -448,6 +447,7 @@ class ActivityController extends Controller
$data = Activity::find($id); $data = Activity::find($id);
if($data){ if($data){
$data->progress = (int)$data->persentase_progress/100; $data->progress = (int)$data->persentase_progress/100;
$data->rencana_biaya = str_replace(".", ",", $data->rencana_biaya);
$data->jobs_done = $this->sumVolumeActualMaterial($data->id); $data->jobs_done = $this->sumVolumeActualMaterial($data->id);
$data->assign_hr = $this->getUserActivity($data->id); $data->assign_hr = $this->getUserActivity($data->id);
$data->assign_tools = $this->getToolsActivity($data->id); $data->assign_tools = $this->getToolsActivity($data->id);
@ -475,14 +475,6 @@ class ActivityController extends Controller
} }
} }
private function calculateProgress($id)
{
$sumBobot = Activity::where("parent_id", $id)->sum("bobot_planning");
$dataActivity = Activity::find($id);
$restBobot = $dataActivity->bobot_planning - $sumBobot;
return $restBobot;
}
private function updatePersentaseProgress($id) private function updatePersentaseProgress($id)
{ {
$sumProgress = Activity::where("parent_id", $id)->sum("persentase_progress"); $sumProgress = Activity::where("parent_id", $id)->sum("persentase_progress");

19
app/Http/Controllers/AssignMaterialController.php

@ -99,7 +99,16 @@ class AssignMaterialController extends Controller
public function datatables(Request $request){ public function datatables(Request $request){
$id_activity = $request->query('idact'); $id_activity = $request->query('idact');
$data = AssignMaterial::select("assign_material_to_activity.*","m.description as material_name", "m.uom as uom")->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")->where('assign_material_to_activity.activity_id', $id_activity)->get(); $data = AssignMaterial::select(
"assign_material_to_activity.*","m.description as material_name", "m.uom as uom"
)
->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")
->where('assign_material_to_activity.activity_id', $id_activity)
->orderBy('plan_date', 'desc')
->get();
foreach($data as $d){
$d->budget = str_replace(".", ",", $d->budget);
}
return Datatables::of($data) return Datatables::of($data)
->addIndexColumn() ->addIndexColumn()
->addColumn('action', function($row){ ->addColumn('action', function($row){
@ -111,7 +120,13 @@ class AssignMaterialController extends Controller
public function datatablesForReportActivity(Request $request){ public function datatablesForReportActivity(Request $request){
$id_activity = $request->query('idact'); $id_activity = $request->query('idact');
$data = AssignMaterial::select(AssignMaterial::raw('SUM(qty_planning) as qty_planning'), "m.description as material_name", "assign_material_to_activity.activity_id as activity_id") $data =
AssignMaterial::select(
AssignMaterial::raw(
'SUM(qty_planning) as qty_planning'),
"m.description as material_name",
"assign_material_to_activity.activity_id as activity_id"
)
->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id") ->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")
->groupBy("m.description") ->groupBy("m.description")
->groupBy("assign_material_to_activity.activity_id") ->groupBy("assign_material_to_activity.activity_id")

30
app/Http/Controllers/DivisiController.php

@ -7,10 +7,20 @@ use App\Models\Divisi;
class DivisiController extends Controller class DivisiController extends Controller
{ {
private function getAllChildren($divisi, $depth = 0, $array = []) {
$array[$divisi->id] = $divisi->name;
foreach($divisi->children as $child){
$array = $this->getAllChildren($child, $depth + 1, $array);
}
return $array;
}
public function add(Request $request){ public function add(Request $request){
$this->validate($request, [ $this->validate($request, [
'name' => 'required', 'name' => 'required',
'description' => 'required' 'description' => 'string',
'parent' => 'integer'
]); ]);
$data = $request->all(); $data = $request->all();
@ -53,7 +63,6 @@ class DivisiController extends Controller
$delete = $data->delete(); $delete = $data->delete();
if(!$delete) if(!$delete)
return response()->json(['status'=>'failed','message'=> 'Delete failed!','code'=> 500], 500); return response()->json(['status'=>'failed','message'=> 'Delete failed!','code'=> 500], 500);
@ -64,6 +73,9 @@ class DivisiController extends Controller
{ {
$payload = $request->all(); $payload = $request->all();
if($payload['columns'][0]['value'] == "")
$this->list();
$dataBuilder = $this->setUpPayload($payload, 'm_divisi'); $dataBuilder = $this->setUpPayload($payload, 'm_divisi');
$builder = $dataBuilder['builder']; $builder = $dataBuilder['builder'];
$countBuilder = $dataBuilder['count']; $countBuilder = $dataBuilder['count'];
@ -75,12 +87,16 @@ class DivisiController extends Controller
public function list() public function list()
{ {
$data = Divisi::all(); $parentMenus = Divisi::whereNull('parent')->with('children')->get();
$countData = $data->count(); $divisions = [];
foreach($parentMenus as $menu){
if(!$data) $childs = $this->getAllChildren($menu);
$divisions = $divisions + $childs;
}
$countData = count($divisions);
if($countData == 0)
return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404); return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200); return response()->json(['status'=>'success','code'=>200,'data'=> $divisions, 'totalRecord'=> $countData], 200);
} }
} }

7
app/Http/Controllers/MaterialResourceController.php

@ -18,6 +18,7 @@ class MaterialResourceController extends Controller
]); ]);
$data = $request->all(); $data = $request->all();
$data['description'] = trim($data['description']);
$data['created_by'] = $this->currentName; $data['created_by'] = $this->currentName;
@ -59,8 +60,8 @@ class MaterialResourceController extends Controller
return response()->json(['status'=>'failed','message'=>'data material resource not found!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'data material resource not found!','code'=>400], 400);
die(); die();
} }
if($result){ if($result){
return response()->json(['status'=>'success','message'=>'data material resource successfully updated!','code'=>200], 200); return response()->json(['status'=>'success','message'=>'data material resource successfully updated!','code'=>200], 200);
}else{ }else{
@ -78,7 +79,7 @@ class MaterialResourceController extends Controller
return response()->json(['status'=>'failed','message'=>'data material resource not found!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'data material resource not found!','code'=>400], 400);
die(); die();
} }
if($delete){ if($delete){
return response()->json(['status'=>'success','message'=>'data material resource successfully deleted!','code'=>200], 200); return response()->json(['status'=>'success','message'=>'data material resource successfully deleted!','code'=>200], 200);

385
app/Http/Controllers/ReportActivityMaterialController.php

@ -2,7 +2,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\ReportActivityMaterial; use App\Models\ReportActivityMaterial;
use App\Models\Activity; use App\Models\Activity;
use App\Models\AssignMaterial; use App\Models\AssignMaterial;
@ -11,209 +11,182 @@ use Datatables;
class ReportActivityMaterialController extends Controller class ReportActivityMaterialController extends Controller
{ {
public function add(Request $request){ public function add(Request $request){
$this->validate($request, [ $this->validate($request, [
'activity_id' => 'required', 'activity_id' => 'required',
'qty' => 'required' 'qty' => 'required'
]); ]);
$valAssignMaterialId = AssignMaterial::where('activity_id', $request->activity_id)->first(); $data = $request->all();
$data['created_by'] = $this->currentName;
$data = $request->all(); $data['assign_material_id'] = AssignMaterial::where('activity_id', $request->activity_id)->pluck('id')->first();
$data['created_by'] = $this->currentName;
$data['assign_material_id'] = $valAssignMaterialId->id; if(!ReportActivityMaterial::create($data))
return response()->json(['status'=>'failed','message'=>'Input progress report activity failed created','code'=>400]);
$checkPrice = AssignMaterial::where("id", $valAssignMaterialId->id)->first();
$price = $checkPrice->budget; $this->countForProgress($request->activity_id);
return response()->json(['status'=>'success','message'=>'Input progress report activity created','code'=>200]);
$updateActivity = Activity::find($request->activity_id); }
if($updateActivity){
$costActualOld = $updateActivity->biaya_actual == null ? 0 : (int)$updateActivity->biaya_actual; public function updateStatusStartFinish(Request $request){
$costActualNew = $costActualOld + ($price*$request->qty);
$updateActivity->biaya_actual = $costActualNew; $payloadUpdate = array(
$updateActivity->save(); 'start_activity' => $request->start_activity,
$result = ReportActivityMaterial::create($data); 'finish_activity' => $request->finish_activity,
if($result){ 'status_activity' => $request->status_activity
$this->countForProgress($request->activity_id); );
return response()->json(['status'=>'success','message'=>'Input progress report activity created','code'=>200]); $updateData = AssignMaterial::where('activity_id',$request->activity_id)
}else{ ->update($payloadUpdate);
return response()->json(['status'=>'failed','message'=>'Input progress report activity failed created','code'=>400]); if($updateData){
} if($request->status_activity == 'done'){
}else{ $dataUpdate = array(
return response()->json(['status'=>'success','message'=>'Update cost actual failed','code'=>400]); "persentase_progress" => 100,
} "updated_by" => $this->currentName
} );
Activity::where('id', $request->activity_id)->update($dataUpdate);
public function updateStatusStartFinish(Request $request){ }
$payloadUpdate = array( return response()->json(['status'=>'success','message'=>'Update data status successfully ', 'code'=>200]);
'start_activity' => $request->start_activity, }
'finish_activity' => $request->finish_activity, else{
'status_activity' => $request->status_activity return response()->json(['status'=>'failed','message'=>'Update data status failed', 'code'=>400]);
); }
$updateData = AssignMaterial::where('activity_id',$request->activity_id) }
->update($payloadUpdate);
if($updateData){ public function delete($id)
if($request->status_activity == 'done'){ {
$dataUpdate = array( if(!ReportActivityMaterial::findOrFail($id)->delete())
"persentase_progress" => 100, return response()->json(['status'=>'failed','message'=>'Failed to deleted the data!','code'=> 500], 500);
"updated_by" => $this->currentName
); return response()->json(['status'=>'success','message'=> 'Data deleted!','code'=>200], 200);
Activity::where('id', $request->activity_id)->update($dataUpdate); }
}
private function countForProgress($id)
return response()->json(['status'=>'success','message'=>'Update data status successfully ', 'code'=>200]); {
}
else{ $dataActivity = Activity::find($id);
return response()->json(['status'=>'failed','message'=>'Update data status failed', 'code'=>400]); $dataPlan = AssignMaterial::where('activity_id', $id)->get();
} $tmpPercentage1 = [];
} if(!$dataPlan->isEmpty()){
public function delete($id) foreach ($dataPlan as $value) {
{ # code...
$data = ReportActivityMaterial::find($id); $price = $value->material_id;
$qty_plan = $value->qty_planning;
if($data){ $status_activity = $value->status_activity;
$delete = $data->delete();
}else{ $getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
return response()->json(['status'=>'failed','message'=>'data menu not found!','code'=>400], 400); $percentage1 = ($getDataVolActual * 100) / $qty_plan;
die();
} if($status_activity == 'done'){
$tmpPercentage1[] = $percentage1 > 100 ? 100 : $percentage1;
}else if($status_activity == 'on-progress'){
if($delete){ $tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
return response()->json(['status'=>'success','message'=>'data menu successfully deleted!','code'=>200], 200); }else{
}else{ $tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
return response()->json(['status'=>'failed','message'=>'data menu failed deleted!','code'=>400], 400); }
} }
} $totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1);
}else{
private function countForProgress($id) $totalPercentage = 0;
{ }
$dataActivity = Activity::find($id);
$dataPlan = AssignMaterial::where('activity_id', $id)->get();
$tmpPercentage1 = [];
if(!$dataPlan->isEmpty()){ $dataUpdate = array(
"persentase_progress" => $totalPercentage,
foreach ($dataPlan as $value) { "updated_by" => $this->currentName
# code... );
$price = $value->material_id; return $dataActivity->update($dataUpdate);
$qty_plan = $value->qty_planning; }
$status_activity = $value->status_activity;
public function countForProgressTest()
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty"); {
$percentage1 = ($getDataVolActual * 100) / $qty_plan; $dataPlan = AssignMaterial::where('activity_id', 807)->get();
$tmpPercentage1 = [];
if($status_activity == 'done'){
$tmpPercentage1[] = $percentage1 > 100 ? 100 : $percentage1; if(!$dataPlan->isEmpty()){
}else if($status_activity == 'on-progress'){ foreach ($dataPlan as $value) {
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1; # code...
}else{ $price = $value->material_id;
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1; $qty_plan = $value->qty_planning;
} $status_activity = $value->status_activity;
}
$totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1); $getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
}else{ $percentage1 = ($getDataVolActual * 100) / $qty_plan;
$totalPercentage = 0; $percentage1 = ($getDataVolActual * 100) / $qty_plan;
} if($status_activity == 'done'){
$tmpPercentage1[] = $percentage1 > 100 ? 100 : $percentage1;
}else if($status_activity == 'on-progress'){
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
}else{
$dataUpdate = array( $tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
"persentase_progress" => $totalPercentage, }
"updated_by" => $this->currentName
);
return $dataActivity->update($dataUpdate); }
} $totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1);
}else{
public function countForProgressTest() $totalPercentage = 0;
{ }
$dataPlan = AssignMaterial::where('activity_id', 807)->get();
$tmpPercentage1 = []; return response()->json(['status'=>'success','code'=>200,'data'=>$dataPlan, 'tmpPercentage1'=> $tmpPercentage1, 'totalPercentage'=> $totalPercentage], 200);
}
if(!$dataPlan->isEmpty()){
foreach ($dataPlan as $value) { public function search(Request $request)
# code... {
$price = $value->material_id; $payload = $request->all();
$qty_plan = $value->qty_planning; $dataBuilder = $this->setUpPayload($payload, 'report_activity_material');
$status_activity = $value->status_activity; $builder = $dataBuilder['builder'];
$countBuilder = $dataBuilder['count'];
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty"); $dataGet = $builder->get();
$percentage1 = ($getDataVolActual * 100) / $qty_plan; $totalRecord = $countBuilder->count();
$percentage1 = ($getDataVolActual * 100) / $qty_plan; return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
if($status_activity == 'done'){ }
$tmpPercentage1[] = $percentage1 > 100 ? 100 : $percentage1;
}else if($status_activity == 'on-progress'){ public function list()
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1; {
}else{ $data = ReportActivityMaterial::all();
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1; $countData = $data->count();
}
if($data){
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
} }else{
$totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1); return response()->json(['status'=>'failed','message'=>'failed get Repport Activity material, please try again later!','code'=>400], 400);
}else{ }
$totalPercentage = 0; }
}
public function datatables(Request $request){
return response()->json(['status'=>'success','code'=>200,'data'=>$dataPlan, 'tmpPercentage1'=> $tmpPercentage1, 'totalPercentage'=> $totalPercentage], 200); $id_activity = $request->query('idAct');
} $id_assign_material_id= $request->query('idAmi');
$type = $request->query('type');
public function search(Request $request) if($type == 'plan'){
{ $data = AssignMaterial::select("assign_material_to_activity.*","m.description as material_name", "m.uom as uom")
$payload = $request->all(); ->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")
$dataBuilder = $this->setUpPayload($payload, 'report_activity_material'); ->where('assign_material_to_activity.activity_id', $id_activity)
$builder = $dataBuilder['builder']; ->orderBy('assign_material_to_activity.id', 'asc')
$countBuilder = $dataBuilder['count']; ->get();
$dataGet = $builder->get(); return Datatables::of($data)
$totalRecord = $countBuilder->count(); ->addIndexColumn()
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200); ->addColumn('action', function($row){
} $actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn-ram-delete"><i class="fa fa-trash"></i></a>';
return $actionBtn;
public function list() })
{ ->rawColumns(['action'])->make(true);
$data = ReportActivityMaterial::all(); }else{
$countData = $data->count(); $data = ReportActivityMaterial::select("report_activity_material.*", "u.name as human_resource")
->join("m_users as u", "u.id", "=", "report_activity_material.user_id")
if($data){ ->where('report_activity_material.activity_id', $id_activity)
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200); ->orderBy('report_activity_material.report_date', 'asc')
}else{ ->get();
return response()->json(['status'=>'failed','message'=>'failed get Repport Activity material, please try again later!','code'=>400], 400); return Datatables::of($data)
} ->addIndexColumn()
} ->addColumn('action', function($row){
$actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn-ram-delete"><i class="fa fa-trash"></i></a>';
public function datatables(Request $request){ return $actionBtn;
$id_activity = $request->query('idAct'); })
$id_assign_material_id= $request->query('idAmi'); ->rawColumns(['action'])->make(true);
$type = $request->query('type'); }
if($type == 'plan'){ }
$data = AssignMaterial::select("assign_material_to_activity.*","m.description as material_name", "m.uom as uom")
->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")
->where('assign_material_to_activity.activity_id', $id_activity)
->orderBy('assign_material_to_activity.id', 'asc')
->get();
return Datatables::of($data)
->addIndexColumn()
->addColumn('action', function($row){
$actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn-ram-delete"><i class="fa fa-trash"></i></a>';
return $actionBtn;
})
->rawColumns(['action'])->make(true);
}else{
$data = ReportActivityMaterial::select("report_activity_material.*", "u.name as human_resource")
->join("m_users as u", "u.id", "=", "report_activity_material.user_id")
->where('report_activity_material.activity_id', $id_activity)
->orderBy('report_activity_material.report_date', 'asc')
->get();
return Datatables::of($data)
->addIndexColumn()
->addColumn('action', function($row){
$actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn-ram-delete"><i class="fa fa-trash"></i></a>';
return $actionBtn;
})
->rawColumns(['action'])->make(true);
}
}
} }

3
app/Http/Controllers/RequestMaterialController.php

@ -19,7 +19,8 @@ class RequestMaterialController extends Controller
]); ]);
$data = $request->all(); $data = $request->all();
$data['price'] = str_replace(",", ".", $data['price']);
$data['qty'] = str_replace(",", ".", $data['qty']);
$data['status'] = "fom"; $data['status'] = "fom";
$data['created_by'] = $this->currentName; $data['created_by'] = $this->currentName;

3
app/Models/AssignMaterial.php

@ -20,8 +20,7 @@ class AssignMaterial extends Model
protected $casts = [ protected $casts = [
'id' => 'integer', 'id' => 'integer',
'budget' => 'float', 'budget' => 'string',
'qty_planning' => 'float',
]; ];
public static function boot() { public static function boot() {

29
app/Models/Divisi.php

@ -12,11 +12,30 @@ class Divisi extends Model
const UPDATED_AT = 'updated_at'; const UPDATED_AT = 'updated_at';
protected $fillable = [ protected $fillable = [
'name', 'name',
'description', 'parent',
'created_at', 'description',
'created_by', 'created_at',
'updated_at', 'created_by',
'updated_at',
'updated_by' 'updated_by'
]; ];
public static function boot() {
parent::boot();
static::deleting(function($data) {
$data->children()->delete();
});
}
public function 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');
}
} }

41
app/Models/ReportActivityMaterial.php

@ -3,16 +3,43 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use App\Models\Activity;
use App\Models\AssignMaterial;
class ReportActivityMaterial extends Model class ReportActivityMaterial extends Model
{ {
protected $table = 'report_activity_material'; protected $table = 'report_activity_material';
const CREATED_AT = 'created_at'; const CREATED_AT = 'created_at';
const UPDATED_AT = 'updated_at'; const UPDATED_AT = 'updated_at';
protected $fillable = [ protected $fillable = [
'activity_id', 'user_id', 'qty', 'lat', 'lon','assign_material_id', 'activity_id', 'user_id', 'qty', 'lat', 'lon','assign_material_id',
'report_date', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by' 'report_date', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by'
]; ];
public static function boot() {
parent::boot();
static::created(function($data) {
$activity = Activity::find($data->activity_id);
$assignedMaterial = AssignMaterial::find($data->assign_material_id);
$activity->biaya_actual += floatval($assignedMaterial->budget) * floatval($data->qty);
$activity->save();
});
static::deleted(function($data) {
$activity = Activity::find($data->activity_id);
$assignedMaterial = AssignMaterial::find($data->assign_material_id);
$activity->biaya_actual -= floatval($assignedMaterial->budget) * floatval($data->qty);
$activity->save();
});
}
} }

3
app/Models/RequestMaterial.php

@ -13,8 +13,7 @@ class RequestMaterial extends Model
protected $casts = [ protected $casts = [
'id' => 'integer', 'id' => 'integer',
'price' => 'float', 'price' => 'string',
'qty' => 'float',
]; ];
protected $fillable = [ protected $fillable = [

Loading…
Cancel
Save