From 6609cce06521d4843f4d586a0d89dfafa737b23f Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 15 Mar 2023 12:14:58 +0100 Subject: [PATCH] refs #5056 minHeightBetweenTrays --- db/changes/231001/00-wagon.sql | 3 ++- db/dump/fixtures.sql | 5 +++-- modules/wagon/back/models/wagon-config.json | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/db/changes/231001/00-wagon.sql b/db/changes/231001/00-wagon.sql index 5249c1faf..c7725ab4f 100644 --- a/db/changes/231001/00-wagon.sql +++ b/db/changes/231001/00-wagon.sql @@ -27,7 +27,8 @@ CREATE TABLE `vn`.`wagonConfig` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `width` int(11) unsigned DEFAULT 1350, `height` int(11) unsigned DEFAULT 1900, - `minTrayHeight` int(11) unsigned DEFAULT 50, + `maxWagonHeight` int(11) unsigned DEFAULT 200, + `minHeightBetweenTrays` int(11) unsigned DEFAULT 50, `maxTrays` int(11) unsigned DEFAULT 6, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3; diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 302d16d76..45f90359e 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2821,9 +2821,10 @@ INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `create (1, 1, util.VN_NOW()), (3, 3, util.VN_NOW()); -INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `minTrayHeight`, `maxTrays`) +INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `maxWagonHeight`, `minHeightBetweenTrays`, `maxTrays`) VALUES - (1, 1350, 1900, 50, 6); + (1, 1350, 1900, 200, 50, 6); + INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`) diff --git a/modules/wagon/back/models/wagon-config.json b/modules/wagon/back/models/wagon-config.json index 8bad354f7..3d96e2864 100644 --- a/modules/wagon/back/models/wagon-config.json +++ b/modules/wagon/back/models/wagon-config.json @@ -17,7 +17,10 @@ "height": { "type": "string" }, - "minTrayHeight": { + "maxWagonHeight": { + "type": "number" + }, + "minHeightBetweenTrays": { "type": "number" }, "maxTrays": {