Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added pagination to Pipework and Linework

Browse Source
This commit is contained in:
Frank Schubert
2021-09-14 20:42:12 +02:00
parent bd8f1609e6
commit 4809a5d6f1
8 changed files with 264 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
application/Building/BuildingModel.php
View File

@@ -80,7 +80,26 @@ class BuildingModel {
}
public static function search($filter) {
public static function count($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT COUNT(*) as cnt FROM Building
LEFT JOIN Buildingtype ON (Buildingtype.id = Building.type_id)
LEFT JOIN Buildingstatus ON (Buildingstatus.id = Building.status_id)
WHERE $where
";
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
return $data->cnt;
}
return 0;
}
public static function search($filter, $limit = false) {
$items = [];
$db = FronkDB::singleton();
@@ -89,7 +108,16 @@ class BuildingModel {
LEFT JOIN Buildingtype ON (Buildingtype.id = Building.type_id)
LEFT JOIN Buildingstatus ON (Buildingstatus.id = Building.status_id)
WHERE $where
ORDER BY network_id,pop_id,street,zip,city";
ORDER BY network_id, pop_id, street, zip, city";
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
} elseif(is_numeric($count)) {
$sql .= " LIMIT ".$limit['count'];
}
}
$res = $db->query($sql);
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
@@ -107,6 +135,8 @@ class BuildingModel {
$network_id = $filter['network_id'];
if(is_numeric($network_id)) {
$where .= " AND Building.network_id=$network_id";
} elseif(is_array($network_id) && count($network_id)) {
$where .= " AND Building.network_id IN (". implode(",", $network_id).")";
}
}

84
application/Linework/LineworkController.php
View File

