Merge pull request #18 from delcroip/develop

1.0.1.rc3
delcroip · Jun 18, 2021 · e49b7c1 · e49b7c1
2 parents 86595f7 + baef3c4
commit e49b7c1
Show file tree

Hide file tree

Showing 13 changed files with 564 additions and 589 deletions.
diff --git a/hook.php b/hook.php
@@ -357,4 +357,4 @@ function plugin_openmedis_giveItem($type, $ID, array $data, $num) {
    }
    return "";
 
-}
+}
diff --git a/inc/Item_DeviceMedicalaccessory.class.php b/inc/Item_DeviceMedicalaccessory.class.php
diff --git a/inc/devicemedicalaccessory.class.php b/inc/devicemedicalaccessory.class.php
@@ -53,7 +53,7 @@ function getAdditionalFields() {
             ],
             [
                'name'  => 'plugin_openmedis_medicalaccessorycategories_id',
-               'label' => _n('Model','Models', 1),
+               'label' => _n('Category','Categories', 1),
                'type'  => 'dropdownValue'
             ],
             [

diff --git a/inc/medicalaccessorycategory.class.php b/inc/medicalaccessorycategory.class.php
@@ -55,15 +55,15 @@ function cleanDBonPurge() {
    function getAdditionalFields() {
 
       $tab = [['name'      => 'code',
-                         'label'     => __('code of the category'),
+                         'label'     => __('Code'),
                          'type'      => 'text',
                          'list'      => true],
             ['name'      => 'plugin_openmedis_medicalaccessorycategories_id',
                          'label'     => __('Parent'),
                          'type'      => 'dropdownValue'],
          ['name'      => 'picture',
                          'label'     => __('Picture'),
-                         'type'      => 'picture'],
+                         'type'      => 'picture']
                   ];
 
       if (!Session::haveRightsOr(PluginOpenmedisMedicalAccessoryCategory::$rightname, [CREATE, UPDATE, DELETE])) {
@@ -76,11 +76,28 @@ function getAdditionalFields() {
    function rawSearchOptions() {
       $tab                       = parent::rawSearchOptions();
 
+      $tab[] = [
+         'id'                 => '50',
+         'table'              => $this->getTable(),
+         'field'              => 'code',
+         'name'               => __('Code'),
+         'datatype'           => 'text',
+         'right'              => PluginOpenmedisMedicalAccessoryCategory::$rightname
+      ];
       $tab[] = [
          'id'                 => '80',
-         'table'              => 'code',
+         'table'              => $this->getTable(),
          'field'              => 'name',
-         'name'               => __('Code'),
+         'name'               => __('Name'),
+         'datatype'           => 'text',
+         'right'              => PluginOpenmedisMedicalAccessoryCategory::$rightname
+      ];
+
+      $tab[] = [
+         'id'                 => '100',
+         'table'              => $this->getTable(),
+         'field'              => 'comment',
+         'name'               => __('Comment'),
          'datatype'           => 'text',
          'right'              => PluginOpenmedisMedicalAccessoryCategory::$rightname
       ];
@@ -89,4 +106,4 @@ function rawSearchOptions() {
 
 
 
-}
+}
diff --git a/inc/medicalconsumableitem.class.php b/inc/medicalconsumableitem.class.php
@@ -40,7 +40,7 @@
  * \see  medical consumable
 **/
 class PluginOpenmedisMedicalConsumableItem extends CommonDBTM {
-
+   use Glpi\Features\DCBreadcrumb;
    // From CommonDBTM
    static protected $forward_entity_to = ['MedicalConsumable', 'Infocom'];
    public $dohistory                   = true;
@@ -639,4 +639,4 @@ static function getIcon() {
       return PluginOpenmedisMedicalConsumable::getIcon();
    }
 
-}
+}
diff --git a/inc/medicaldevice.class.php b/inc/medicaldevice.class.php
@@ -38,7 +38,7 @@
  * PluginOpenmedisMedicalDevice Class
 **/
 class PluginOpenmedisMedicalDevice extends CommonDBTM {
-   use DCBreadcrumb;
+   use Glpi\Features\DCBreadcrumb; 
 
    // From CommonDBTM
    public $dohistory                   = true;
@@ -178,7 +178,8 @@ function cleanDBonPurge() {
     *     - withtemplate boolean : template or basic item
     *
     * @return boolean item found
-   **/
+    **/
+
    function showForm($ID, $options = []) {
       global $CFG_GLPI;
       $this->initForm($ID, $options);
@@ -286,14 +287,11 @@ function showForm($ID, $options = []) {
                            'entity' => $this->fields["entities_id"],
                            'right'  => 'all']);
       echo "</td>\n";
-      echo "<td>".__('Management type')."</td>\n";
+      echo "<td>".__('Utilization')."</td>\n";
       echo "<td>";
-  /*    Dropdown::showGlobalSwitch($this->fields["id"],
-                                 ['withtemplate' => $withtemplate,
-                                       'value'        => $this->fields["is_global"],
-                                       'management_restrict'
-                                                      => $CFG_GLPI["medicaldevices_management_restrict"],
-                                       'target'       => $target]);*/
+
+      PluginOpenmedisUtilization::dropdown(['value' => $this->fields["plugin_openmedis_utilizations_id"]]);
+
       echo "</td></tr>\n";
 
       $rowspan        = 2;

diff --git a/inc/medicaldevicecategory.class.php b/inc/medicaldevicecategory.class.php
@@ -48,25 +48,21 @@ static function getTypeName($nb = 0) {
    }
 
 
-   function cleanDBonPurge() {
-      Rule::cleanForItemAction($this);
-   }
-
    function getAdditionalFields() {
 
       $tab = [['name'      => 'code',
-                         'label'     => __('code of the category'),
+                         'label'     => __('Code'),
                          'type'      => 'text',
                          'list'      => true],
-            ['name'      => 'plugin_openmedis_medicaldevicecategories_id',
+            ['name'      => 'plugin_openmedis_medicalaccessorycategories_id',
                          'label'     => __('Parent'),
                          'type'      => 'dropdownValue'],
-            ['name'      => 'picture',
+         ['name'      => 'picture',
                          'label'     => __('Picture'),
                          'type'      => 'picture'],
                   ];
 
-      if (!Session::haveRightsOr('plugin_openmedis_medicaldevicecategory', [CREATE, UPDATE, DELETE])) {
+      if (!Session::haveRightsOr(PluginOpenmedisMedicalDeviceCategory::$rightname, [CREATE, UPDATE, DELETE])) {
 
          unset($tab[7]);
       }
@@ -78,15 +74,31 @@ function rawSearchOptions() {
 
       $tab[] = [
          'id'                 => '80',
-         'table'              => 'code',
+         'table'              => $this->getTable(),
          'field'              => 'name',
+         'name'               => __('Name'),
+         'datatype'           => 'text',
+         'right'              => PluginOpenmedisMedicalDeviceCategory::$rightname
+      ];
+      $tab[] = [
+         'id'                 => '50',
+         'table'              => $this->getTable(),
+         'field'              => 'code',
          'name'               => __('Code'),
          'datatype'           => 'text',
-         'right'              => 'plugin_openmedis'
+         'right'              => PluginOpenmedisMedicalDeviceCategory::$rightname
       ];
+         $tab[] = [
+         'id'                 => '100',
+         'table'              => $this->getTable(),
+         'field'              => 'comment',
+         'name'               => __('Comment'),
+         'datatype'           => 'text',
+         'right'              => PluginOpenmedisMedicalDeviceCategory::$rightname
+      ];
+
       return $tab;
    }
 
 
-
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
        }
        return "";
-    }
+    }