diff --git a/db/changes/231001/00-wagon.sql b/db/changes/231001/00-wagon.sql index cd945cc46..5249c1faf 100644 --- a/db/changes/231001/00-wagon.sql +++ b/db/changes/231001/00-wagon.sql @@ -1,6 +1,7 @@ CREATE TABLE `vn`.`wagonType` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(30) NOT NULL UNIQUE, + `divisible` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3; @@ -26,8 +27,7 @@ CREATE TABLE `vn`.`wagonConfig` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `width` int(11) unsigned DEFAULT 1350, `height` int(11) unsigned DEFAULT 1900, - `trayStep` int(11) unsigned DEFAULT 50, - `minTrayHeight` int(11) unsigned DEFAULT 200, + `minTrayHeight` 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 488285b6b..302d16d76 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2821,9 +2821,9 @@ INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `create (1, 1, util.VN_NOW()), (3, 3, util.VN_NOW()); -INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `trayStep`, `minTrayHeight`, `maxTrays`) +INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `minTrayHeight`, `maxTrays`) VALUES - (1, 1350, 1900, 50, 200, 6); + (1, 1350, 1900, 50, 6); INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`) diff --git a/modules/wagon/back/models/collectionWagonTicket.json b/modules/wagon/back/models/collection-wagon-ticket.json similarity index 100% rename from modules/wagon/back/models/collectionWagonTicket.json rename to modules/wagon/back/models/collection-wagon-ticket.json diff --git a/modules/wagon/back/models/collectionWagon.json b/modules/wagon/back/models/collection-wagon.json similarity index 100% rename from modules/wagon/back/models/collectionWagon.json rename to modules/wagon/back/models/collection-wagon.json diff --git a/modules/wagon/back/models/wagonConfig.json b/modules/wagon/back/models/wagon-config.json similarity index 88% rename from modules/wagon/back/models/wagonConfig.json rename to modules/wagon/back/models/wagon-config.json index ee33f312e..8bad354f7 100644 --- a/modules/wagon/back/models/wagonConfig.json +++ b/modules/wagon/back/models/wagon-config.json @@ -17,9 +17,6 @@ "height": { "type": "string" }, - "trayStep": { - "type": "number" - }, "minTrayHeight": { "type": "number" }, diff --git a/modules/wagon/back/models/wagonTypeColor.json b/modules/wagon/back/models/wagon-type-color.json similarity index 100% rename from modules/wagon/back/models/wagonTypeColor.json rename to modules/wagon/back/models/wagon-type-color.json diff --git a/modules/wagon/back/models/wagonTypeTray.json b/modules/wagon/back/models/wagon-type-tray.json similarity index 100% rename from modules/wagon/back/models/wagonTypeTray.json rename to modules/wagon/back/models/wagon-type-tray.json diff --git a/modules/wagon/back/models/wagonType.json b/modules/wagon/back/models/wagon-type.json similarity index 82% rename from modules/wagon/back/models/wagonType.json rename to modules/wagon/back/models/wagon-type.json index feb8d046c..f57bf957d 100644 --- a/modules/wagon/back/models/wagonType.json +++ b/modules/wagon/back/models/wagon-type.json @@ -13,6 +13,9 @@ }, "name": { "type": "string" + }, + "divisible": { + "type": "boolean" } } }