From cbc00b90b96797da9672aed997c2f77cd6fe9b53 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Wed, 26 Jun 2024 14:02:25 +0200
Subject: [PATCH 1/2] feat front-reservas refs #6861

---
 modules/worker/back/models/operator.json | 44 +++++++++++++-----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json
index a2f3ee01c3..d4832bccfd 100644
--- a/modules/worker/back/models/operator.json
+++ b/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"
-        }
-    }
-}
+		}
+	}
+}
\ No newline at end of file

From 3ad23465042d1476ce47f97c403a7752a489640e Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 1 Jul 2024 09:25:00 +0200
Subject: [PATCH 2/2] feat refactor setParking REGEXP refs #7575

---
 db/routines/vn/procedures/setParking.sql | 66 ++++++++++++------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/db/routines/vn/procedures/setParking.sql b/db/routines/vn/procedures/setParking.sql
index 97a40bbe0c..d6def07de2 100644
--- a/db/routines/vn/procedures/setParking.sql
+++ b/db/routines/vn/procedures/setParking.sql
@@ -22,40 +22,42 @@ proc: BEGIN
 		CALL util.throw('parkingNotExist');
 		LEAVE proc;
 	END IF;
+	
+	IF  vParam REGEXP '^[0-9]+$' THEN
+		-- Se comprueba si es una preparación previa
+		SELECT COUNT(*) INTO vIsSaleGroup
+			FROM vn.saleGroup sg
+			WHERE sg.id = vParam;
 
-	-- Se comprueba si es una preparación previa
-	SELECT COUNT(*) INTO vIsSaleGroup
-		FROM vn.saleGroup sg
-		WHERE sg.id = vParam;
+		IF vIsSaleGroup THEN
+			CALL vn.saleGroup_setParking(vParam, vParkingFk);
+			LEAVE proc;
+		END IF;
 
-	IF vIsSaleGroup THEN
-		CALL vn.saleGroup_setParking(vParam, vParkingFk);
-		LEAVE proc;
+		-- Se comprueba si es un ticket
+		SELECT COUNT(*) INTO vIsTicket
+			FROM vn.ticket t
+			WHERE t.id = vParam
+				AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+
+		IF vIsTicket THEN
+			CALL vn.ticket_setParking(vParam, vParkingFk);
+			LEAVE proc;
+		END IF;
+
+		-- Se comprueba si es una coleccion de tickets
+		SELECT COUNT(*) INTO vIsCollection
+			FROM vn.collection c
+			WHERE c.id = vParam
+				AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+
+		IF vIsCollection THEN
+			CALL vn.collection_setParking(vParam, vParkingFk);
+			LEAVE proc;
+		END IF;
+	ELSE
+		-- Por descarte, se considera una matrícula
+		CALL vn.shelving_setParking(vParam, vParkingFk);
 	END IF;
-
-	-- Se comprueba si es un ticket
-	SELECT COUNT(*) INTO vIsTicket
-		FROM vn.ticket t
-		WHERE t.id = vParam
-			AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-	IF vIsTicket THEN
-		CALL vn.ticket_setParking(vParam, vParkingFk);
-		LEAVE proc;
-	END IF;
-
-	-- Se comprueba si es una coleccion de tickets
-	SELECT COUNT(*) INTO vIsCollection
-		FROM vn.collection c
-		WHERE c.id = vParam
-			AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-	IF vIsCollection THEN
-		CALL vn.collection_setParking(vParam, vParkingFk);
-		LEAVE proc;
-	END IF;
-
-	-- Por descarte, se considera una matrícula
-	CALL vn.shelving_setParking(vParam, vParkingFk);
 END$$
 DELIMITER ;