ordo
/
surveyor_indonesia_backend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

implement 2 digits decimal on price related fields

pull/3/head
Muhammad Sulaiman Yusuf 2 years ago
parent
433710afe1
commit
a65ea51209
6 changed files with 196 additions and 223 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      app/Http/Controllers/ActivityController.php
  2. 11
      app/Http/Controllers/AssignMaterialController.php
  3. 385
      app/Http/Controllers/ReportActivityMaterialController.php
  4. 3
      app/Http/Controllers/RequestMaterialController.php
  5. 3
      app/Models/AssignMaterial.php
  6. 3
      app/Models/RequestMaterial.php

14
app/Http/Controllers/ActivityController.php
Unescape View File

@ -325,8 +325,8 @@ class ActivityController extends Controller
}
$data = Activity::find($id);
$oldRencanaBiaya = (int)$data->rencana_biaya;
$newRencanaBiaya = (int)$request->rencana_biaya;
$oldRencanaBiaya = $data->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");

11
app/Http/Controllers/AssignMaterialController.php
Unescape View File

@ -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){

385
app/Http/Controllers/ReportActivityMaterialController.php
Unescape View File

@ -2,7 +2,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Request;
use App\Models\ReportActivityMaterial;
use App\Models\Activity;
use App\Models\AssignMaterial;
@ -11,209 +11,182 @@ use Datatables;
class ReportActivityMaterialController extends Controller
{
public function add(Request $request){
$this->validate($request, [
'activity_id' => 'required',
'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;
$checkPrice = AssignMaterial::where("id", $valAssignMaterialId->id)->first();
$price = $checkPrice->budget;
$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){
$payloadUpdate = array(
'start_activity' => $request->start_activity,
'finish_activity' => $request->finish_activity,
'status_activity' => $request->status_activity
);
$updateData = AssignMaterial::where('activity_id',$request->activity_id)
->update($payloadUpdate);
if($updateData){
if($request->status_activity == 'done'){
$dataUpdate = array(
"persentase_progress" => 100,
"updated_by" => $this->currentName
);
Activity::where('id', $request->activity_id)->update($dataUpdate);
}
return response()->json(['status'=>'success','message'=>'Update data status successfully ', 'code'=>200]);
}
else{
return response()->json(['status'=>'failed','message'=>'Update data status failed', 'code'=>400]);
}
}
public function delete($id)
{
$data = ReportActivityMaterial::find($id);
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 menu successfully deleted!','code'=>200], 200);
}else{
return response()->json(['status'=>'failed','message'=>'data menu failed deleted!','code'=>400], 400);
}
}
private function countForProgress($id)
{
$dataActivity = Activity::find($id);
$dataPlan = AssignMaterial::where('activity_id', $id)->get();
$tmpPercentage1 = [];
if(!$dataPlan->isEmpty()){
foreach ($dataPlan as $value) {
# code...
$price = $value->material_id;
$qty_plan = $value->qty_planning;
$status_activity = $value->status_activity;
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
$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{
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
}
}
$totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1);
}else{
$totalPercentage = 0;
}
$dataUpdate = array(
"persentase_progress" => $totalPercentage,
"updated_by" => $this->currentName
);
return $dataActivity->update($dataUpdate);
}
public function countForProgressTest()
{
$dataPlan = AssignMaterial::where('activity_id', 807)->get();
$tmpPercentage1 = [];
if(!$dataPlan->isEmpty()){
foreach ($dataPlan as $value) {
# code...
$price = $value->material_id;
$qty_plan = $value->qty_planning;
$status_activity = $value->status_activity;
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
$percentage1 = ($getDataVolActual * 100) / $qty_plan;
$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{
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
}
}
$totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1);
}else{
$totalPercentage = 0;
}
return response()->json(['status'=>'success','code'=>200,'data'=>$dataPlan, 'tmpPercentage1'=> $tmpPercentage1, 'totalPercentage'=> $totalPercentage], 200);
}
public function search(Request $request)
{
$payload = $request->all();
$dataBuilder = $this->setUpPayload($payload, 'report_activity_material');
$builder = $dataBuilder['builder'];
$countBuilder = $dataBuilder['count'];
$dataGet = $builder->get();
$totalRecord = $countBuilder->count();
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
}
public function list()
{
$data = ReportActivityMaterial::all();
$countData = $data->count();
if($data){
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
}else{
return response()->json(['status'=>'failed','message'=>'failed get Repport Activity material, please try again later!','code'=>400], 400);
}
}
public function datatables(Request $request){
$id_activity = $request->query('idAct');
$id_assign_material_id= $request->query('idAmi');
$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);
}
}
public function add(Request $request){
$this->validate($request, [
'activity_id' => 'required',
'qty' => 'required'
]);
$data = $request->all();
$data['created_by'] = $this->currentName;
$data['assign_material_id'] = AssignMaterial::where('activity_id', $request->activity_id)->pluck('id')->first();
if(!ReportActivityMaterial::create($data))
return response()->json(['status'=>'failed','message'=>'Input progress report activity failed created','code'=>400]);
$this->countForProgress($request->activity_id);
return response()->json(['status'=>'success','message'=>'Input progress report activity created','code'=>200]);
}
public function updateStatusStartFinish(Request $request){
$payloadUpdate = array(
'start_activity' => $request->start_activity,
'finish_activity' => $request->finish_activity,
'status_activity' => $request->status_activity
);
$updateData = AssignMaterial::where('activity_id',$request->activity_id)
->update($payloadUpdate);
if($updateData){
if($request->status_activity == 'done'){
$dataUpdate = array(
"persentase_progress" => 100,
"updated_by" => $this->currentName
);
Activity::where('id', $request->activity_id)->update($dataUpdate);
}
return response()->json(['status'=>'success','message'=>'Update data status successfully ', 'code'=>200]);
}
else{
return response()->json(['status'=>'failed','message'=>'Update data status failed', 'code'=>400]);
}
}
public function delete($id)
{
if(!ReportActivityMaterial::findOrFail($id)->delete())
return response()->json(['status'=>'failed','message'=>'Failed to deleted the data!','code'=> 500], 500);
return response()->json(['status'=>'success','message'=> 'Data deleted!','code'=>200], 200);
}
private function countForProgress($id)
{
$dataActivity = Activity::find($id);
$dataPlan = AssignMaterial::where('activity_id', $id)->get();
$tmpPercentage1 = [];
if(!$dataPlan->isEmpty()){
foreach ($dataPlan as $value) {
# code...
$price = $value->material_id;
$qty_plan = $value->qty_planning;
$status_activity = $value->status_activity;
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
$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{
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
}
}
$totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1);
}else{
$totalPercentage = 0;
}
$dataUpdate = array(
"persentase_progress" => $totalPercentage,
"updated_by" => $this->currentName
);
return $dataActivity->update($dataUpdate);
}
public function countForProgressTest()
{
$dataPlan = AssignMaterial::where('activity_id', 807)->get();
$tmpPercentage1 = [];
if(!$dataPlan->isEmpty()){
foreach ($dataPlan as $value) {
# code...
$price = $value->material_id;
$qty_plan = $value->qty_planning;
$status_activity = $value->status_activity;
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
$percentage1 = ($getDataVolActual * 100) / $qty_plan;
$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{
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
}
}
$totalPercentage = array_sum($tmpPercentage1) / count($tmpPercentage1);
}else{
$totalPercentage = 0;
}
return response()->json(['status'=>'success','code'=>200,'data'=>$dataPlan, 'tmpPercentage1'=> $tmpPercentage1, 'totalPercentage'=> $totalPercentage], 200);
}
public function search(Request $request)
{
$payload = $request->all();
$dataBuilder = $this->setUpPayload($payload, 'report_activity_material');
$builder = $dataBuilder['builder'];
$countBuilder = $dataBuilder['count'];
$dataGet = $builder->get();
$totalRecord = $countBuilder->count();
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
}
public function list()
{
$data = ReportActivityMaterial::all();
$countData = $data->count();
if($data){
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
}else{
return response()->json(['status'=>'failed','message'=>'failed get Repport Activity material, please try again later!','code'=>400], 400);
}
}
public function datatables(Request $request){
$id_activity = $request->query('idAct');
$id_assign_material_id= $request->query('idAmi');
$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
Unescape View File

@ -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;

3
app/Models/AssignMaterial.php
Unescape View File

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

3
app/Models/RequestMaterial.php
Unescape View File

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

Write Preview
Loading…
Cancel
Save