|
|
@ -61,15 +61,10 @@ class ReportActivityMaterial extends Model |
|
|
|
$activity->biaya_actual -= floatval($assignedMaterial->budget) * floatval($data->qty); |
|
|
|
$activity->biaya_actual -= floatval($assignedMaterial->budget) * floatval($data->qty); |
|
|
|
|
|
|
|
|
|
|
|
$dataPlan = AssignMaterial::where('activity_id', $activity->id)->get(); |
|
|
|
$dataPlan = AssignMaterial::where('activity_id', $activity->id)->get(); |
|
|
|
if($dataPlan[0]->status_activity == 'done'){ |
|
|
|
|
|
|
|
$activity->persentase_progress = 100; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
$totalPlan = $dataPlan->sum('qty_planning'); |
|
|
|
$totalPlan = $dataPlan->sum('qty_planning'); |
|
|
|
$totalVolumeActual = ReportActivityMaterial::where('activity_id', '=', $activity->id)->sum("qty"); |
|
|
|
$totalVolumeActual = ReportActivityMaterial::where('activity_id', '=', $activity->id)->sum("qty"); |
|
|
|
$percentage = ($totalVolumeActual * 100) / $totalPlan; |
|
|
|
$percentage = ($totalVolumeActual * 100) / $totalPlan; |
|
|
|
$activity->persentase_progress = $percentage >= config('app.max_percentage_not_done') ? config('app.max_percentage_not_done') : $percentage; |
|
|
|
$activity->persentase_progress = $percentage >= config('app.max_percentage_not_done') ? config('app.max_percentage_not_done') : $percentage; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$activity->save(); |
|
|
|
$activity->save(); |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|