Added new status filter to Pipe- and Linework
This commit is contained in:
@@ -105,9 +105,9 @@ class LineworkController extends mfBaseController {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(!!in_array($this->me->id, ["145","62","56"]) && !array_key_exists("status_id", $filter)) {
|
||||
|
||||
|
||||
if(!in_array($this->me->id, ["145","62","56"]) && !array_key_exists("status_id", $filter)) {
|
||||
$termination_search["status_id"] = 3;
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ class LineworkController extends mfBaseController {
|
||||
/*if($this->me->is("Admin") && $filter['lineworker_id']) {
|
||||
$termination_search["lineworker_id"] = $filter['lineworker_id'];
|
||||
}*/
|
||||
//var_dump($filter);exit;
|
||||
//var_dump($termination_search);exit;
|
||||
$networks = [];
|
||||
$pagination['maxItems'] = TerminationModel::count($termination_search);
|
||||
foreach(TerminationModel::search($termination_search, $pagination) as $term) {
|
||||
@@ -130,17 +130,16 @@ class LineworkController extends mfBaseController {
|
||||
$networks[$term->building->network->name][$term->id] = $term;
|
||||
}
|
||||
}
|
||||
|
||||
/*if(is_array($networks) && count($networks)) {
|
||||
$term = reset(reset($networks));
|
||||
var_dump($term);exit;
|
||||
}*/
|
||||
|
||||
// get first termination ...
|
||||
if(is_array($networks) && count($networks)) {
|
||||
$network = reset($networks);
|
||||
$term = reset($network);
|
||||
}
|
||||
$item_colspan = 0;
|
||||
$i = 0;
|
||||
|
||||
//var_dump($term);exit;
|
||||
|
||||
// get fields between delimiters for colspan
|
||||
// ... to get count of fields between delimiters for colspan
|
||||
if(is_array($term->workflowitems) && count($term->workflowitems)) {
|
||||
foreach($term->workflowitems as $wfitem) {
|
||||
if($i == 0 && $wfitem->type == "delimiter") continue;
|
||||
@@ -174,6 +173,16 @@ class LineworkController extends mfBaseController {
|
||||
}
|
||||
}
|
||||
|
||||
if(array_key_exists("status_id", $filter) && $filter["status_id"]) {
|
||||
$status_codes = explode(",", $filter["status_id"]);
|
||||
if(count($status_codes) > 1) {
|
||||
$filter["status_id"] = [];
|
||||
foreach($status_codes as $code) {
|
||||
$filter["status_id"][] = intval($code);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach($filter as $name => $value) {
|
||||
/*if($name == 'network_id') {
|
||||
$new_filter['id'] = $value;
|
||||
|
||||
Reference in New Issue
Block a user