remove error in glpi 10

delcroip · Mar 13, 2022 · 53fbc3b · 53fbc3b
1 parent 13ffd80
commit 53fbc3b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 31 deletions.
diff --git a/hook.php b/hook.php
@@ -73,6 +73,8 @@ function plugin_openmedis_postinit() {
    $plugin = new Plugin();
    if ($plugin->isInstalled('order') && $plugin->isActivated('order')) {
       array_push($ORDER_TYPES, 'PluginOpenmedisMedicalDevice');
+      array_push($ORDER_TYPES , 'PluginOpenmedisMedicalConsumableItem');
+      array_push($ORDER_TYPES , 'PluginOpenmedisDeviceMedicalAccessory');
    }
    if ($plugin->isInstalled('fields') && $plugin->isActivated('fields')) {
       array_push($PLUGIN_HOOKS['plugin_fields'] , 'PluginOpenmedisMedicalDevice');
@@ -82,6 +84,7 @@ function plugin_openmedis_postinit() {
 
 
 }
+
 /**
  * @param string $type
  * @return array
@@ -179,9 +182,6 @@ function plugin_openmedis_getDropdown() {
    }
 }
 
-
-
-
 function plugin_openmedis_getAddSearchOptions($itemtype) {
    $sopt = [];
 
@@ -234,8 +234,6 @@ function plugin_openmedis_addLeftJoin($type, $ref_table, $new_table,
    return "";
 }
 
-
-
 // Hook done on purge item case
 function plugin_openmedis_item_purge($item) {
    $type = get_class($item);

diff --git a/inc/medicalconsumableitem.class.php b/inc/medicalconsumableitem.class.php
@@ -93,10 +93,10 @@ function cleanDBonPurge() {
 
    function post_getEmpty() {
 
-      $this->fields["alarm_threshold"] = Entity::getUsedConfig("plugin_openmedis_medicalconsumables_alert_repeat",
+      /*FIXME $this->fields["alarm_threshold"] = Entity::getUsedConfig("plugin_openmedis_medicalconsumables_alert_repeat",
                                                                $this->fields["entities_id"],
                                                                "plugin_openmedis_default_medicalconsumables_alarm_threshold",
-                                                               10);
+                                                               10);*/
    }
 
 
@@ -185,7 +185,7 @@ function showForm($ID, $options = []) {
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Name')."</td>";
       echo "<td>";
-      Html::autocompletionTextField($this, "name");
+      echo Html::input("name");
       echo "</td>";
       echo "<td>"._n('Type', 'Types', 1)."</td>";
       echo "<td>";
@@ -195,7 +195,7 @@ function showForm($ID, $options = []) {
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Reference')."</td>";
       echo "<td>";
-      Html::autocompletionTextField($this, "ref");
+      echo Html::input("ref");
       echo "</td>";
       echo "<td>".Manufacturer::getTypeName(1)."</td>";
       echo "<td>";
@@ -296,8 +296,8 @@ function rawSearchOptions() {
          'massiveaction'      => false,
          'nosearch'           => true,
          'nosort'             => true,
-         'additionalfields'   => ['alarm_threshold']*/
-      ];
+         'additionalfields'   => ['alarm_threshold']
+      ];*/
 
       $tab[] = [
          'id'                 => '17',

diff --git a/inc/medicaldevice.class.php b/inc/medicaldevice.class.php
@@ -39,7 +39,8 @@
 **/
 class PluginOpenmedisMedicalDevice extends CommonDBTM {
    use Glpi\Features\DCBreadcrumb; 
-
+   //use Glpi\Features\Clonable;
+   use Glpi\Features\Inventoriable;
    // From CommonDBTM
    public $dohistory                   = true;
    // used to filter the categories
@@ -230,7 +231,7 @@ function showForm($ID, $options = []) {
       ]);
       echo "</td></tr>\n";
 
-      $this->showDcBreadcrumb();
+
 
       echo "<tr class='tab_bg_1'>";
       $tplmark = $this->getAutofillMark('name', $options);
@@ -243,7 +244,7 @@ function showForm($ID, $options = []) {
       $objectName = autoName($this->fields["name"], "name",
                              (isset($options['withtemplate']) && ($options['withtemplate'] == 2)),
                              $this->getType(), $this->fields["entities_id"]);
-      Html::autocompletionTextField($this, "name", ['value' => $objectName]);
+      echo Html::input( "name", ['value' => $objectName]);
       echo "</td>\n";
       echo "<td>".__('Location')."</td>\n";
       echo "<td>";
@@ -289,17 +290,17 @@ function showForm($ID, $options = []) {
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Alternate username number')."</td>\n";
       echo "<td>";
-      Html::autocompletionTextField($this, "contact_num");
+      echo Html::input("contact_num");
       echo "</td>";
       echo "<td>".__('Serial number')."</td>\n";
       echo "<td>";
-      Html::autocompletionTextField($this, "serial");
+      echo Html::input("serial");
       echo "</td></tr>\n";
 
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Alternate username')."</td>\n";
       echo "<td>";
-      Html::autocompletionTextField($this, "contact");
+      echo Html::input("contact");
       echo "</td>\n";
 
       $tplmark = $this->getAutofillMark('otherserial', $options);
@@ -309,7 +310,7 @@ function showForm($ID, $options = []) {
       $objectName = autoName($this->fields["otherserial"], "otherserial",
                              (isset($options['withtemplate']) && ($options['withtemplate'] == 2)),
                              $this->getType(), $this->fields["entities_id"]);
-      Html::autocompletionTextField($this, "otherserial", ['value' => $objectName]);
+      echo Html::input("otherserial", ['value' => $objectName]);
       echo "</td></tr>\n";
 
       echo "<tr class='tab_bg_1'>";
@@ -344,7 +345,7 @@ function showForm($ID, $options = []) {
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Brand')."</td>\n";
       echo "<td>";
-      Html::autocompletionTextField($this, "brand");
+      echo Html::input("brand");
       echo "</td>\n";
       echo "</tr>\n";
 
@@ -356,7 +357,7 @@ function showForm($ID, $options = []) {
       $objectName = autoName($this->fields["barcode"], "barcode",
                              (isset($options['withtemplate']) && ($options['withtemplate'] == 2)),
                              $this->getType(), $this->fields["entities_id"]);
-      Html::autocompletionTextField($this, "barcode", ['value' => $objectName]);
+      echo Html::input("barcode", ['value' => $objectName]);
       echo "</td></tr>\n";
 
 
@@ -527,15 +528,6 @@ function rawSearchOptions() {
          'condition'          => ['is_visible_medicaldevice' => 1]
       ];
 
-      $tab[] = [
-         'id'                 => '5',
-         'table'              => $this->getTable(),
-         'field'              => 'serial',
-         'name'               => __('Serial number'),
-         'datatype'           => 'string',
-         'autocomplete'       => true,
-      ];
-
       $tab[] = [
          'id'                 => '6',
          'table'              => $this->getTable(),

diff --git a/inc/medicaldevicecategory.class.php b/inc/medicaldevicecategory.class.php
@@ -154,15 +154,15 @@ function showForm($ID, $options = []) {
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Code')."</td>\n";
       echo "<td>";
-      Html::autocompletionTextField($this, "code");
+      echo Html::input("code");
       echo "</td>\n";
       echo "</tr>\n";
 
 
       echo "<tr class='tab_bg_1'>";
       echo "<td>".__('Label')."</td>\n";
       echo "<td>";
-      Html::autocompletionTextField($this, "label");
+      echo Html::input("label");
       echo "</td>\n";
       echo "</tr>\n";