Pop Feature Erweiterungen
* Project 8454 (Erweiterung Felder Status, Speicherort, Dokustand Datum) * Schrank breite um 1ne Col verbreitert * neue Migration
This commit is contained in:
@@ -10,6 +10,10 @@ class PopModel
|
||||
public $vlan_public = null;
|
||||
public $vlan_nat = null;
|
||||
public $vlan_ipv6 = null;
|
||||
public $state = null;
|
||||
|
||||
public $folder_link = null;
|
||||
public $doku_date = null;
|
||||
|
||||
public $note = null;
|
||||
|
||||
@@ -18,6 +22,14 @@ class PopModel
|
||||
public $create = null;
|
||||
public $edit = null;
|
||||
|
||||
public static $stateArray = [
|
||||
1 => "Planung (Innenleben)",
|
||||
2 => "Bauphase (Schrank)",
|
||||
3 => "Grobdoku",
|
||||
4 => "in Betrieb",
|
||||
5 => "von Techniker abgenommen (Altbestand)",
|
||||
];
|
||||
|
||||
public static function find($data)
|
||||
{
|
||||
|
||||
@@ -122,7 +134,7 @@ class PopModel
|
||||
WHERE $where
|
||||
ORDER BY name, PopNetwork.network_id LIMIT 1
|
||||
";
|
||||
|
||||
|
||||
$res = $db->query($sql);
|
||||
if ($db->num_rows($res)) {
|
||||
$data = $db->fetch_object($res);
|
||||
@@ -142,15 +154,15 @@ class PopModel
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
|
||||
|
||||
$sql = "SELECT Pop.* FROM Pop
|
||||
LEFT JOIN PopNetwork ON (PopNetwork.pop_id = Pop.id)
|
||||
WHERE $where
|
||||
ORDER BY name, PopNetwork.network_id";
|
||||
|
||||
|
||||
$res = $db->query($sql);
|
||||
//$res = $db->select("Pop", "*", "$where ORDER BY name, network_id");
|
||||
|
||||
|
||||
if ($db->num_rows($res)) {
|
||||
while ($data = $db->fetch_object($res)) {
|
||||
$items[] = new Pop($data);
|
||||
|
||||
Reference in New Issue
Block a user