Browse Source

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

Reviewed-on: ordo/adw-backend#283
pull/1/head
ibnu 11 months ago
parent
commit
7184be09db
  1. 4
      app/Http/Controllers/ReportActivityMaterialController.php

4
app/Http/Controllers/ReportActivityMaterialController.php

@ -143,7 +143,7 @@ class ReportActivityMaterialController extends Controller
$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)
->where('m.description', $materialName)
->where('m.description', 'LIKE', '%' . $materialName . '%')
->orderBy('assign_material_to_activity.id', 'asc')
->get();
if ($baselineDuration > 0) {
@ -172,7 +172,7 @@ class ReportActivityMaterialController extends Controller
->join("m_req_material as m", "m.id", "=", "amta.material_id")
->join("m_users as u", "u.id", "=", "report_activity_material.user_id")
->where('report_activity_material.activity_id', $id_activity)
->where('m.description', $materialName)
->where('m.description', 'LIKE', '%' . $materialName . '%')
->orderBy('report_activity_material.report_date', 'asc')
->get();
if ($baselineDuration > 0) {

Loading…
Cancel
Save