Browse Source

calc update

pull/3/head
Muhammad Sulaiman Yusuf 2 years ago
parent
commit
10eea70645
  1. 18
      activity_log.txt
  2. 47
      app/Http/Controllers/RequestMaterialController.php
  3. 2
      app/Models/AssignMaterial.php

18
activity_log.txt

@ -1,10 +1,20 @@
2022-07-11 20:20:30: Project Plan
Added: (10000 * 5), Cost plan old: 0 | 50000_
2022-07-12 00:13:26: 1379 Penentuan harga project
Added: (10000000 * 1), Cost plan old: 0 | +10000000
Data type (double * double), double | double
Data type origin (double * NULL), string | double
------
2022-07-11 20:21:26: Project Plan
Deleted: (10000 * 5), Cost plan old: 50000 | -0_
2022-07-12 00:13:32: 1378 Contract Management
Deleted: (10000000 * 1), Cost plan old: 20000000 | -10000000
Data type (double * double), double | double
Data type origin (double * double), string | double
------
2022-07-12 00:13:38: 1377 Brainstorming peningkatan layanan masyarakat
Deleted: (10000000 * 1), Cost plan old: 20000000 | -10000000
Data type (double * double), double | double
Data type origin (double * double), string | double
------
2022-07-12 00:13:47: 1379 Penentuan harga project
Deleted: (10000000 * 1), Cost plan old: 10000000 | -0
Data type (double * double), double | double
Data type origin (double * double), string | double
------

47
app/Http/Controllers/RequestMaterialController.php

@ -9,7 +9,6 @@ use App\Models\MaterialResource;
class RequestMaterialController extends Controller
{
public function add(Request $request){
$this->validate($request, [
'proyek_id' => 'required',
'description' => 'required',
@ -26,51 +25,36 @@ class RequestMaterialController extends Controller
$result = RequestMaterial::create($data);
if($result){
return response()->json(['status'=>'success','message'=>'request material successfully!', 'data'=>$result, 'code'=>200], 200);
}else{
return response()->json(['status'=>'failed','message'=>'request material failed!','code'=>400], 400);
}
if(!$result)
return response()->json(['status'=>'failed','message'=>'Failed to add!','code'=> 500], 500);
return response()->json(['status'=>'success','message'=>'Data added!', 'data'=>$result, 'code'=>200], 200);
}
public function edit($id){
if(!$id || (int) $id < 0 || $id==""){
if(empty($id) || !is_int((int)$id))
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
die();
}
$result = RequestMaterial::find($id);
if($result){
if($result)
return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
}else{
return response()->json(['status'=>'failed','message'=>'failed get data request material, please try again later!','code'=>400], 400);
}
}
return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
}
public function delete($id)
{
$data = RequestMaterial::find($id);
if($data){
if($data)
$delete = $data->delete();
}else{
return response()->json(['status'=>'failed','message'=>'data request material not found!','code'=>400], 400);
die();
}
return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
if($delete)
return response()->json(['status'=>'success','message'=>'Data deleted!','code'=>200], 200);
if($delete){
return response()->json(['status'=>'success','message'=>'request material successfully deleted!','code'=>200], 200);
}else{
return response()->json(['status'=>'failed','message'=>'request material failed deleted!','code'=>400], 400);
}
return response()->json(['status'=>'failed','message'=>'Failed to delete!','code'=> 500], 500);
}
public function search(Request $request)
@ -89,12 +73,11 @@ class RequestMaterialController extends Controller
$data = RequestMaterial::all();
$countData = $data->count();
if($data){
if($data)
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
}else{
return response()->json(['status'=>'failed','message'=>'failed get list request material, please try again later!','code'=>400], 400);
}
}
public function update(Request $request, $id)
{

2
app/Models/AssignMaterial.php

@ -35,7 +35,7 @@ class AssignMaterial extends Model
$activity->save();
$msg = Carbon::now()->toDateTimeString() . ": ".$activity->id." ".$activity->name.PHP_EOL;
$msg .= "Added: ".$material->desc." (".floatval($material->price)." * ".floatval($data->qty_planning)."), Cost plan old: ".$old." | +".$activity->rencana_biayaPHP_EOL;
$msg .= "Added: ".$material->desc." (".floatval($material->price)." * ".floatval($data->qty_planning)."), Cost plan old: ".$old." | +".$activity->rencana_biaya.PHP_EOL;
$msg .= "Data type (".gettype(floatval($material->price))." * ".gettype(floatval($material->qty_planning))."), ".gettype(floatval($old))." | ".gettype(floatval($activity->rencana_biaya)).PHP_EOL;
$msg .= "Data type origin (".gettype($material->price)." * ".gettype($material->qty_planning)."), ".gettype($old)." | ".gettype($activity->rencana_biaya).PHP_EOL;
$msg .= "------".PHP_EOL;

Loading…
Cancel
Save