From 07ae92d03ad2ee4e2326bd4fbcbd5ee643a12a38 Mon Sep 17 00:00:00 2001 From: Donovan Lambert Date: Tue, 5 Jan 2021 15:27:42 +0100 Subject: [PATCH] OSS => Premium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 8640b5ef02726bb4b5cdd3c2377e666eaedb3e26 Author: Donovan Date: Tue Jan 5 15:26:34 2021 +0100 Ajoute le champ `park_id` aux unités de matériel (#83) commit 2dc074ab2530db947b7035d1b3d4f3c5c8c2c541 Author: Paul Maillardet Date: Tue Jan 5 11:47:59 2021 +0100 Ajoute des onglets dans la vue du matériel en détail (#82) * Ajoute des onglets dans la vue du matériel en détail * Renomme le Dotfile de développement * Supprime l'affichage des unités dans la vue d'un matériel Co-authored-by: Donovan Lambert commit 27e467d25ce2e5c5e69b72b54f0eb4ada8a0ad13 Merge: d318c40 0b8c817 Author: Paul Maillardet Date: Mon Jan 4 21:37:03 2021 +0100 Merge pull request #80 from Robert-2/feature/material-view Ajoute la vue d'un matériel commit 0b8c817a13bac798d96b88d5e6323c685ff010b0 Author: Paul Maillardet Date: Sun Jan 3 22:27:42 2021 +0100 Corrige selon review commit 33cdf3d8cf9907154d5e25f646e75661d380ea2f Author: Paul Maillardet Date: Thu Dec 31 02:42:06 2020 +0100 Ajoute la vue d'un matériel commit d318c407f4266c7231d4fc66b129fb61c2f62a40 Merge: 985126a 3053393 Author: Paul Maillardet Date: Sat Jan 2 23:18:58 2021 +0100 Merge pull request #81 from Robert-2/feature/improves-validation-2 Améliore (encore) la validation commit 30533932ad9f82df849d1559e6d2f1e6c6efed21 Author: Donovan Lambert Date: Fri Jan 1 16:35:37 2021 +0100 Corrige les tests unitaires vu la nouvelle année (2021) commit 37149e4e202ca2adba2f4415c27d0d0f96f237b5 Author: Donovan Lambert Date: Fri Jan 1 16:14:05 2021 +0100 Améliore (encore) la validation commit 985126a64b611b91a1b4aae2b3b26ee2e2abca51 Merge: acbb5cf de0bcb8 Author: Paul Maillardet Date: Wed Dec 30 14:04:04 2020 +0100 Merge pull request #79 from Robert-2/feature/remove-partial-validation Améliore la validation des modèles commit de0bcb85b7d76a04ae5bbe48798e14cf9c86f5b4 Author: Donovan Lambert Date: Wed Dec 30 12:25:45 2020 +0100 Corrige la validation des modèles commit 57993a98b0e8fd17fdbfddd84995753eb53ae9c3 Author: Donovan Lambert Date: Tue Dec 29 18:56:47 2020 +0100 Amélioration des booléens dans les fixtures commit acbb5cf06131134a1852b6ed69987a3d3bcd95f1 Author: Donovan Date: Tue Dec 29 17:27:42 2020 +0100 Améliore la validation (+ Refactoring modèles) (#76) commit f0bbab2fe77b7b359a3eaef8aabb23823d45a7b5 Author: Donovan Date: Tue Dec 29 11:25:22 2020 +0100 Ajuste la contrainte des unités de matériel dans les événements (#77) (Sera rollback lorsque l'on prendra en charge les guards lors du switch-back Gestion unitaire => Gestion non unitaire) --- ...105140817_add_park_id_in_material_unit.php | 26 +++++++++++++++++++ .../tests/Fixtures/seed/material_units.json | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 server/src/database/migrations/20210105140817_add_park_id_in_material_unit.php diff --git a/server/src/database/migrations/20210105140817_add_park_id_in_material_unit.php b/server/src/database/migrations/20210105140817_add_park_id_in_material_unit.php new file mode 100644 index 000000000..51e8f3efb --- /dev/null +++ b/server/src/database/migrations/20210105140817_add_park_id_in_material_unit.php @@ -0,0 +1,26 @@ +table('material_units'); + $table + ->addColumn('park_id', 'integer', ['after' => 'serial_number']) + ->addForeignKey('park_id', 'parks', 'id', [ + 'delete' => 'CASCADE', + 'update' => 'NO_ACTION', + 'constraint' => 'fk_material_unit_park', + ]) + ->save(); + } + + public function down() + { + $table = $this->table('material_units'); + $table + ->removeColumn('park_id') + ->save(); + } +} diff --git a/server/tests/Fixtures/seed/material_units.json b/server/tests/Fixtures/seed/material_units.json index 00bcd3c4c..b69c46269 100644 --- a/server/tests/Fixtures/seed/material_units.json +++ b/server/tests/Fixtures/seed/material_units.json @@ -2,24 +2,28 @@ { "id": 1, "material_id": 6, + "park_id": 1, "serial_number": "XR18-1", "is_broken": false }, { "id": 2, "material_id": 6, + "park_id": 1, "serial_number": "XR18-2", "is_broken": false }, { "id": 3, "material_id": 6, + "park_id": 2, "serial_number": "XR18-3", "is_broken": true }, { "id": 4, "material_id": 7, + "park_id": 2, "serial_number": "VHCL-1", "is_broken": false }