table display for selection, delete old files

Author: Lea9250

hook.xml

@@ -5,7 +5,7 @@
     </hook>
     <hook type="submenu">
         <mainmenuidentifier>ms_extension</mainmenuidentifier>
-        <identifier>ms_compare_xmls</identifier>
-        <translation>23152</translation>
+        <identifier>ms_compare_devices</identifier>
+        <translation>23151</translation>
     </hook>
 </hookstore>

infos.json

@@ -1,5 +1,5 @@
 {
-    "displayName" : "Compare XMLs",
+    "displayName" : "Compare Devices",
     "author" : ["Léa DROGUET"],
     "contributor" : [],
     "supportedAgent" : ["Unix"],

install.php

@@ -9,7 +9,7 @@
  * This function is called on installation and is used to 
  * create database schema for the plugin
  */
-function extension_install_compare_xmls()
+function extension_install_compare_devices()
 {
 
 }
@@ -18,15 +18,15 @@ function extension_install_compare_xmls()
  * This function is called on removal and is used to 
  * destroy database schema for the plugin
  */
-function extension_delete_compare_xmls()
+function extension_delete_compare_devices()
 {
 
 }
 
 /**
  * This function is called on plugin upgrade
  */
-function extension_upgrade_compare_xmls()
+function extension_upgrade_compare_devices()
 {
 
 }

language/en_GB/en_GB.txt

@@ -1 +1,2 @@
-23152 Compare devices
+23150 Compare devices :
+23151 Compare devices

ms_compare_xmls/create_XML.php ms_compare_devices/create_XML.phpms_compare_xmls/create_XML.php renamed to ms_compare_devices/create_XML.php

@@ -27,11 +27,24 @@
     ob_start();
 }
 
-include_once('Difference_Class.php');
-include_once('ArrayFromXML_Class.php');
-include_once('Table_Class.php');
-require_once('create_XML.php'); 
+/*
+    /!\ WARNING /!\
+    Make sure https://github.com/jfcherng/php-diff is installed on server, 
+    otherwise differences won't display as the extension requires this 
+    third party library
 
+    TODO : 
+    - improve selectors (what if 10+ devices)
+    - table isnt displaying selected devices (?)
+
+    THINK HARDER :
+    - autocompleted inputs vs dropdown selectors ?
+    in case 1 vs 15 > cant display 15 selectors but two autocompleted inputs could do
+
+    - php-diff only displays diff 1vs1 
+    - php-diff table are not (yet) collapsable
+*/
+require_once('create_XML.php'); 
 include ('/usr/share/ocsinventory-reports/ocsreports/vendor/jfcherng/php-diff/example/demo_base.php');
 
 use Jfcherng\Diff\DiffHelper;
@@ -56,29 +69,8 @@
 echo DiffHelper::getStyleSheet();
 echo "</style><br><br>";
 
-/*
-    /!\ WARNING /!\
-    Make sure https://github.com/jfcherng/php-diff is installed on server, 
-    otherwise differences won't display as the extension requires this 
-    third party library
-
-    TODO : 
-    - improve selectors (what if 10+ devices)
-    - table isnt displaying selected devices (?)
-
-    THINK HARDER :
-    - autocompleted inputs vs dropdown selectors ?
-    in case 1 vs 15 > cant display 15 selectors but two autocompleted inputs could do
-
-    - php-diff only displays diff 1vs1 
-    - php-diff table are not (yet) collapsable
- */
-
-
- // printEnTete($l->g(9000));
-// temporary header :
-echo "<h2> Compare devices : </h2>";
 
+printEnTete($l->g(23150));
 $form_name = 'compare_devices';
 $tab_options = $protectedPost;
 $table_name = $form_name;
@@ -89,141 +81,66 @@
 echo open_form($form_name, '', 'enctype="multipart/form-data"', 'form-horizontal');
 echo '<div class="col col-md-10" >';
 
-if (isset($protectedPost['SUP_PROF']) && $protectedPost['SUP_PROF'] != "") {
-    // TODO : Remove device from table
-    $result_remove = 0;
-    unset($protectedPost['SUP_PROF']);
-    if ($result_remove == true) {
-        msg_success($l->g(572));
-    } else {
-        msg_error($l->g(573));
-    }
-}
-
-// IF DEVICE IS ADDED
-if (isset($protectedPost['add_device'])) {
-    var_dump($protectedPost['add_device']);
-    /*  if($result == true){
-        msg_success($l->g(572));
-    }else{
-        msg_error($l->g(573));
-    }
-    unset($protectedPost['add_device']); */
-}
-
 // req to select from 
 $link = $_SESSION['OCS']["readServer"];
 $result = mysql2_query_secure("SELECT ID, DEVICEID FROM hardware WHERE deviceid <> '_SYSTEMGROUP_' AND deviceid <>'_DOWNLOADGROUP_'", $link);
 $result = mysqli_fetch_all($result, MYSQLI_ASSOC);
 
