From 798b88caa4f0e899a8bf11cc4b7c2d41accb621f Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 6 Jul 2016 11:56:17 +0200 Subject: [PATCH] Refactor module 'machineDefault' et repo 'machine' pour que soit un param du repo, mais automatiquement rempli par le module --- LICENSE | 184 ++++++++++++++--------------- manager/module/machineDefault.php | 71 +++++++++--- manager/repo/machine.php | 185 +++++++++++++++++++++++++++--- 3 files changed, 314 insertions(+), 126 deletions(-) diff --git a/LICENSE b/LICENSE index 9cecc1d..fe3fb8a 100755 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,11 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. @@ -68,7 +68,7 @@ patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + TERMS AND CONDITIONS 0. Definitions. @@ -211,26 +211,26 @@ and you may offer support or warranty protection for a fee. produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, @@ -249,46 +249,46 @@ of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be @@ -362,28 +362,28 @@ for which you have or can give appropriate copyright permission. add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you @@ -618,9 +618,9 @@ an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -631,31 +631,31 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU General Public License + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands diff --git a/manager/module/machineDefault.php b/manager/module/machineDefault.php index 15c4711..298fe1d 100755 --- a/manager/module/machineDefault.php +++ b/manager/module/machineDefault.php @@ -23,7 +23,11 @@ /* [1] Creation de la machine =========================================================*/ - $create_machine = new Repo('machine/create', [$code, $name]); + $create_machine = new Repo('machine/create', [ + $_SESSION['WAREHOUSE']['id'], + $code, + $name + ]); $id_machine = $create_machine->answer(); // Si une erreur est retournee, on retourne une erreur @@ -31,8 +35,6 @@ return ['ModuleError' => ManagerError::ModuleError]; - - /* [2] Creation du groupe de meme nom que la machine =========================================================*/ $create_group = new Repo('cluster/create', [$name] ); @@ -43,11 +45,14 @@ return ['ModuleError' => ManagerError::ModuleError]; - - /* [3] Association au groupe =========================================================*/ - $assoc_goup = new Repo('cluster/link', [$id_group, $id_machine, clusterRepo::MACHINE_CLASS]); + $assoc_goup = new Repo('cluster/link', [ + $_SESSION['WAREHOUSE']['id'], + $id_group, + $id_machine, + clusterRepo::MACHINE_CLASS] + ); $id_assoc = $assoc_goup->answer(); // Si une erreur est retournee, on retourne une erreur @@ -55,12 +60,11 @@ return ['ModuleError' => ManagerError::ModuleError]; - /* [4] Gestion du retour =========================================================*/ return [ 'ModuleError' => ManagerError::Success, - 'id_machine' => $id_machine, + 'id_machine' => $id_machine, 'id_cluster' => $id_group ]; } @@ -82,7 +86,12 @@ extract($params); /* Creation de l'association */ - $link_machine = new Repo('cluster/link', [$id_cluster, $id_machine, clusterRepo::MACHINE_CLASS]); + $link_machine = new Repo('cluster/link', [ + $_SESSION['WAREHOUSE']['id'], + $id_cluster, + $id_machine, + clusterRepo::MACHINE_CLASS + ]); return []; @@ -105,7 +114,12 @@ extract($params); /* Suppression de l'association */ - $link_machine = new Repo('cluster/unlink', [$id_cluster, $id_machine, clusterRepo::MACHINE_CLASS]); + $link_machine = new Repo('cluster/unlink', [ + $_SESSION['WAREHOUSE']['id'], + $id_cluster, + $id_machine, + clusterRepo::MACHINE_CLASS + ]); return []; @@ -126,7 +140,10 @@ extract($params); // On recupere les donnees - $machine = new Repo('machine/search', [$keywords]); + $machine = new Repo('machine/search', [ + $_SESSION['WAREHOUSE']['id'], + $keywords + ]); return [ 'machines' => $machine->answer() ]; } @@ -142,7 +159,7 @@ */ public static function getAll(){ // On recupere les donnees - $machines = new Repo('machine/getAll'); + $machines = new Repo('machine/getAll', [$_SESSION['WAREHOUSE']['id']]); return [ 'machines' => $machines->answer() ]; } @@ -162,7 +179,10 @@ extract($params); // On recupere les donnees - $request = new Repo('machine/getById', [$id_machine]); + $request = new Repo('machine/getById', [ + $_SESSION['WAREHOUSE']['id'], + $id_machine + ]); $answer = $request->answer(); // Si aucun resultat, on retourne une erreur @@ -188,7 +208,10 @@ extract($params); // On recupere les donnees - $request = new Repo('machine/getByCode', [$code]); + $request = new Repo('machine/getByCode', [ + $_SESSION['WAREHOUSE']['id'], + $code + ]); $answer = $request->answer(); // Si aucun resultat, on retourne une erreur @@ -215,7 +238,10 @@ // On recupere les donnees - $request = new Repo('machine/getByName', [$name]); + $request = new Repo('machine/getByName', [ + $_SESSION['WAREHOUSE']['id'], + $name + ]); $answer = $request->answer(); // Si aucun resultat, on retourne une erreur @@ -241,7 +267,10 @@ extract($params); // On recupere les donnees - $request = new Repo('machine/getClusters', [$id_machine]); + $request = new Repo('machine/getClusters', [ + $_SESSION['WAREHOUSE']['id'], + $id_machine + ]); $answer = $request->answer(); // Si aucun resultat, on retourne une erreur @@ -271,7 +300,10 @@ /* [1] On verifie l'existence de la machine =========================================================*/ - $machine_exists = new Repo('machine/getById', [$id_machine]); + $machine_exists = new Repo('machine/getById', [ + $_SESSION['WAREHOUSE']['id'], + $id_machine + ]); $machine_data = $machine_exists->answer(); // Si on a recupere aucune machine, on retourne une erreur @@ -324,7 +356,10 @@ extract($params); // On recupere les donnees - $request = new Repo('machine/delete', [$id_machine]); + $request = new Repo('machine/delete', [ + $_SESSION['WAREHOUSE']['id'], + $id_machine + ]); $answer = $request->answer(); return [ 'status' => $answer ]; diff --git a/manager/repo/machine.php b/manager/repo/machine.php index 87b0e56..613b921 100755 --- a/manager/repo/machine.php +++ b/manager/repo/machine.php @@ -10,6 +10,7 @@ /* CREATION D'UNE MACHINE * + * @id_warehouse UID de l'entrepot * @code Code de la machine * @name Nom de la machine * @@ -17,7 +18,7 @@ * Renvoie FALSE si une erreur occure * */ - public static function create($code, $name){ + public static function create($id_warehouse, $code, $name){ /* [1] Verification de l'unicite de code+name =========================================================*/ $check_unique = ( self::getByCode($code) === false ); @@ -33,7 +34,7 @@ $insert_machine = Database::getPDO()->prepare("INSERT INTO machine(id_machine, id_warehouse, code, name) VALUES(DEFAULT, :id_warehouse, :code, :name)"); $insert_machine->execute([ - ':id_warehouse' => $_SESSION['WAREHOUSE']['id'], + ':id_warehouse' => $id_warehouse, ':code' => $code, ':name' => $name ]); @@ -57,12 +58,13 @@ /* RENVOIE UNE LISTE DE MACHINE EN FONCTION D'UN MOT CLE * + * @id_warehouse UID de l'entrepot * @keyword Element de recherche * * @return machines Retourne les machines trouvees * */ - public static function search($keyword){ + public static function search($id_warehouse, $keyword){ // On recupere les donnees $searchmachines = Database::getPDO()->prepare("SELECT * FROM machine WHERE id_warehouse = :id_warehouse @@ -72,7 +74,7 @@ "); $searchmachines->execute([ - ':id_warehouse' => $_SESSION['WAREHOUSE']['id'] + ':id_warehouse' => $id_warehouse ]); return Database::delNumeric( $searchmachines->fetchAll() ); @@ -85,22 +87,27 @@ /* RENVOIE LES GROUPES AUQUEL APPARTIENT UNE MACHINE DONNEE * + * @id_warehouse UID de l'entrepot * @id_machine UID de la machine en question * * @return clusters Retourne la liste des groupes auquel appartient la machine * */ - public static function getClusters($id_machine){ + public static function getClusters($id_warehouse, $id_machine){ /* [1] On redige/execute la requete =========================================================*/ - $get_clusters = Database::getPDO()->prepare("SELECT c.* FROM cluster as c, cluster_merge as cm - WHERE cm.id_cluster = c.id_cluster - AND cm.id_entity = :id_machine - AND cm.class = :class + $get_clusters = Database::getPDO()->prepare("SELECT c.* + FROM cluster as c, cluster_merge as cm, machine as m + WHERE cm.id_cluster = c.id_cluster + AND cm.id_entity = m.id_machine + AND m.id_warehouse = :id_warehouse + AND cm.id_entity = :id_machine + AND cm.class = :class ORDER BY c.id_cluster"); $get_clusters->execute([ - ':id_machine' => $id_machine, - ':class' => clusterRepo::MACHINE_CLASS + ':id_warehouse' => $id_warehouse, + ':id_machine' => $id_machine, + ':class' => clusterRepo::MACHINE_CLASS ]); /* [2] On retourne la liste des groupes @@ -117,6 +124,7 @@ /* MODIFICATION D'UNE MACHINE DONNEE * + * @id_warehouse UID de l'entrepot * @id_machine UID de la machine * @code Code RFID de la machine * @name Identifiant l'utilisateur @@ -124,7 +132,7 @@ * @return status Renvoie si oui ou non tout s'est bien passe * */ - public static function edit($id_machine=null, $code=null, $name=null){ + public static function edit($id_warehouse, $id_machine=null, $code=null, $name=null){ /* [1] Verification de l'unicite de code+name (si differents) =========================================================*/ // On recupere les machine ayant le meme code ou name (si existent) @@ -149,7 +157,7 @@ ':code' => $code, ':name' => $name, ':id_machine' => $id_machine, - ':id_warehouse' => $_SESSION['WAREHOUSE']['id'] + ':id_warehouse' => $id_warehouse ]); @@ -175,18 +183,21 @@ /* SUPPRIME UNE MACHINE DONNE * + * @id_warehouse UID de l'entrepot * @id_machine UID de la machine en question * * @return status Retourne si oui ou non la machine a bien ete supprime * */ - public static function delete($id_machine){ + public static function delete($id_warehouse, $id_machine){ /* [1] On redige/execute la requete =========================================================*/ - $delete_machine = Database::getPDO()->prepare("DELETE FROM machine WHERE id_machine = :id_machine AND id_warehouse = :id_warehouse"); + $delete_machine = Database::getPDO()->prepare("DELETE FROM machine + WHERE id_machine = :id_machine + AND id_warehouse = :id_warehouse"); $delete_machine->execute([ ':id_machine' => $id_machine, - ':id_warehouse' => $_SESSION['WAREHOUSE']['id'] + ':id_warehouse' => $id_warehouse ]); @@ -203,6 +214,148 @@ + /* RETOURNE UNE MACHINE SPECIFIQUE + * + * @id_warehouse UID de l'entrepot + * @id_machine UID de la machine + * + * @return machine Données de la machine + * FALSE si aucun résultat + * + */ + public static function getById($id_warehouse, $id_machine){ + /* [1] On rédige/execute la requête + =========================================================*/ + $get = Database::getPDO()->prepare("SELECT m.id_machine, m.code, m.name + FROM machine as m + WHERE m.id_warehouse = :id_warehouse + AND m.id_machine = :id_machine"); + $get->execute([ + ':id_warehouse' => $id_warehouse, + ':id_machine' => $id_machine + ]); + + /* [2] Gestion des données + =========================================================*/ + $found = $get->fetch(); + + // Si aucun résultat + if( $found === false ) + return false; + + return Database::delNumeric( $found ); + } + + + + + + + + + + /* RETOURNE UNE MACHINE SPECIFIQUE + * + * @id_warehouse UID de l'entrepot + * @code Code RFID de la machine + * + * @return machine Données de la machine + * FALSE si aucun résultat + * + */ + public static function getByCode($id_warehouse, $code){ + /* [1] On rédige/execute la requête + =========================================================*/ + $get = Database::getPDO()->prepare("SELECT m.id_machine, m.code, m.name + FROM machine as m + WHERE m.id_warehouse = :id_warehouse + AND m.code = :code"); + $get->execute([ + ':id_warehouse' => $id_warehouse, + ':code' => $code + ]); + + /* [2] Gestion des données + =========================================================*/ + $found = $get->fetch(); + + // Si aucun résultat + if( $found === false ) + return false; + + return Database::delNumeric( $found ); + } + + + + + + + + + + /* RETOURNE UNE MACHINE SPECIFIQUE + * + * @id_warehouse UID de l'entrepot + * @name Nom de la machine + * + * @return machine Données de la machine + * FALSE si aucun résultat + * + */ + public static function getByName($id_warehouse, $name){ + /* [1] On rédige/execute la requête + =========================================================*/ + $get = Database::getPDO()->prepare("SELECT m.id_machine, m.code, m.name + FROM machine as m + WHERE m.id_warehouse = :id_warehouse + AND m.name = :name"); + $get->execute([ + ':id_warehouse' => $id_warehouse, + ':name' => $name + ]); + + /* [2] Gestion des données + =========================================================*/ + $found = $get->fetch(); + + // Si aucun résultat + if( $found === false ) + return false; + + return Database::delNumeric( $found ); + } + + + + + + + + + + /* RETOURNE TOUTES LES MACHINES DE L'ENTREPOT + * + * @id_warehouse UID de l'entrepot + * + * @return machines Données des la machine + * + */ + public static function getAll($id_warehouse){ + /* [1] On rédige/execute la requête + =========================================================*/ + $get = Database::getPDO()->prepare("SELECT m.id_machine, m.code, m.name + FROM machine as m + WHERE m.id_warehouse = :id_warehouse"); + $get->execute([ + ':id_warehouse' => $id_warehouse + ]); + + return Database::delNumeric( $get->fetchAll() ); + } + + +