Version 3.1.0

pluginsGLPI · Feb 5, 2017 · 70ee75d · 70ee75d
2 parents 7004d9a + 6a5b1b5
commit 70ee75d
Show file tree

Hide file tree

Showing 27 changed files with 178 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,35 @@
+Room Management plugin for [GLPI](www.glpi-project.org)
+=======================================================
+
+This is a plugin to add room management feature to [**GLPI** assets inventory
+software](http://glpi-project.org).
+
+Description
+-----------
+
+This plugin allows you to manage the rooms and the elements that are included
+in. A room is not the same as a location that already exists in GLPI because it
+can not contain items nor be loaned (which a room can be).
+
+Installation
+------------
+
+This plugins installs as any other GLPI plugin.
+
+1. Place the current source code tree in a directory named `room` and move this
+   one inside the `plugins` directory of your GLPI installation.
+2. Go to *Setup* > *Plugins*.
+3. Look for the *Room Management* plugin's row.
+4. Click on the *Install* button.
+5. Click on the *Enable* button.
+
+Uninstallation
+--------------
+
+This plugins uninstalls as any other GLPI plugin.
+
+1. Go to *Setup* > *Plugins*.
+2. Look for the *Room Management* plugin's row.
+3. Click on the *Disnable* button.
+4. Click on the *Uninstall* button.
+5. Delete the `plugins/room` directory of your GLPI installation.
diff --git a/README.txt b/README.txt
diff --git a/ajax/room.tabs.php b/ajax/room.tabs.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/dropdown1.form.php b/front/dropdown1.form.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/dropdown1.php b/front/dropdown1.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/profile.form.php b/front/profile.form.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/room.form.php b/front/room.form.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: room.form.php 37 2009-01-06 18:41:29Z moyo $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/front/room.php b/front/room.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: index.php 39 2009-03-02 15:31:11Z remi $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/front/roomaccesscond.form.php b/front/roomaccesscond.form.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/roomaccesscond.php b/front/roomaccesscond.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/roomtype.form.php b/front/roomtype.form.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/front/roomtype.php b/front/roomtype.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-03-03 21:49 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/hook.php b/hook.php
@@ -1,7 +1,6 @@
 <?php
 
 /*
- * @version $Id$
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -74,6 +73,7 @@ function plugin_room_install() {
                 `state` smallint(6) NOT NULL default '0', # not used / for reservation search engine
                 `manufacturers_id` smallint(6) NOT NULL default '0', # not used / for reservation search engine
                 `groups_id` smallint(6) NOT NULL default '0', # not used / for reservation search engine
+                `groups_id_tech` int(11)  NOT NULL default '0' COMMENT 'Group in charge of the hardware. RELATION to glpi_groups (id)',
                 PRIMARY KEY  (`id`),
                 KEY `entities_id` (`entities_id`),
                 KEY `is_deleted` (`is_deleted`),
@@ -86,6 +86,10 @@ function plugin_room_install() {
                 KEY `users_id` (`users_id`)
                 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ;";
       $DB->query($query) or die("error adding glpi_plugin_room table " . __('Error during the database update') . $DB->error());
+   } elseif (!FieldExists('glpi_plugin_room_rooms', 'groups_id_tech')) { // Mise à jour entre 3.0.4 et 3.1.0; la table existe, mais il manque "groups_id_tech"
+      $query = "ALTER TABLE `glpi_plugin_room_rooms`
+                    ADD COLUMN `groups_id_tech` INT NOT NULL DEFAULT '0' COMMENT 'Group in charge of the hardware. RELATION to glpi_groups (id)' AFTER `groups_id`;";
+      $result = $DB->query($query) or die('Error when adding `glpi_plugin_room_rooms`.`groups_id_tech` field. ' . __('Error during the database update') . $DB->error());
    } elseif (FieldExists('glpi_plugin_room_rooms', 'FK_users')) { // mise à jour depuis 3.0.0 Beta; la table existe, mais avec les mauvais noms de champs
       $upgradeFrom3Beta = true;
       $query = "alter TABLE  `glpi_plugin_room_rooms`
@@ -99,6 +103,9 @@ function plugin_room_install() {
                    ADD KEY `users_id` ( `users_id` );";
          $result = $DB->query($query) or die("error renaming glpi_plugin_room fields from Beta version " . __('Error during the database update') . $DB->error());
       }
+      $query = "ALTER TABLE `glpi_plugin_room_rooms`
+                    ADD COLUMN `groups_id_tech` INT NOT NULL DEFAULT '0' COMMENT 'Group in charge of the hardware. RELATION to glpi_groups (id)' AFTER `groups_id`;";
+      $result = $DB->query($query) or die('Error when adding `glpi_plugin_room_rooms`.`groups_id_tech` field. ' . __('Error during the database update') . $DB->error());
 
    }
    if (TableExists('glpi_plugin_room')) { // il existe une table correspondant à l'ancienne nomenclature; voir à transférer les enregistrement contenus dans celle-ci.
@@ -351,22 +358,24 @@ function plugin_room_install() {
 function plugin_room_uninstall() {
    global $DB;
 
-   $query = 'DROP TABLE `glpi_plugin_room_rooms_computers`';
+   $query = 'DROP TABLE IF EXISTS `glpi_plugin_room_rooms_computers`';
    $DB->query($query);
-   $query = 'DROP TABLE `glpi_plugin_room_roomtypes`';
+   $query = 'DROP TABLE IF EXISTS `glpi_plugin_room_roomtypes`';
    $DB->query($query);
-   $query = 'DROP TABLE `glpi_plugin_room_roomaccessconds`';
+   $query = 'DROP TABLE IF EXISTS `glpi_plugin_room_roomaccessconds`';
    $DB->query($query);
-   $query = 'DROP TABLE `glpi_plugin_room_dropdown1s`';
+   $query = 'DROP TABLE IF EXISTS `glpi_plugin_room_dropdown1s`';
    $DB->query($query);
-   $query = 'DROP TABLE `glpi_plugin_room_rooms`';
+   $query = 'DROP TABLE IF EXISTS `glpi_plugin_room_rooms`';
    $DB->query($query);
 
    $tables_glpi = array(
       "glpi_displaypreferences",
       "glpi_documents_items",
       "glpi_bookmarks",
-      "glpi_logs"
+      "glpi_logs",
+      'glpi_items_tickets',
+      'glpi_reservationitems',
    );
 
    foreach ($tables_glpi as $table_glpi)
@@ -569,4 +578,13 @@ function plugin_room_MassiveActionsProcess($data) {
    }
 }
 
+function plugin_room_AssignToTicket($types) {
+   global $LANG;
+
+   if (in_array('PluginRoomRoom', $_SESSION['glpiactiveprofile']['helpdesk_item_type'])) {
+      $types['PluginRoomRoom'] = $LANG['plugin_room'][0];
+   }
+   return $types;
+}
+
 ?>
diff --git a/inc/dropdown1.class.php b/inc/dropdown1.class.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-02-24 00:12 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/inc/menu.class.php b/inc/menu.class.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id$
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/inc/profile.class.php b/inc/profile.class.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id$
  * -------------------------------------------------------------------------
  * Room plugin for GLPI
  * Copyright (C) 2003-2011 by the certificates Development Team.

diff --git a/inc/room.class.php b/inc/room.class.php
@@ -1,7 +1,6 @@
 <?php
 
 /*
- * @version $Id: plugin_room.class.php 40 2009-03-04 07:00:56Z remi $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -87,6 +86,13 @@ function getSearchOptions() {
       $tab[2]['linkfield'] = 'type';
       $tab[2]['name'] = __('Type');
 
+      $tab[26]['table']           = 'glpi_groups';
+      $tab[26]['field']           = 'completename';
+      $tab[26]['linkfield']       = 'groups_id_tech';
+      $tab[26]['name']            = __('Group in charge of the hardware');
+      $tab[26]['condition']       = '`is_assign`';
+      $tab[26]['datatype']        = 'dropdown';
+
       $tab[24]['table'] = 'glpi_users';
       $tab[24]['field'] = 'name';
       $tab[24]['linkfield'] = 'tech_num';
@@ -307,7 +313,17 @@ function showForm($ID, $options = array()) {
       echo "<tr class='tab_bg_1'><td>" . $LANG['plugin_room'][4] . ":		</td>";
       echo "<td>";
       Dropdown::showInteger("size", $this->fields["size"], 0, 500);
-      echo "</td><td colspan='2'>&nbsp;</td></tr>";
+      echo "</td>";
+
+      // Dropdown du Groupe responsable technique
+      echo '<td>' . __('Group in charge of the hardware') . '</td><td>';
+      Group::dropdown([
+         'name'      => 'groups_id_tech',
+         'value'     => $this->fields['groups_id_tech'],
+         'entity'    => $this->fields['entities_id'],
+         'condition' => '`is_assign`'
+      ]);
+      echo '</td></tr>';
 
       // Date d'achat
       echo "<tr class='tab_bg_1'><td>" . __('Date of purchase') . ":		</td>";

diff --git a/inc/room_computer.class.php b/inc/room_computer.class.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: room_computer.class.php 17154 2012-01-24 11:27:36Z moyo $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2012 by the INDEPNET Development Team.

diff --git a/inc/roomaccesscond.class.php b/inc/roomaccesscond.class.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2009-09-21 14:58 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/inc/roomtype.class.php b/inc/roomtype.class.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: HEADER 1 2010-02-24 00:12 Tsmr $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2010 by the INDEPNET Development Team.

diff --git a/index.php b/index.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id$
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/locales/de_DE.php b/locales/de_DE.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id: fr_FR.php 8382 2009-01-06 18:41:29Z moyo $
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/locales/en_GB.php b/locales/en_GB.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id$
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/locales/fr_FR.php b/locales/fr_FR.php
@@ -1,6 +1,5 @@
 <?php
 /*
- * @version $Id$
  * -------------------------------------------------------------------------
  * GLPI - Gestionnaire Libre de Parc Informatique
  * Copyright (C) 2003-2009 by the INDEPNET Development Team.

diff --git a/room.png b/room.png
diff --git a/room.xml b/room.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+    <name>Room Management</name>
+    <key>room</key>
+    <state>stable</state>
+    <logo>https://raw.githubusercontent.com/pluginsGLPI/room/master/room.png</logo>
+    <description>
+        <short>
+            <en><![CDATA[Manage room and included hardwares (such as classrooms)]]></en>
+            <fr><![CDATA[Gestion des pièces/salles et des éléments inclus (comme des salles de classe)]]></fr>
+        </short>
+        <long>
+            <en><![CDATA[This plugin allows you to manage the rooms and the elements that are included in. A room is not the same as a location that already exists in GLPI because it can not contain items nor be loaned (which a room can be).]]></en>
+            <fr><![CDATA[Ce plugin vous permettra de gérer les pièces/salles et les éléments qui les composent. La notion de salle n'est pas la même que la notion de lieu déjà existante dans GLPI car cette dernière ne peut contenir des matériels ni être réservée (ce qu'une salle peut être).]]></fr>
+        </long>
+    </description>
+    <homepage>https://github.com/pluginsGLPI/room</homepage>
+    <download>https://github.com/pluginsGLPI/room/releases</download>
+    <issues>https://github.com/pluginsGLPI/room/issues</issues>
+    <readme>https://raw.githubusercontent.com/pluginsGLPI/room/master/README.md</readme>
+    <authors>
+        <author>Julien Dombre</author>
+        <author>bogucool</author>
+        <author>Pascal Marier-Dionne</author>
+        <author>Claude Duvergier</author>
+    </authors>
+    <versions>
+        <version>
+            <num>1.0</num>
+            <compatibility>0.71</compatibility>
+        </version>
+        <version>
+            <num>2.0</num>
+            <compatibility>0.72</compatibility>
+        </version>
+        <version>
+            <num>2.1</num>
+            <compatibility>0.72</compatibility>
+        </version>
+        <version>
+            <num>3.0.1</num>
+            <compatibility>0.80</compatibility>
+        </version>
+        <version>
+            <num>3.0.2</num>
+            <compatibility>0.80.7</compatibility>
+        </version>
+        <version>
+            <num>3.0.3</num>
+            <compatibility>0.84</compatibility>
+        </version>
+        <version>
+            <num>3.0.4b1</num>
+            <compatibility>0.85</compatibility>
+        </version>
+        <version>
+            <num>3.0.4b2</num>
+            <compatibility>0.85</compatibility>
+            <compatibility>0.90</compatibility>
+        </version>
+        <version>
+            <num>3.1.0</num>
+            <compatibility>0.85</compatibility>
+            <compatibility>0.90</compatibility>
+            <compatibility>9.1</compatibility>
+            <compatibility>9.1.1</compatibility>
+        </version>
+    </versions>
+    <langs>
+        <lang>de_DE</lang>
+        <lang>en_GB</lang>
+        <lang>fr_FR</lang>
+        <lang>it_IT</lang>
+    </langs>
+    <license>GPL v2+</license>
+    <tags>
+        <en>
+            <tag>Places</tag>
+            <tag>Inventory</tag>
+            <tag>Management</tag>
+            <tag>Reservation</tag>
+        </en>
+        <lang>
+            <tag>Lieux</tag>
+            <tag>Inventaire</tag>
+            <tag>Gestion</tag>
+            <tag>Réservation</tag>
+        </lang>
+    </tags>
+</root>