Merge pull request 'staging' (#148) from staging into master

Reviewed-on: ordo/adw-backend#148

app/Helpers/MasterFunctionsHelper.php

@@ -200,7 +200,8 @@ class MasterFunctionsHelper
 				->where('a.version_gantt_id', '=', $keyGantt['id'])
 				->max("a.planned_end"); // plan date overlapped with assign_material_to_activity's, it should be m_activity'
 			$maxDate = max(new \DateTime($plannedMaxDate), new \DateTime($actualMaxDate));
-			$end = $maxDate;
+			$end = new \DateTime($maxDate->format('Y-m-d') . ' Friday');
+			$end->modify('next Friday');
 			$interval = new \DateInterval('P7D');
 		}
 		$period = new \DatePeriod($begin, $interval, $end);
@@ -604,6 +605,12 @@ class MasterFunctionsHelper
 					->where('activity_id', '=', $keyActualM->activity_id)
 					->groupBy('activity_id')
 					->first();
+				if (!isset($sumVolActual)) {
+					$sumVolActual = (object) [
+						'activity_id' => $keyActualM->activity_id,
+						'ttl_qty_plan' => "0"
+					];
+				}
 				$sumReportActual = DB::table('report_activity_material')
 					->where('activity_id', $keyActualM->activity_id)
 					->sum('qty');
@@ -623,18 +630,29 @@ class MasterFunctionsHelper
 						->where('activity_id', '=', $keyActualM->activity_id)
 						->orderBy('status_activity', 'ASC')
 						->first();
-					$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+						if (!isset($checkStatusActivity)) {
+							$checkStatusActivity = (object) [
+								'activity_id' => $keyActualM->activity_id,
+								'status_activity' => 'open'
+							];
+						}
+						if ($sumVolActual->ttl_qty_plan == "0") {
+							$actual = 0;
+						} else {
+							$actual = $keyActualM->qty / $sumVolActual->ttl_qty_plan;
+						}
+					$dataTempReport[$w]['percentage'] = $actual * $keyActualM->bobot_planning;
 					// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
 					// if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
 					if ($checkStatusActivity->status_activity == 'done') {
 						$sumPercentageActual += $keyActualM->bobot_planning / $reportCount;
 						// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 					} else {
-						if ($keyActualM->qty / $sumVolActual->ttl_qty_plan >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) {
-							$sumPercentageActual += (($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning) * (95 / 100);
+						if ( $actual >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) {
+							$sumPercentageActual += ($actual * $keyActualM->bobot_planning) * (95 / 100);
 							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 						} else {
-							$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+							$sumPercentageActual += $actual * $keyActualM->bobot_planning;
 							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 						}
 					}

app/Models/AssignMaterial.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
 use App\Models\RequestMaterial;
 use App\Models\Activity;
+use App\Models\ReportActivityMaterial;
 
 class AssignMaterial extends Model
 {
@@ -35,6 +36,7 @@ class AssignMaterial extends Model
 		});
 
 		static::deleted(function($data) {
+			$reportActivities = ReportActivityMaterial::where('assign_material_id', $data->id)->delete();
 			$activity = Activity::where('id', $data->activity_id)->first();
 			$activity->rencana_biaya -= floatval($data->budget) * floatval($data->qty_planning);
 			$activity->save();

app/Models/UserToProyek.php

@@ -14,6 +14,6 @@ class UserToProyek extends Model
     protected $fillable = [
         'user_id', 'proyek_id', 'rbs', 'project_role', 'group_r', 'max_used', 'standart_rate',
         'uom_standart_rate', 'overtime_rate', 'uom_overtime_rate', 'cost_per_used', 'accrue_at',
-        'base_calender', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'base_calender', 'is_customer', 'created_at', 'created_by', 'updated_at', 'updated_by'
     ];
 }