fix: graphs

Change in schema broke operating systems graph
Move from plugins to admin required change to load charts js lib

inc/graph.class.php

@@ -80,6 +80,7 @@ public function showDevicesPerOSVersion() {
       $config = Config::getConfigurationValues('flyvemdm', ['computertypes_id']);
       $computerTypeId = $config['computertypes_id'];
       $computerTable = Computer::getTable();
+      $itemOperatingSystemTable = Item_OperatingSystem::getTable();
       $operatingSystemTable = OperatingSystem::getTable();
       $operatingSystemVersionTable = OperatingSystemVersion::getTable();
       $entityRestrict = getEntitiesRestrictRequest(" AND ", $computerTable);
@@ -88,10 +89,12 @@ public function showDevicesPerOSVersion() {
                   `osv`.`name` AS `version`,
                   COUNT(*) AS `cpt`
                 FROM `$computerTable`
+                LEFT JOIN `$itemOperatingSystemTable` AS `i_os`
+                  ON (`i_os`.itemtype = 'Computer' AND `i_os`.`items_id` = `$computerTable`.`id`)
                 LEFT JOIN `$operatingSystemTable` AS `os`
-                  ON (`os`.`id` = `$computerTable`.`operatingsystems_id`)
+                  ON (`os`.`id` = `i_os`.`operatingsystems_id`)
                 LEFT JOIN `$operatingSystemVersionTable` AS `osv`
-                  ON (`osv`.`id` = `$computerTable`.`operatingsystemversions_id`)
+                  ON (`osv`.`id` = `i_os`.`operatingsystemversions_id`)
                 WHERE `$computerTable`.`computertypes_id` = '$computerTypeId' $entityRestrict
                 GROUP BY `operatingsystem`, `version`";
       $result = $DB->query($query);
@@ -154,7 +157,6 @@ public function showDevicesPerOSVersion() {
     * @return void
     */
    public function displayStackedBarGraph($title, $labels, $series, $options = null, $display = true) {
-
       $param = [
          'width'   => 900,
          'height'  => 300,

setup.php

@@ -165,7 +165,7 @@ function plugin_init_flyvemdm() {
       }
 
       Html::requireJs('charts');
-      $CFG_GLPI['javascript']['plugins']['pluginflyvemdmmenu']['Menu'] = ['charts'];
+      $CFG_GLPI['javascript']['admin']['pluginflyvemdmmenu']['Menu'] = ['charts'];
    }
 }