Added edit indication to workflow

This commit is contained in:
Frank Schubert
2021-08-30 20:55:21 +02:00
parent fc9e943466
commit aa05334ce2
8 changed files with 185 additions and 97 deletions

View File

@@ -17,6 +17,10 @@ class PipeworkController extends mfBaseController {
protected function indexAction() {
$this->layout()->setTemplate("Pipework/Index");
if($this->request->filter) {
$filter = $this->getPreparedFilter($this->request->filter);
}
// get allowed networks
if($this->me->is("Admin")) {
$my_networks = NetworkModel::getAll();
@@ -35,6 +39,12 @@ class PipeworkController extends mfBaseController {
"network_id" => $network->id,
"workflow_finished" => 0
];
if(is_array($filter) && count($filter)) {
$building_search = array_merge($building_search, $filter);
}
$this->log->debug(print_r($building_search, true));
foreach(BuildingModel::search($building_search) as $b) {
if(!array_key_exists($b->id, $networks[$network->name])) {
@@ -66,6 +76,10 @@ class PipeworkController extends mfBaseController {
}
private function getPreparedFilter($filter) {
return $filter;
}
protected function saveAction() {
$r = $this->request;
@@ -182,7 +196,7 @@ class PipeworkController extends mfBaseController {
}
$this->layout->setFlash("Workflow Eintrag erfolgreich gespeichert.", "success");
$this->redirect("Pipework","Index", false, "wf-building-".$building_id);
$this->redirect("Pipework","Index", false, "object=".$building_id);