Display OS infos in its own tab (glpi-project#921)

* Drop executable bit

* Ignore coverage directory

* Move operating system in its own tab; refs glpi-project#919

Author: trasher

.gitignore

@@ -14,3 +14,4 @@
 /vendor/
 /nbproject/private/
 phpunit.xml
+/coverage/

inc/computer.class.php

@@ -67,6 +67,20 @@ static function getTypeName($nb=0) {
    }
 
 
+   /**
+    * @see CommonGLPI::getTabNameForItem()
+   **/
+   function getTabNameForItem(CommonGLPI $item, $withtemplate=0) {
+      if (static::canView()) {
+         switch ($item->getType()) {
+            case __CLASS__ :
+               $ong = array(1 => __('Operating System'));
+               return $ong;
+         }
+      }
+   }
+
+
    /**
     * @see CommonDBTM::useDeletedToLockIfDynamic()
     *
@@ -94,6 +108,7 @@ function defineTabs($options=array()) {
 
       $ong = array();
       $this->addDefaultFormTab($ong)
+         ->addStandardTab(__CLASS__, $ong, $options)
          ->addStandardTab('Item_Devices', $ong, $options)
          ->addStandardTab('ComputerDisk', $ong, $options)
          ->addStandardTab('Computer_SoftwareVersion', $ong, $options)
@@ -117,6 +132,88 @@ function defineTabs($options=array()) {
    }
 
 
+   /**
+    * @param $item         CommonGLPI object
+    * @param $tabnum       (default 1)
+    * @param $withtemplate (default 0)
+   **/
+   static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) {
+
+      self::showOperatingSystem($item);
+      return true;
+   }
+
+   /**
+    * Print the computer's operating system form
+    *
+    * @param $comp Computer object
+    *
+    * @return Nothing (call to classes members)
+   **/
+   static function showOperatingSystem(Computer $comp) {
+      global $DB;
+
+      $ID = $comp->fields['id'];
+      $colspan = 4;
+
+      echo "<div class='center'>";
+
+      $comp->initForm($ID);
+      $comp->showFormHeader();
+
+      echo "<table class='tab_cadre_fixe'>";
+
+      echo "<tr class='headerRow'><th colspan='".$colspan."'>";
+      echo __('Operating system');
+      echo "</th></tr>";
+
+      echo "<tr class='tab_bg_1'>";
+      echo "<td>".__('Name')."</td>";
+      echo "<td>";
+      OperatingSystem::dropdown(array('value' => $comp->fields["operatingsystems_id"]));
+      echo "</td>";
+
+      echo "<td>".__('Version')."</td>";
+      echo "<td >";
+      OperatingSystemVersion::dropdown(array('value' => $comp->fields["operatingsystemversions_id"]));
+      echo "</td>";
+      echo "</tr>";
+
+      echo "<tr class='tab_bg_1'>";
+      echo "<td>".__('Architecture')."</td>";
+      echo "<td >";
+      OperatingSystemArchitecture::dropdown(array('value'
+                                                 => $comp->fields["operatingsystemarchitectures_id"]));
+      echo "</td>";
+
+      echo "<td>".__('Service pack')."</td>";
+      echo "<td >";
+      OperatingSystemServicePack::dropdown(array('value'
+                                                 => $comp->fields["operatingsystemservicepacks_id"]));
+      echo "</td></tr>";
+
+      echo "<tr class='tab_bg_1'>";
+      echo "<td>".__('Kernel version')."</td>";
+      echo "<td >";
+      Html::autocompletionTextField($comp, 'os_kernel_version');
+      echo "</td>";
+
+      echo "<td>".__('Product ID')."</td>";
+      echo "<td >";
+      Html::autocompletionTextField($comp, 'os_licenseid');
+      echo "</td></tr>";
+
+      echo "<tr class='tab_bg_1'>";
+      echo "<td>".__('Serial number')."</td>";
+      echo "<td >";
+      Html::autocompletionTextField($comp, 'os_license_number');
+      echo "</td></tr>";
+
+      $comp->showFormButtons();
+
+      echo "</table>";
+      echo "</div>";
+   }
    function post_restoreItem() {
 
       $comp_softvers = new Computer_SoftwareVersion();
@@ -528,14 +625,13 @@ function showForm($ID, $options=array()) {
       echo "</td>";
 
       // Display auto inventory informations
-      $rowspan        = 7;
+      $rowspan        = 4;
       $inventory_show = false;
 
       if (!empty($ID)
           && Plugin::haveImport()
           && $this->fields["is_dynamic"]) {
          $inventory_show = true;
-         $rowspan       -= 5;
       }
 
       echo "<td rowspan='$rowspan'>".__('Comments')."</td>";
@@ -552,89 +648,6 @@ function showForm($ID, $options=array()) {
                              'entity' => $this->fields["entities_id"]));
       echo "</td></tr>";
 
-      echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Operating system')."</td>";
-      echo "<td>";
-      OperatingSystem::dropdown(array('value' => $this->fields["operatingsystems_id"]));
-      echo "<br /><a href='#' id='toggle_os_information'>".__("More information")."</a>";
-      echo "</td>";
-      if ($inventory_show) {
-         echo "<td rowspan='5' colspan='2'>";
-         Plugin::doHook("autoinventory_information", $this);
-         echo "</td>";
-      }
-      echo "</tr>";
-
-      echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Version of the operating system')."</td>";
-      echo "<td >";
-      OperatingSystemVersion::dropdown(array('value' => $this->fields["operatingsystemversions_id"]));
-      echo "</td>";
-      echo "</tr>";
-
-      echo "<tr class='tab_bg_1'><td colspan='2'>";
-      echo Html::scriptBlock("
-      $(document).ready(function(){
-         $('#os_information').hide();
-
-         $('#toggle_os_information').on('click',function() {
-            $('#os_information').dialog({
-               width:'auto',
-               resizable: false,
-               appendTo: '#os_information_parent',
-               position: {
-                  my : 'left top',
-                  at : 'left bottom',
-                  of: $('#toggle_os_information')
-               }
-            })
-         })
-      });");
-
-      // group os advanced information in a single bloc (who can be toggled)
-      echo "<div id='os_information_parent'>";
-      echo "<div id='os_information' title=\"".__('Operating system')."\">";
-      echo "<table>";
-      echo "<tr class='tab_bg_1'>";
-
-      echo "<td>".__('Service pack')."</td>";
-      echo "<td >";
-      OperatingSystemServicePack::dropdown(array('value'
-                                                 => $this->fields["operatingsystemservicepacks_id"]));
-      echo "</td></tr>";
-
-      echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Operating system architecture')."</td>";
-      echo "<td >";
-      OperatingSystemArchitecture::dropdown(array('value'
-                                                 => $this->fields["operatingsystemarchitectures_id"]));
-      echo "</td></tr>";
-
-      echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Kernel version of the operating system')."</td>";
-      echo "<td >";
-      Html::autocompletionTextField($this, 'os_kernel_version');
-      echo "</td></tr>";
-
-      echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Product ID of the operating system')."</td>";
-      echo "<td >";
-      Html::autocompletionTextField($this, 'os_licenseid');
-      echo "</td></tr>";
-
-      echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Serial of the operating system')."</td>";
-      echo "<td >";
-      Html::autocompletionTextField($this, 'os_license_number');
-      echo "</td>";
-
-
-      echo "</table>";
-      echo "</div>";
-      echo "</div>";
-      echo "</td>";
-      echo "</tr>";
-
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('UUID')."</td>";
       echo "<td >";
@@ -648,6 +661,18 @@ function showForm($ID, $options=array()) {
       AutoUpdateSystem::dropdown(array('value' => $this->fields["autoupdatesystems_id"]));
       echo "</td></tr>";
 
+
+      if (Plugin::haveImport() && $inventory_show) {
+         //echo "<td>".__('Automatic inventory')."</td>";
+         echo '<tr><td colspan="4">';
+         if ($ID && $this->fields['is_dynamic']) {
+            Plugin::doHook("autoinventory_information", $this);
+         } else {
+            _e('No');
+         }
+         echo "</td></tr>";
+      }
+
       $this->showFormButtons($options);
 
       return true;