-// prepare array to display during selection
+// prepare array for selection
 foreach ($result as $key => $value) {
     $display[$key] = $value['DEVICEID'];
 }
 
 echo "<div>
         <div>";
-
 // select main device and other devices
 formGroup('select', 'main_device', 'Main device to compare :', '', '', '', '', $result, $display, "required");
-// echo "<input type='submit' name='add_main_device' id='add_main_device' class='btn btn-success' value='Add'><br><br>";
-
-// TODO : hide other device if main device not selected yet + remove already selected devices from list
-formGroup('select', 'other_device[]', 'Other devices to compare :', '', '', '', '', $result, $display, "required");
-// echo "<input type='submit' name='add_other_device' id='add_other_device' class='btn btn-success' value='Add'>";
-
-
-// use code below to display multiple selectors (bs)
-/* if (isset($protectedPost['add_other_device'])) {
-    formGroup('select', 'other_device', 'Other devices to compare :', '', '', '', '', $result, $display, "required");
-} 
-echo "<input type='submit' name='add_device' id='add_device' class='btn btn-success' value='Add device to comparison'><br><br>";
-*/
-
-
-echo "</div></div></br></br></br></br>";
-
-// quick check 
-// var_dump($result);
-$m_device = $result[$protectedPost['main_device']]['ID'];
-$o_device = $result[$protectedPost['other_device'][0]]['ID'];
-echo "<br>comparing $m_device with $o_device";
+formGroup('select', 'other_device', 'Other device to compare :', '', '', '', '', $result, $display, "required");
+// submit values
+echo "<input type='submit' name='compare' id='compare' class='btn btn-success' value='Compare devices'>";
+echo "</div>
+    </div>";
 
 
 // Display table of selected devices
 $list_fields = array(
     'ID' => 'ID',
     'DEVICE ID' => 'DEVICEID',
 );
-
 $list_fields['SUP'] = 'ID';
 $tab_options['LBL_POPUP']['SUP'] = 'TYPE_NAME';
-
 $default_fields = $list_fields;
 $list_col_cant_del = $list_fields;
 
-$devices = array($m_device, $o_device);
+$devices = array($result[$protectedPost['main_device']]['ID'], $result[$protectedPost['other_device']]['ID']);
 $in = implode(",", $devices);
-$queryDetails = "SELECT ID, DEVICEID FROM hardware WHERE deviceid <> '_SYSTEMGROUP_' AND deviceid <>'_DOWNLOADGROUP_' AND id IN ($in)";
-
+// query for table display
+$queryDetails = "SELECT ID, DEVICEID FROM hardware WHERE deviceid <> '_SYSTEMGROUP_' AND deviceid <>'_DOWNLOADGROUP_' AND id IN (".$in.")";
 ajaxtab_entete_fixe($list_fields, $default_fields, $tab_options, $list_col_cant_del);
-echo "<input type='submit' name='compare' id='compare' class='btn btn-success' value='Compare devices'>";
-echo "</div></div>";
+
+echo "</div>
+    </div>";
 echo close_form();
 
 
 // TRAITEMENT XML -------------------------------------------------
 $xml = new DeviceXML();
 
-$oldString = $xml->createXML($m_device);
-$newString = $xml->createXML($o_device);
+// createXML acutally only creates xml structure in a string
+$main_device = $xml->createXML($result[$protectedPost['main_device']]['ID']);
+$other_device = $xml->createXML($result[$protectedPost['other_device']]['ID']);
 
 // demo the no-inline-detail diff
 $inlineResult = DiffHelper::calculate(
-    $oldString,
-    $newString,
+    $main_device,
+    $other_device,
     // options : Unified, Combined, SideBySide, Inline
     'SideBySide',
     $diffOptions,
     // detail levels : word, line, char, none
     ['detailLevel' => 'none'] + $rendererOptions
 );
-
-echo "<br><br>$inlineResult";
-
-// old table display below
-
-/* function getArrayFromXml($xml, $elem) {
-    $xml_device = $xml->createXML($elem);
-    print_r($xml_device, true);
-    $xml_md = simplexml_load_string($xml_device);
-    // encode Xml file into Json
-    $json = json_encode($xml_md);
-    // decode ...
-    $array_md = json_decode($json, TRUE);
-    return $array_md;
-}
-
-$array = getArrayFromXml($xml, $m_device);
-// var_dump($array);
-echo "<br><br>";
-$o_array = getArrayFromXml($xml, $o_device);
-// var_dump($o_device);
-
-echo "<br><br> DIFFERENCES ";
-$diffs = new Difference();
-$diffsV1 = $diffs->getDifferencesV1($array, $o_array);
-// var_dump($diffsV1);
-
-// show main device array
-$mainDeviceTable = new Tabletizer();
-echo $mainDeviceTable->fromArray($array);
-
-
-// create table
-$table = new Tabletizer();
-echo $table->fromArray($diffsV1); */
-
+echo "<div class='col col-md-10' style='overflow-y: auto; height:300px;'><br><br>$inlineResult</div>";
 // -----------------------------------------------------------------
 
 if (AJAX) {