Merge branch 'feature/fix_offline_event_handling' into release/2.0.0

flyve-mdm · Oct 22, 2018 · ca7fe28 · ca7fe28
2 parents d0ce6c6 + ad9bdf8
commit ca7fe28
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -239,6 +239,7 @@ public function showForm($ID, array $options = []) {
                                     'value'        => $this->fields['plugin_flyvemdm_fleets_id'],
                                     'entity'       => $this->fields['entities_id']
                              ]);
+      $fields['is_online'] = self::getSpecificValueToDisplay('is_online', $fields['is_online']);
       if (empty($fields['last_contact'])) {
          $fields['last_contact'] = __('Never seen online', 'flyvemdm');
       }
@@ -1998,8 +1999,12 @@ public static function getSpecificValueToDisplay($field, $values, array $options
       switch ($field) {
          case 'is_online':
             if (!isAPI()) {
+               $style = '';
+               if (isset($options['center']) && $options['center']) {
+                  $style = 'style="text-align: center"';
+               }
                $class = $values[$field] == 0 ? "plugin-flyvemdm-offline" : "plugin-flyvemdm-online";
-               $output = '<div style="text-align: center"><i class="fa fa-circle '
+               $output = '<div ' . $style . '><i class="fa fa-circle '
                   . $class
                   . '" aria-hidden="true" ></i></div>';
                return $output;

diff --git a/inc/mqtthandler.class.php b/inc/mqtthandler.class.php
@@ -360,9 +360,9 @@ protected function updateOnlineStatus($topic, $message) {
       if (!isset($feedback['online'])) {
          return;
       }
-      if ($feedback['online'] == 'false') {
+      if ($feedback['online'] == false) {
          $status = '0';
-      } else if ($feedback['online'] == 'true') {
+      } else if ($feedback['online'] == true) {
          $status = '1';
       } else {
          // Invalid value

diff --git a/inc/mqttlog.class.php b/inc/mqttlog.class.php
@@ -218,13 +218,23 @@ public static function showMqttLogs(PluginFlyvemdmNotifiableInterface $item) {
    public static function findLogs(PluginFlyvemdmNotifiableInterface $item) {
       global $DB;
 
-      $condition = [
-         'FIELDS' => ['id', 'date', 'topic', 'message'],
-         'WHERE'           => ['itemtype' => $item::getType(), 'items_id' => $item->getID()],
-         'GROUPBY'         => 'topic',
-      ];
+      // Need this PR to avoid raw SQL
+      // https://github.com/glpi-project/glpi/pull/4812
+
+      $table = self::getTable();
+      $itemtype = $item->getType();
+      $itemId = $item->getID();
+      $result = $DB->request("SELECT `l1`.*
+         FROM `$table`  AS `l1` INNER JOIN
+         (SELECT  MAX(`date`) AS `maxdate`, `topic`
+            FROM `$table`
+            WHERE `itemtype` = '$itemtype' AND `items_id` = '$itemId'
+            GROUP BY `topic`
+         ) AS `l2`
+         ON `l1`.`topic` = `l2`.`topic` AND `l1`.`date` = `l2`.`maxdate`
+         WHERE `itemtype`='$itemtype' AND `items_id` = '$itemId'
+         GROUP BY `topic`");
 
-      $result = $DB->request(static::getTable(), $condition);
       return $result;
    }
 }
diff --git a/tests/suite-integration/PluginFlyvemdmAgent.php b/tests/suite-integration/PluginFlyvemdmAgent.php
@@ -450,9 +450,9 @@ public function testDeviceOnlineChange() {
       $this->boolean($agent->isNewItem())
          ->isFalse(json_encode($_SESSION['MESSAGE_AFTER_REDIRECT'], JSON_PRETTY_PRINT));
 
-      $this->deviceOnlineStatus($agent, 'true', 1);
+      $this->deviceOnlineStatus($agent, true, 1);
 
-      $this->deviceOnlineStatus($agent, 'false', 0);
+      $this->deviceOnlineStatus($agent, false, 0);
    }
 
    /**

diff --git a/tpl/agent.html.twig b/tpl/agent.html.twig
@@ -1,6 +1,6 @@
 <tr class='tab_bg_1'>
    <td>
-      {{ __('Name') }}{{ withTemplate }} 
+      {{ __('Name') }}{{ withTemplate }}
    </td>
    <td>
       {{ agent.name|raw }}
@@ -28,14 +28,16 @@
 </tr>
 <tr class='tab_bg_1'>
    <td>
-      {{ __('Last contact', 'flyvemdm') }}
+      {{ __('Is online', 'flyvemdm') }}
    </td>
    <td>
-      {{ agent.last_contact }}
+      {{ agent.is_online|raw }}
    </td>
    <td>
+      {{ __('Last contact', 'flyvemdm') }}
    </td>
    <td>
+      {{ agent.last_contact }}
    </td>
 </tr>
 {% if canUpdate == true %}