Merge branch 'dev' into 7575_setParking_regExp

modules/worker/back/models/operator.json

@@ -26,29 +26,33 @@
 		},
 		"labelerFk": {
 			"type": "number"
+		},
+		"isOnReservationMode": {
+			"type": "boolean",
+			"required": true
 		}
-    },
+	},
 	"relations": {
-        "sector": {
-            "type": "belongsTo",
-            "model": "Sector",
-            "foreignKey": "sectorFk"
-        },
+		"sector": {
+			"type": "belongsTo",
+			"model": "Sector",
+			"foreignKey": "sectorFk"
+		},
 		"train": {
-            "type": "belongsTo",
-            "model": "Train",
-            "foreignKey": "trainFk"
-        },
+			"type": "belongsTo",
+			"model": "Train",
+			"foreignKey": "trainFk"
+		},
 		"printer": {
-            "type": "belongsTo",
-            "model": "Printer",
-            "foreignKey": "labelerFk"
-        },
+			"type": "belongsTo",
+			"model": "Printer",
+			"foreignKey": "labelerFk"
+		},
 		"itemPackingType": {
-            "type": "belongsTo",
-            "model": "ItemPackingType",
-            "foreignKey": "itemPackingTypeFk",
+			"type": "belongsTo",
+			"model": "ItemPackingType",
+			"foreignKey": "itemPackingTypeFk",
 			"primaryKey": "code"
-        }
-    }
+		}
+	}
 }