Merge branch 'fronkdev' into 'master'
Added assigned_to filter to Linework and Pipework See merge request fronk/thetool!1232
This commit is contained in:
@@ -41,6 +41,7 @@
|
|||||||
<h4 class="header-title mb-3">Filter</h4>
|
<h4 class="header-title mb-3">Filter</h4>
|
||||||
|
|
||||||
<form method="get" id="filterform" action="<?=self::getUrl("Linework")?>">
|
<form method="get" id="filterform" action="<?=self::getUrl("Linework")?>">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-1">
|
<div class="col-1">
|
||||||
<label class="form-label" for="filter_network_id">Netzgebiet</label>
|
<label class="form-label" for="filter_network_id">Netzgebiet</label>
|
||||||
@@ -68,6 +69,18 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<?php if($me->is("Admin")): ?>
|
||||||
|
<div class="col-1">
|
||||||
|
<label class="form-label" for="filter_lineworker_id">Zugeteilt an</label>
|
||||||
|
<select name="filter[lineworker_id]" id="filter_lineworker_id" class="form-control">
|
||||||
|
<option></option>
|
||||||
|
<?php foreach($lineworkers as $address): ?>
|
||||||
|
<option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("lineworker_id", $filter) && $filter['lineworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<?php endif; ?>
|
||||||
|
|
||||||
<div class="col-2">
|
<div class="col-2">
|
||||||
<label class="form-label" for="filter_status_id">Anschlussstatus</label>
|
<label class="form-label" for="filter_status_id">Anschlussstatus</label>
|
||||||
<select name="filter[status_id]" id="filter_status_id" class="form-control">
|
<select name="filter[status_id]" id="filter_status_id" class="form-control">
|
||||||
|
|||||||
@@ -64,6 +64,18 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<?php if($me->is("Admin")): ?>
|
||||||
|
<div class="col-1">
|
||||||
|
<label class="form-label" for="filter_pipeworker_id">Zugeteilt an</label>
|
||||||
|
<select name="filter[pipeworker_id]" id="filter_pipeworker_id" class="form-control">
|
||||||
|
<option></option>
|
||||||
|
<?php foreach($pipeworkers as $address): ?>
|
||||||
|
<option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("pipeworker_id", $filter) && $filter['pipeworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<?php endif; ?>
|
||||||
|
|
||||||
<div class="col-2">
|
<div class="col-2">
|
||||||
<label class="form-label" for="filter_status_id">Objektstatus</label>
|
<label class="form-label" for="filter_status_id">Objektstatus</label>
|
||||||
<select name="filter[status_id]" id="filter_status_id" class="form-control">
|
<select name="filter[status_id]" id="filter_status_id" class="form-control">
|
||||||
|
|||||||
@@ -61,6 +61,9 @@ class LineworkController extends mfBaseController {
|
|||||||
$my_networks = NetworkModel::getAll();
|
$my_networks = NetworkModel::getAll();
|
||||||
}
|
}
|
||||||
$this->layout()->set("mynetworks", NetworkModel::getAll());
|
$this->layout()->set("mynetworks", NetworkModel::getAll());
|
||||||
|
|
||||||
|
$lineworkers = AddressModel::search(["addresstype" => ["lineworker", "lineplanner"]]);
|
||||||
|
$this->layout()->set("lineworkers", $lineworkers);
|
||||||
} else {
|
} else {
|
||||||
$use_filter_network = false;
|
$use_filter_network = false;
|
||||||
$my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
|
$my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
|
||||||
@@ -81,7 +84,7 @@ class LineworkController extends mfBaseController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
unset($filter['network_id']);
|
unset($filter['network_id']);
|
||||||
|
//var_dump($filter);exit;
|
||||||
// get Buildings in networks
|
// get Buildings in networks
|
||||||
$my_network_ids = [];
|
$my_network_ids = [];
|
||||||
$terminations = [];
|
$terminations = [];
|
||||||
@@ -108,12 +111,15 @@ class LineworkController extends mfBaseController {
|
|||||||
$termination_search["status_id"] = 3;
|
$termination_search["status_id"] = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner","lineplanner","netowner"]) && $termination_search["status_id"] == 3) {
|
if(!$this->me->is("Admin") && $this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner","lineplanner","netowner"]) && $termination_search["status_id"] == 3) {
|
||||||
$this->log->debug("is lineworker");
|
$this->log->debug("is lineworker");
|
||||||
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
|
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
|
||||||
//var_dump($filter);exit;
|
//var_dump($filter);exit;
|
||||||
}
|
}
|
||||||
|
/*if($this->me->is("Admin") && $filter['lineworker_id']) {
|
||||||
|
$termination_search["lineworker_id"] = $filter['lineworker_id'];
|
||||||
|
}*/
|
||||||
|
//var_dump($filter);exit;
|
||||||
$networks = [];
|
$networks = [];
|
||||||
$pagination['maxItems'] = TerminationModel::count($termination_search);
|
$pagination['maxItems'] = TerminationModel::count($termination_search);
|
||||||
foreach(TerminationModel::search($termination_search, $pagination) as $term) {
|
foreach(TerminationModel::search($termination_search, $pagination) as $term) {
|
||||||
@@ -125,9 +131,10 @@ class LineworkController extends mfBaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_array($networks) && count($networks)) {
|
/*if(is_array($networks) && count($networks)) {
|
||||||
$term = reset(reset($networks));
|
$term = reset(reset($networks));
|
||||||
}
|
var_dump($term);exit;
|
||||||
|
}*/
|
||||||
$item_colspan = 0;
|
$item_colspan = 0;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
@@ -150,6 +157,9 @@ class LineworkController extends mfBaseController {
|
|||||||
$this->layout()->set("wfColspan", $item_colspan);
|
$this->layout()->set("wfColspan", $item_colspan);
|
||||||
$this->layout()->set("networks", $networks);
|
$this->layout()->set("networks", $networks);
|
||||||
$this->layout()->set("pagination", $pagination);
|
$this->layout()->set("pagination", $pagination);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//var_dump($networks);exit;
|
//var_dump($networks);exit;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -157,7 +167,7 @@ class LineworkController extends mfBaseController {
|
|||||||
private function getPreparedFilter($filter) {
|
private function getPreparedFilter($filter) {
|
||||||
$new_filter = [];
|
$new_filter = [];
|
||||||
|
|
||||||
if(is_numeric($filter['networksection_id']) && $filter['networksection_id']) {
|
if(array_key_exists("networksection_id", $filter) && is_numeric($filter['networksection_id']) && $filter['networksection_id']) {
|
||||||
$section = new Networksection($filter['networksection_id']);
|
$section = new Networksection($filter['networksection_id']);
|
||||||
if($section->id) {
|
if($section->id) {
|
||||||
$filter['network_id'] = $section->network_id;
|
$filter['network_id'] = $section->network_id;
|
||||||
|
|||||||
@@ -60,6 +60,9 @@ class PipeworkController extends mfBaseController {
|
|||||||
$my_networks = NetworkModel::getAll();
|
$my_networks = NetworkModel::getAll();
|
||||||
}
|
}
|
||||||
$this->layout()->set("mynetworks", NetworkModel::getAll());
|
$this->layout()->set("mynetworks", NetworkModel::getAll());
|
||||||
|
|
||||||
|
$pipeworkers = AddressModel::search(["addresstype" => ["pipeworker", "pipeplanner"]]);
|
||||||
|
$this->layout()->set("pipeworkers", $pipeworkers);
|
||||||
} else {
|
} else {
|
||||||
$use_filter_network = false;
|
$use_filter_network = false;
|
||||||
$my_networks = $this->me->myNetworks(["netowner","pipeplanner","pipeworker","lineplanner","lineworker"]);
|
$my_networks = $this->me->myNetworks(["netowner","pipeplanner","pipeworker","lineplanner","lineworker"]);
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ class TerminationModel {
|
|||||||
if(is_array($limit) && count($limit)) {
|
if(is_array($limit) && count($limit)) {
|
||||||
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
|
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
|
||||||
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
|
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
|
||||||
} elseif(is_numeric($count)) {
|
} elseif(is_numeric($limit['count'])) {
|
||||||
$sql .= " LIMIT ".$limit['count'];
|
$sql .= " LIMIT ".$limit['count'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user