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

Reviewed-on: OSPRO/ADW-Backend#3

.gitignore

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

app/Http/Controllers/ActivityController.php

@@ -325,8 +325,8 @@ class ActivityController extends Controller
         }
 
         $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){
             $updateBobot = false;
         }else{
@@ -341,7 +341,6 @@ class ActivityController extends Controller
             $dataUpdate['type_activity'] = $request->type;
         }
         if($data){
-            $upactual = false;
             $result = $data->update($dataUpdate);
             if($result){
                 if($parent && (int)$parent > 0){
@@ -448,6 +447,7 @@ class ActivityController extends Controller
         $data = Activity::find($id);
         if($data){
             $data->progress = (int)$data->persentase_progress/100;
+			$data->rencana_biaya = str_replace(".", ",", $data->rencana_biaya);
             $data->jobs_done = $this->sumVolumeActualMaterial($data->id);
             $data->assign_hr = $this->getUserActivity($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)
     {
         $sumProgress = Activity::where("parent_id", $id)->sum("persentase_progress");

app/Http/Controllers/AssignMaterialController.php

@@ -99,7 +99,16 @@ class AssignMaterialController extends Controller
 
 	public function datatables(Request $request){
 		$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)
 			->addIndexColumn()
 			->addColumn('action', function($row){
@@ -111,7 +120,13 @@ class AssignMaterialController extends Controller
 
 	public function datatablesForReportActivity(Request $request){
 		$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")
 			->groupBy("m.description")
 			->groupBy("assign_material_to_activity.activity_id")

app/Http/Controllers/DivisiController.php

@@ -7,10 +7,20 @@ use App\Models\Divisi;
 
 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){
 		$this->validate($request, [
 			'name'          => 'required',
-			'description'   => 'required'
+			'description'   => 'string',
+			'parent'   => 'integer'
 		]);
 
 		$data = $request->all();
@@ -53,7 +63,6 @@ class DivisiController extends Controller
 
 		$delete = $data->delete();
 
-
 		if(!$delete)
 			return response()->json(['status'=>'failed','message'=> 'Delete failed!','code'=> 500], 500);
 
@@ -64,6 +73,9 @@ class DivisiController extends Controller
 	{
 		$payload = $request->all();
 
+		if($payload['columns'][0]['value'] == "")
+			$this->list();
+
 		$dataBuilder = $this->setUpPayload($payload, 'm_divisi');
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
@@ -75,12 +87,16 @@ class DivisiController extends Controller
 
 	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'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
+		return response()->json(['status'=>'success','code'=>200,'data'=> $divisions, 'totalRecord'=> $countData], 200);
 	}
 }

app/Http/Controllers/MaterialResourceController.php

@@ -18,6 +18,7 @@ class MaterialResourceController extends Controller
         ]);
 
         $data = $request->all();
+		$data['description'] = trim($data['description']);
 
         $data['created_by'] = $this->currentName;
 

app/Http/Controllers/ReportActivityMaterialController.php

@@ -17,31 +17,15 @@ class ReportActivityMaterialController extends Controller
 			'qty'                   => 'required'
 		]);
 
-        $valAssignMaterialId = AssignMaterial::where('activity_id', $request->activity_id)->first();
-
 		$data = $request->all();
 		$data['created_by'] = $this->currentName;
-        $data['assign_material_id'] = $valAssignMaterialId->id;
+		$data['assign_material_id'] = AssignMaterial::where('activity_id', $request->activity_id)->pluck('id')->first();
-
+
-        $checkPrice = AssignMaterial::where("id", $valAssignMaterialId->id)->first(); 
+		if(!ReportActivityMaterial::create($data))
-        $price = $checkPrice->budget; 
+			return response()->json(['status'=>'failed','message'=>'Input progress report activity failed created','code'=>400]);
-
+
-        $updateActivity = Activity::find($request->activity_id);
-            if($updateActivity){
-                $costActualOld = $updateActivity->biaya_actual == null ? 0 : (int)$updateActivity->biaya_actual;
-                $costActualNew = $costActualOld + ($price*$request->qty);
-                $updateActivity->biaya_actual = $costActualNew;
-                $updateActivity->save(); 
-                $result = ReportActivityMaterial::create($data);
-                    if($result){
 		$this->countForProgress($request->activity_id);
 		return response()->json(['status'=>'success','message'=>'Input progress report activity created','code'=>200]);
-                    }else{
-                        return response()->json(['status'=>'failed','message'=>'Input progress report activity failed created','code'=>400]);
-                    }
-            }else{
-                return response()->json(['status'=>'success','message'=>'Update cost actual failed','code'=>400]);
-            }        
 	}
 
 	public function updateStatusStartFinish(Request $request){
@@ -71,21 +55,10 @@ class ReportActivityMaterialController extends Controller
 
 	public function delete($id)
 	{
-        $data = ReportActivityMaterial::find($id);
+		if(!ReportActivityMaterial::findOrFail($id)->delete())
-
+			return response()->json(['status'=>'failed','message'=>'Failed to deleted the data!','code'=> 500], 500);
-        if($data){
-            $delete = $data->delete();
-        }else{
-            return response()->json(['status'=>'failed','message'=>'data menu not found!','code'=>400], 400);
-            die();
-        }
-        
 
-        if($delete){
+		return response()->json(['status'=>'success','message'=> 'Data deleted!','code'=>200], 200);
-            return response()->json(['status'=>'success','message'=>'data menu successfully deleted!','code'=>200], 200);
-        }else{
-            return response()->json(['status'=>'failed','message'=>'data menu failed deleted!','code'=>400], 400);
-        }
 	}
 
 	private function countForProgress($id)

app/Http/Controllers/RequestMaterialController.php

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

app/Models/AssignMaterial.php

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

app/Models/Divisi.php

@@ -13,10 +13,29 @@ class Divisi extends Model
 
     protected $fillable = [
         'name',
+		'parent',
         'description',
         'created_at',
         'created_by',
         'updated_at',
         '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');
+	}
 }

app/Models/ReportActivityMaterial.php

@@ -3,6 +3,8 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use App\Models\Activity;
+use App\Models\AssignMaterial;
 
 class ReportActivityMaterial extends Model
 {
@@ -15,4 +17,29 @@ class ReportActivityMaterial extends Model
 		'activity_id', 'user_id', 'qty', 'lat', 'lon','assign_material_id',
 		'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();
+
+		});
+
+	}
 }

app/Models/RequestMaterial.php

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