diff --git a/assetclass.php b/assetclass.php index 7723abb..f146fb5 100644 --- a/assetclass.php +++ b/assetclass.php @@ -10,10 +10,14 @@ SPDX-License-Identifier: GPL-3.0-or-later include("includes.php"); include("header.php"); -$sql = "SELECT a.assetclass_id, a.assetclass_name, g.assetclassgroup_id, - g.assetclassgroup_name, g.assetclassgroup_color - FROM assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id) - ORDER BY a.assetclass_name"; +$sql = "SELECT c.assetclass_id AS id, c.assetclass_name AS name, c.assetclassgroup_id AS group_id, + g.assetclassgroup_name AS group_name, g.assetclassgroup_color AS color, + COUNT(a.asset_id) AS count_asset + FROM assetclass AS c + LEFT JOIN assetclassgroup AS g USING (assetclassgroup_id) + LEFT JOIN asset AS a USING (assetclass_id) + GROUP BY id, name, group_id, group_name, color + ORDER BY c.assetclass_name"; $sth = $dbh->query($sql); $smarty->assign("assetclasses", $sth->fetchAll(PDO::FETCH_ASSOC)); diff --git a/assetclassgroup.php b/assetclassgroup.php index c080ac1..f7ad388 100644 --- a/assetclassgroup.php +++ b/assetclassgroup.php @@ -10,14 +10,16 @@ SPDX-License-Identifier: GPL-3.0-or-later include("includes.php"); include("header.php"); -$sql = "SELECT assetclassgroup_id AS id, assetclassgroup_name AS name, - assetclassgroup_color AS color, assetclassgroup_description AS description - FROM assetclassgroup - ORDER BY assetclassgroup_name"; +$sql = "SELECT g.assetclassgroup_id AS id, g.assetclassgroup_name AS name, + g.assetclassgroup_color AS color, g.assetclassgroup_description AS description, + COUNT(c.assetclass_id) AS count_class + FROM assetclassgroup AS g LEFT JOIN assetclass AS c USING (assetclassgroup_id) + GROUP BY id, name, color, description + ORDER BY g.assetclassgroup_name"; $sth = $dbh->query($sql); $smarty->assign('assetclassgroups', $sth->fetchAll(PDO::FETCH_ASSOC)); $smarty->display("assetclassgroup.tpl"); include("footer.php"); -?> \ No newline at end of file +?> diff --git a/lang/de.php b/lang/de.php index ee53b5a..a5cf74a 100644 --- a/lang/de.php +++ b/lang/de.php @@ -66,12 +66,14 @@ $lang = array( 'lang_assetclass_del' => 'Objektklasse löschen', 'lang_assetclass_edit' => 'Objektklasse ändern', 'lang_assetclass_name' => 'Objektklassenname', + 'lang_assetclass_count' => '# Objekte', 'lang_assetclass_none' => 'Es sind keine Objektklassen vorhanden', 'lang_assetclassgroup_add' => 'Objektklassengruppe hinzufügen', 'lang_assetclassgroup_del' => 'Objektklassengruppe löschen', 'lang_assetclassgroup_edit' => 'Objektklassengruppe ändern', 'lang_assetclassgroup_name' => 'Objektklassengruppenname', + 'lang_assetclassgroup_count' => '# Klassen', 'lang_assetclassgroup_none' => 'Es sind keine Objektklassengruppen vorhanden', 'lang_assignnodetoasset' => 'Knoten zu Objekt hinzufügen', diff --git a/lang/en.php b/lang/en.php index 38c7723..0b17f0a 100644 --- a/lang/en.php +++ b/lang/en.php @@ -66,12 +66,14 @@ $lang = array( 'lang_assetclass_del' => 'Delete assetclass', 'lang_assetclass_edit' => 'Mofidy assetclass', 'lang_assetclass_name' => 'Assetclass name', + 'lang_assetclass_count' => '# Assets', 'lang_assetclass_none' => 'There are no assetclasses defined', 'lang_assetclassgroup_add' => 'Add assetclassgroup', 'lang_assetclassgroup_del' => 'Delete assetclassgroup', 'lang_assetclassgroup_edit' => 'Modify assetclassgroup', 'lang_assetclassgroup_name' => 'Assetclassgroup Name', + 'lang_assetclassgroup_count' => '# Classes', 'lang_assetclassgroup_none' => 'There are no assetclassegroups defined', 'lang_assignnodetoasset' => 'Assign node to asset', diff --git a/login.php b/login.php index e668f27..add5f87 100644 --- a/login.php +++ b/login.php @@ -36,7 +36,7 @@ function user_login ($user_name, $user_pass) { $sql = "SELECT user_id, user_pass, user_displayname, user_language, user_imagesize, user_imagecount, user_mac, user_dateformat, user_dns1suffix, user_dns2suffix, user_tooltips, - user_menu, user_role, user_flags + user_menu, user_role, user_flags, user_realm FROM user WHERE user_name=?"; $sth = $dbh->prepare($sql); @@ -63,6 +63,7 @@ function user_login ($user_name, $user_pass) { // all ok: user is logged in, register session data $_SESSION['suser_id'] = $user->user_id; + $_SESSION['suser_realm'] = $user->user_realm; $_SESSION['suser_displayname'] = $user->user_displayname; $_SESSION['suser_language'] = $user->user_language; $_SESSION['suser_imagesize'] = $user->user_imagesize; diff --git a/options.php b/options.php index 5efe468..769e22c 100644 --- a/options.php +++ b/options.php @@ -10,6 +10,7 @@ SPDX-License-Identifier: GPL-3.0-or-later include("includes.php"); include("header.php"); +$smarty->assign('realm', $_SESSION['suser_realm']); $smarty->assign('role_add', $_SESSION['suser_role_add']); $smarty->assign('role_edit', $_SESSION['suser_role_edit']); $smarty->assign('role_delete', $_SESSION['suser_role_delete']); diff --git a/tpl/assetclass.tpl b/tpl/assetclass.tpl index 00b27cf..791e6ff 100644 --- a/tpl/assetclass.tpl +++ b/tpl/assetclass.tpl @@ -20,15 +20,21 @@ {$lang_assetclassgroup_name} + + {$lang_assetclass_count} + {foreach item=assetclass from=$assetclasses} - {$assetclass.assetclass_name} + {$assetclass.name} - #{$assetclass.assetclassgroup_color} - {$assetclass.assetclassgroup_name} + #{$assetclass.color} + {$assetclass.group_name} + + + {$assetclass.count_asset} {foreachelse} diff --git a/tpl/assetclassgroup.tpl b/tpl/assetclassgroup.tpl index b84aed9..028c225 100644 --- a/tpl/assetclassgroup.tpl +++ b/tpl/assetclassgroup.tpl @@ -20,6 +20,9 @@ {$lang_description} + + {$lang_assetclassgroup_count} + {foreach item=acg from=$assetclassgroups} @@ -30,6 +33,9 @@ {$acg.description} + + {$acg.count_class} + {foreachelse} diff --git a/tpl/options.tpl b/tpl/options.tpl index e9f465a..e14f417 100644 --- a/tpl/options.tpl +++ b/tpl/options.tpl @@ -63,4 +63,12 @@ {/if} + + + {$lang_user_realm} + + + {$realm} + +