Added Frequency element in Links. Stage 2 ->Visibility in nodes.

wind-project · Jan 2, 2014 · 3100f1d · 3100f1d
1 parent ce405a1
commit 3100f1d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/includes/pages/nodes/nodes_view.php b/includes/pages/nodes/nodes_view.php
@@ -155,7 +155,7 @@ function table_links_p2p() {
 		global $db;
 		$table_links = new table(array('TABLE_NAME' => 'table_links_p2p'));
 		$table_links->db_data(
-			'"" AS distance, n1.name AS node_name, n1.id AS node_id, n2.name AS peer_node_name, l1.type AS links__type, l1.info AS links__info, l1.peer_node_id AS links__peer_node_id, l1.date_in AS links__date_in, l1.due_date AS links__due_date, l1.ssid AS links__ssid, l1.protocol AS links__protocol, l1.channel AS links__channel, l1.equipment AS links__equipment, l1.status AS l1_status, l2.status AS l2_status, "" AS links__status',
+			'"" AS distance, n1.name AS node_name, n1.id AS node_id, n2.name AS peer_node_name, l1.type AS links__type, l1.info AS links__info, l1.peer_node_id AS links__peer_node_id, l1.date_in AS links__date_in, l1.due_date AS links__due_date, l1.ssid AS links__ssid, l1.protocol AS links__protocol, l1.channel AS links__channel, l1.frequency AS links__frequency, l1.equipment AS links__equipment, l1.status AS l1_status, l2.status AS l2_status, "" AS links__status',
 			'links AS l1
 			INNER JOIN links AS l2 ON l1.peer_node_id = l2.node_id
 			INNER JOIN nodes AS n1 ON l1.node_id = n1.id
@@ -164,7 +164,7 @@ function table_links_p2p() {
 			"",
 			"l1.date_in ASC");
 		$table_links->db_data(
-			'"" AS distance, n1.name AS node_name, n1.id AS node_id, n2.name AS peer_node_name, l1.type AS links__type, l1.info AS links__info, l2.node_id AS links__peer_node_id, l1.date_in AS links__date_in, l1.due_date AS links__due_date, l2.ssid AS links__ssid, l2.protocol AS links__protocol, l2.channel AS links__channel, l1.equipment AS links__equipment, l1.status AS l1_status, l2.status AS l2_status, "" AS links__status',
+			'"" AS distance, n1.name AS node_name, n1.id AS node_id, n2.name AS peer_node_name, l1.type AS links__type, l1.info AS links__info, l2.node_id AS links__peer_node_id, l1.date_in AS links__date_in, l1.due_date AS links__due_date, l2.ssid AS links__ssid, l2.protocol AS links__protocol, l2.channel AS links__channel, l2.frequency AS links__frequency, l1.equipment AS links__equipment, l1.status AS l1_status, l2.status AS l2_status, "" AS links__status',
 			'links AS l1
 			INNER JOIN links AS l2 ON l1.peer_ap_id = l2.id
 			INNER JOIN nodes AS n1 ON l1.node_id = n1.id
@@ -192,7 +192,7 @@ function table_links_ap($id) {
 		global $db;
 		$table_links = new table(array('TABLE_NAME' => 'table_links_ap'));
 		$table_links->db_data(
-			'nodes.id AS c_node_id, nodes.name AS c_node_name, l1.status AS c_status, l2.date_in AS links__date_in, l2.ssid AS links__ssid, l2.type AS links__type, l2.info AS links__info, l2.protocol AS links__protocol, l2.channel AS links__channel, l2.equipment AS links__equipment, l2.status AS links__status',
+			'nodes.id AS c_node_id, nodes.name AS c_node_name, l1.status AS c_status, l2.date_in AS links__date_in, l2.due_date AS links__due_date, l2.ssid AS links__ssid, l2.type AS links__type, l2.info AS links__info, l2.protocol AS links__protocol, l2.channel AS links__channel, l2.frequency AS links__frequency, l2.equipment AS links__equipment, l2.status AS links__status',
 			'links AS l2
 			LEFT JOIN links AS l1 ON l1.peer_ap_id = l2.id
 			LEFT JOIN nodes ON l1.node_id = nodes.id',

diff --git a/templates/basic/includes/pages/nodes/link_info.tpl b/templates/basic/includes/pages/nodes/link_info.tpl
@@ -57,6 +57,10 @@
 	<td class="table-node-key2">{$lang.db.links__channel}</td>
 	<td class="table-node-value2">{$data[rowl].links__channel|escape}</td>
 </tr>
+<tr>
+        <td class="table-node-key2">{$lang.db.links__frequency}</td>
+        <td class="table-node-value2">{$data[rowl].links__frequency|escape}</td>
+</tr>
 <tr>
 	<td class="table-node-key2">{$lang.db.links__equipment}</td>
 	<td class="table-node-value2">{$data[rowl].links__equipment|escape|nl2br}</td>

diff --git a/templates/basic/includes/pages/nodes/nodes_view_table_links_ap.tpl b/templates/basic/includes/pages/nodes/nodes_view_table_links_ap.tpl
@@ -41,6 +41,10 @@
 	<td class="table-node-key2">{$lang.db.links__date_in}</td>
 	<td class="table-node-value2">{$data.1.links__date_in|date_format:"%x"}</td>
 </tr>
+<tr>
+        <td class="table-node-key2">{$lang.db.links__due_date}</td>
+        <td class="table-node-value2">{$data[rowl].links__due_date|date_format:"%x"}</td>
+</tr>
 <tr>
 	<td class="table-node-key2">{$lang.db.links__protocol}</td>
 	<td class="table-node-value2">{$data.1.links__protocol|escape}</td>
@@ -53,6 +57,10 @@
 	<td class="table-node-key2">{$lang.db.links__channel}</td>
 	<td class="table-node-value2">{$data.1.links__channel|escape}</td>
 </tr>
+<tr>
+        <td class="table-node-key2">{$lang.db.links__frequency}</td>
+        <td class="table-node-value2">{$data[rowl].links__frequency|escape}</td>
+</tr>
 <tr>
 	<td class="table-node-key2">{$lang.db.links__equipment}</td>
 	<td class="table-node-value2">{$data.1.links__equipment|escape|nl2br}</td>