summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole
diff options
context:
space:
mode:
Diffstat (limited to 'admin/WebConsole')
-rw-r--r--admin/WebConsole/includes/restfunctions.php17
-rw-r--r--admin/WebConsole/principal/aula.php14
2 files changed, 31 insertions, 0 deletions
diff --git a/admin/WebConsole/includes/restfunctions.php b/admin/WebConsole/includes/restfunctions.php
index e7b1e1e6..2141c3b1 100644
--- a/admin/WebConsole/includes/restfunctions.php
+++ b/admin/WebConsole/includes/restfunctions.php
@@ -77,6 +77,7 @@ define('OG_REST_PARAM_AM_PM', 'am_pm');
define('OG_REST_PARAM_MINUTES', 'minutes');
define('OG_REST_PARAM_MODE', 'mode');
define('OG_REST_PARAM_SCOPE_NAME', 'scope_name');
+define('OG_REST_PARAM_SPEED', 'speed');
define('TYPE_COMMAND', 1);
define('TYPE_PROCEDURE', 2);
@@ -188,6 +189,22 @@ function clients($case, $ips) {
return $trama_notificacion;
}
+function clients_v2($case, $ips) {
+
+ switch ($case) {
+ case 1:
+ $type = POST;
+ $data = array(OG_REST_PARAM_CLIENTS => $ips);
+ break;
+ case 2:
+ $type = GET;
+ $data = null;
+ break;
+ }
+
+ return common_request(OG_REST_CMD_CLIENTS, $type, $data);
+}
+
function wol($type_wol, $ips) {
switch ($type_wol) {
diff --git a/admin/WebConsole/principal/aula.php b/admin/WebConsole/principal/aula.php
index efc09178..81c7b676 100644
--- a/admin/WebConsole/principal/aula.php
+++ b/admin/WebConsole/principal/aula.php
@@ -15,6 +15,7 @@ include_once("../clases/MenuContextual.php");
include_once("../includes/constantes.php");
include_once("../includes/comunes.php");
include_once("../includes/CreaComando.php");
+include_once("../includes/restfunctions.php");
include_once("../idiomas/php/".$idioma."/aulas_".$idioma.".php");
include_once("../idiomas/php/".$idioma."/estados_".$idioma.".php");
include_once("../idiomas/php/".$idioma."/comandos/mensajes_".$idioma.".php");
@@ -286,6 +287,12 @@ function pintaordenadores(){
global $map;
global $max_col;
+ $clients = clients_v2(2, $Mip);
+ $get_speed = function($cli) {
+ return $cli['speed'] ? $cli['speed'] : '-1';
+ };
+ $speeds = array_map($get_speed, $clients['clients']);
+
$ntr=0; // Numero de ordenadores por fila
if ($nombreaula!=""){
echo '<div>';
@@ -313,6 +320,13 @@ function pintaordenadores(){
echo ' <strong><font color="#D0A126">'.$Mip[$i].'</font></strong>';
echo ' </br>';
echo ' <font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.$Mmac[$i].'</font>';
+ echo ' </br>';
+ if ($speeds[$i] > 0 && $speeds[$i] < 1000) {
+ echo ' <font style="background-color: red" size="1" face="Arial, Helvetica, sans-serif">'.$speeds[$i].' Mbit</font>';
+ }
+ if ($speeds[$i] > 0 && $speeds[$i] >= 1000) {
+ echo ' <font size="1" color="#007700" face="Arial, Helvetica, sans-serif">'.$speeds[$i].' Mbit</font>';
+ }
echo '</td>';
echo '</tr>';
echo '</table>';