@@ -17,13 +17,21 @@ class LineworkController extends mfBaseController {
protected function indexAction() {
$this->layout()->setTemplate("Linework/Index");
$filter = [];
$this->layout->set("filter", $this->request->filter);
if($this->request->filter) {
$filter = $this->getPreparedFilter($this->request->filter);
}
// pagination defaults
$pagination = [];
$pagination['start'] = 0;
$pagination['count'] = 5;
$pagination['maxItems'] = 0;
if(is_numeric($this->request->s)) {
$pagination['start'] = intval($this->request->s);
}
//var_dump($pagination);exit;
$my_networks = [];
// get allowed networks
@@ -56,40 +64,43 @@ class LineworkController extends mfBaseController {
unset($filter['network_id']);
// get Buildings in networks
$networks = [];
$my_network_ids = [];
$terminations = [];
foreach($my_networks as $network) {
if(!array_key_exists($network->name, $networks)) {
$networks[$network->name] = [];
}
$termination_search = [
"network_id" => $network->id,
"workflow_finished" => 0
];
$my_network_ids[] = $network->id;
}
$termination_search = [
"network_id" => $my_network_ids,
"workflow_finished" => 0
];
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {
$termination_search[$name] = $value;
}
//$building_search = array_merge($building_search, $filter);
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {
$termination_search[$name] = $value;
}
if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner", "lineplanner","netowner"])) {
$this->log->debug("is lineworker");
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
if(!count($filter)) {
$termination_search["status_id"] = 3;
}
}
if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner", "lineplanner","netowner"])) {
$this->log->debug("is lineworker");
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
if(!count($filter)) {
$termination_search["status_id"] = 3;
}
foreach(TerminationModel::search($termination_search) as $b) {
if(!array_key_exists($b->id, $networks[$network->name])) {
$networks[$network->name][$b->id] = $b;
}
}
$networks = [];
$pagination['maxItems'] = TerminationModel::count($termination_search);
foreach(TerminationModel::search($termination_search, $pagination) as $term) {
if(!array_key_exists($term->network->name, $networks)) {
$networks[$term->network->name] = [];
}
if(!array_key_exists($term->id, $networks[$term->network->name])) {
$networks[$term->network->name][$term->id] = $term;
}
}
@@ -112,12 +123,11 @@ class LineworkController extends mfBaseController {
$i += ($wfitem->width) ? $wfitem->width : 1;
}
}
//var_dump($item_colspan);exit;
$this->layout()->set("termination_wf_colspan", $item_colspan);
$this->layout()->set("networks", $networks);
//var_dump(reset(reset($networks))->workflowitems);exit;
$this->layout()->set("wfColspan", $item_colspan);
$this->layout()->set("networks", $networks);
$this->layout()->set("pagination", $pagination);
}
private function getPreparedFilter($filter) {

73
application/Pipework/PipeworkController.php
View File

@@ -18,11 +18,20 @@ class PipeworkController extends mfBaseController {
$this->layout()->setTemplate("Pipework/Index");
$this->layout->set("filter", $this->request->filter);
if($this->request->filter) {
$filter = $this->getPreparedFilter($this->request->filter);
}
// pagination defaults
$pagination = [];
$pagination['start'] = 0;
$pagination['count'] = 5;
$pagination['maxItems'] = 0;
if(is_numeric($this->request->s)) {
$pagination['start'] = intval($this->request->s);
}
$my_networks = [];
// get allowed networks
@@ -55,40 +64,43 @@ class PipeworkController extends mfBaseController {
unset($filter['network_id']);
// get Buildings in networks
$my_network_ids = [];
$networks = [];
foreach($my_networks as $network) {
if(!array_key_exists($network->name, $networks)) {
$networks[$network->name] = [];
}
$my_network_ids[] = $network->id;
}
$building_search = [
"network_id" => $network->id,
"workflow_finished" => 0
];
$building_search = [
"network_id" => $my_network_ids,
"workflow_finished" => 0
];
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {
$building_search[$name] = $value;
}
//$building_search = array_merge($building_search, $filter);
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {
$building_search[$name] = $value;
}
if($this->me->is("pipeworker") && !$this->me->is(["Admin","pipeplanner","netowner"])) {
$this->log->debug("is pipeworker");
$building_search["pipeworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
if(!count($filter)) {
$building_search["status_id"] = 3;
}
//$building_search = array_merge($building_search, $filter);
}
if($this->me->is("pipeworker") && !$this->me->is(["Admin","pipeplanner","netowner"])) {
$this->log->debug("is pipeworker");
$building_search["pipeworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
if(!count($filter)) {
$building_search["status_id"] = 3;
}
foreach(BuildingModel::search($building_search) as $b) {
if(!array_key_exists($b->id, $networks[$network->name])) {
$networks[$network->name][$b->id] = $b;
}
}
$pagination['maxItems'] = BuildingModel::count($building_search);
foreach(BuildingModel::search($building_search, $pagination) as $b) {
if(!array_key_exists($b->network->name, $networks)) {
$networks[$b->network->name] = [];
}
if(!array_key_exists($b->id, $networks[$b->network->name])) {
$networks[$b->network->name][$b->id] = $b;
}
}
@@ -108,8 +120,9 @@ class PipeworkController extends mfBaseController {
$i++;
}
//var_dump($item_colspan);exit;
$this->layout()->set("building_wf_colspan", $item_colspan);
$this->layout()->set("wfColspan", $item_colspan);
$this->layout()->set("networks", $networks);
$this->layout()->set("pagination", $pagination);
//var_dump(reset(reset($networks))->workflowitems);exit;

30
application/Termination/TerminationModel.php
View File

@@ -73,7 +73,25 @@ class TerminationModel {
}
public static function search($filter) {
public static function count($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT COUNT(*) as cnt FROM Termination
LEFT JOIN Building ON (Building.id = Termination.building_id)
LEFT JOIN Terminationstatus ON (Terminationstatus.id = Termination.status_id)
WHERE $where
";
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
return $data->cnt;
}
return 0;
}
public static function search($filter, $limit = false) {
$items = [];
$db = FronkDB::singleton();
@@ -82,9 +100,17 @@ class TerminationModel {
LEFT JOIN Building ON (Building.id = Termination.building_id)
LEFT JOIN Terminationstatus ON (Terminationstatus.id = Termination.status_id)
WHERE $where
ORDER BY code
ORDER BY Building.network_id, code
";
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
} elseif(is_numeric($count)) {
$sql .= " LIMIT ".$limit['count'];
}
}
$res = $db->query($sql);
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {