rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Separate screen for RESQ transations" #1604

Merged
korina.cordero merged 4 commits from 679-separate-screen-for-resq-transations into master 2022-06-10 07:25:49 +00:00
Conversation 7 Commits 4 Files changed 7 +7 -3
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit feade62c18 - Show all commits

10
src/Controller/ResqJobOrderController.php
View file

@ -15,6 +15,8 @@ use Catalyst\MenuBundle\Annotation\Menu;
use App\Entity\JobOrder; use App\Entity\JobOrder;
use App\Service\JobOrderHandlerInterface;
use App\Ramcar\TransactionOrigin; use App\Ramcar\TransactionOrigin;
use App\Ramcar\JOStatus; use App\Ramcar\JOStatus;
use App\Ramcar\ServiceType; use App\Ramcar\ServiceType;
@ -37,7 +39,7 @@ class ResqJobOrderController extends Controller
/** /**
* @IsGranted("jo_resq_proc.list") * @IsGranted("jo_resq_proc.list")
*/ */
public function datatableRows(Request $req) public function datatableRows(Request $req, JobOrderHandlerInterface $jo_handler)
{ {
// get query builder // get query builder
$qb = $this->getDoctrine() $qb = $this->getDoctrine()
@ -131,8 +133,10 @@ class ResqJobOrderController extends Controller
$row['processor'] = $orow->getProcessedBy()->getFullName(); $row['processor'] = $orow->getProcessedBy()->getFullName();
// add the items for Actions // add the items for Actions
$row['meta']['update_url'] = $this->generateUrl('jo_proc_form', ['id' => $orow->getID()]); $jo_id = $orow->getID();
$row['meta']['unlock_url'] = $this->generateUrl('jo_resq_proc_unlock', ['id' => $orow->getID()]);
$row['meta']['update_url'] = $this->generateUrl('jo_proc_form', ['id' => $jo_id, 'origin' => 'resq']);
$row['meta']['unlock_url'] = $this->generateUrl('jo_resq_proc_unlock', ['id' => $jo_id, 'origin' => 'resq']);
$rows[] = $row; $rows[] = $row;
} }