Merge branch 'dev' into 5926_pda_worker_docuware

back/methods/mrw-config/cancelShipment.js

@@ -39,8 +39,6 @@ module.exports = Self => {
         const xmlString = response.data;
         const parser = new DOMParser();
         const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
-        const [resultElement] = xmlDoc.getElementsByTagName('Mensaje');
-
-        return resultElement.textContent;
+        return xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
     };
 };

back/methods/mrw-config/createShipment.js

@@ -42,7 +42,8 @@ module.exports = Self => {
             throw new UserError(`Some mrwConfig parameters are not set`);
 
         const query =
-            `SELECT CASE co.code 
+            `SELECT 
+                CASE co.code 
                     WHEN 'ES' THEN a.postalCode
                     WHEN 'PT' THEN LEFT(a.postalCode, 4)
                     WHEN 'AD' THEN REPLACE(a.postalCode, 'AD', '00')
@@ -89,14 +90,9 @@ module.exports = Self => {
         const getLabelResponse = await sendXmlDoc('getLabel', {mrw, shipmentId}, 'text/xml');
         const file = getTextByTag(getLabelResponse, 'EtiquetaFile');
 
-        try {
-            await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
-            if (tx) await tx.commit();
-        } catch (error) {
-            if (tx) await tx.rollback();
-            throw error;
-        }
-        return file;
+        if (tx) await tx.commit();
+
+        return {shipmentId, file};
     };
 
     function getTextByTag(xmlDoc, tag) {

back/methods/mrw-config/specs/createShipment.spec.js

@@ -81,9 +81,9 @@ describe('MRWConfig createShipment()', () => {
 
         spyOn(axios, 'post').and.callFake(() => Promise.resolve(mockPostResponses.pop()));
 
-        const base64Binary = await models.MrwConfig.createShipment(expedition1.id, options);
+        const {file} = await models.MrwConfig.createShipment(expedition1.id, options);
 
-        expect(base64Binary).toEqual(mockBase64Binary);
+        expect(file).toEqual(mockBase64Binary);
     });
 
     it('should fail if mrwConfig has no data', async() => {

db/.pullinfo.json

@@ -9,7 +9,7 @@
     },
     "vn": {
       "view": {
-        "expeditionPallet_Print": "288cbd6e8289df083ed5eb1a2c808f7a82ba4c90c8ad9781104808a7a54471fb"
+        "expeditionPallet_Print": "06613719475fcdba8309607c38cc78efc2e348cca7bc96b48dc3ae3c12426f54"
       }
     }
   }

db/routines/vn/events/client_userDisable.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`client_userDisable`
+	ON SCHEDULE EVERY 1 MONTH
+		STARTS '2023-06-01 00:00:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL client_userDisable()$$
+DELIMITER ;

db/routines/vn/events/clientsDisable.sql

@@ -1,25 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
-	ON SCHEDULE EVERY 1 MONTH
-		STARTS '2023-06-01 00:00:00.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO BEGIN
-	UPDATE account.user u
-			JOIN client c ON c.id = u.id
-			LEFT JOIN account.account a ON a.id = u.id
-		SET u.active = FALSE
-		WHERE c.typeFk = 'normal'
-			AND a.id IS NULL
-			AND u.active
-			AND c.created < util.VN_CURDATE() - INTERVAL 12 MONTH 
-			AND u.id NOT IN (
-				SELECT DISTINCT c.id
-					FROM client c
-						LEFT JOIN ticket t ON t.clientFk = c.id
-					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL 12 MONTH 
-						OR shipped > util.VN_CURDATE() - INTERVAL 12 MONTH 
-				);
-END$$
-DELIMITER ;

db/routines/vn/procedures/buy_clone.sql

@@ -19,7 +19,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				price1,
@@ -41,7 +40,6 @@ BEGIN
 					b.packing,
 					b.`grouping`,
 					b.groupingMode,
-					b.containerFk,
 					b.comissionValue,
 					b.packageValue,
 					b.price1,

db/routines/vn/procedures/client_userDisable.sql

@@ -0,0 +1,33 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_userDisable`()
+BEGIN
+/**
+* Desactiva los clientes inactivos en los últimos X meses.
+*/
+	DECLARE vMonths INT;
+
+	SELECT monthsToDisableUser INTO vMonths
+		FROM clientConfig;
+
+	IF vMonths IS NULL THEN
+		CALL util.throw('Config parameter not set');
+	END IF;
+
+	UPDATE account.user u
+			JOIN client c ON c.id = u.id
+			LEFT JOIN account.account a ON a.id = u.id
+		SET u.active = FALSE
+		WHERE c.typeFk = 'normal'
+			AND a.id IS NULL
+			AND u.active
+			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH 
+			AND u.id NOT IN (
+				SELECT DISTINCT c.id
+					FROM client c
+						LEFT JOIN ticket t ON t.clientFk = c.id
+					WHERE c.salesPersonFk IS NOT NULL
+						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+			);
+END$$
+DELIMITER ;

db/routines/vn/procedures/entry_fixMisfit.sql

@@ -26,7 +26,6 @@ BEGIN
 			packing,
 			`grouping`,
 			groupingMode,
-			containerFk,
 			comissionValue,
 			packageValue,
 			location,
@@ -46,7 +45,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				location,

db/routines/vn/procedures/entry_moveNotPrinted.sql

@@ -56,7 +56,6 @@ BEGIN
 			packing,
 			`grouping`,
 			groupingMode,
-			containerFk,
 			comissionValue,
 			packageValue,
 			packagingFk,
@@ -77,7 +76,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				packagingFk,
@@ -114,7 +112,6 @@ BEGIN
 					packing,
 					`grouping`,
 					groupingMode,
-					containerFk,
 					comissionValue,
 					packageValue,
 					location,
@@ -133,7 +130,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				location,

db/routines/vn/procedures/entry_splitByShelving.sql

@@ -76,7 +76,6 @@ BEGIN
 								packing,
 								`grouping`,
 								groupingMode,
-								containerFk,
 								comissionValue,
 								packageValue,
 								location,
@@ -103,7 +102,6 @@ BEGIN
 							packing,
 							`grouping`,
 							groupingMode,
-							containerFk,
 							comissionValue,
 							packageValue,
 							location,

db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql

@@ -18,11 +18,12 @@ BEGIN
 			JOIN vn.parking p ON p.id = sh.parkingFk
 			JOIN vn.sector sc ON sc.id = p.sectorFk
 			JOIN vn.warehouse w ON w.id = sc.warehouseFk
-		WHERE sc.id = vSectorFk
-			AND ish.visible > 0
+		WHERE ish.visible > 0
 			AND ish.itemFk = vItemFk
 		GROUP BY ish.id
-		ORDER BY sh.priority DESC,
+		ORDER BY 
+			(sc.id = vSectorFk) DESC,
+			sh.priority DESC,
 			ish.created, 
 			p.pickingOrder;
 END$$

db/routines/vn/procedures/item_devalueA2.sql

@@ -319,7 +319,6 @@ BEGIN
 			packing,
 			`grouping`,
 			groupingMode,
-			containerFk,
 			comissionValue,
 			packageValue,
 			price1,
@@ -341,7 +340,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				price1,
@@ -366,7 +364,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				price1,

db/routines/vn/procedures/supplierPackaging_ReportSource.sql

@@ -151,8 +151,8 @@ BEGIN
 			supplier,
 			entryFk,
 			landed,
-			`in`,
-			`out`,
+			CAST(`in` AS DECIMAL(10,0)) `in`,
+			CAST(`out` AS DECIMAL(10,0)) `out`,
 			warehouse,
 			buyingValue,
 			balance

db/routines/vn2008/views/Compres.sql

@@ -28,6 +28,5 @@ AS SELECT `c`.`id` AS `Id_Compra`,
 	`c`.`workerFk` AS `Id_Trabajador`,
 	`c`.`weight` AS `weight`,
 	`c`.`dispatched` AS `dispatched`,
-	`c`.`containerFk` AS `container_id`,
 	`c`.`itemOriginalFk` AS `itemOriginalFk`
 FROM `vn`.`buy` `c`

db/versions/11055-wheatPaniculata/00-firstScript.sql

@@ -0,0 +1,5 @@
+ALTER TABLE vn.clientConfig
+    ADD monthsToDisableUser int(10) unsigned DEFAULT NULL NULL;
+
+UPDATE IGNORE vn.clientConfig
+    SET monthsToDisableUser = 12;

db/versions/11057-chocolateMoss/00-part.sql

@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS vn2008.scanTree__;
+DROP TABLE IF EXISTS vn2008.payroll_embargos__;
+DROP TABLE IF EXISTS vn2008.unary_source__;
+DROP TABLE IF EXISTS vn2008.unary_scan_line_buy__;
+DROP TABLE IF EXISTS vn2008.unary_scan_line__;
+DROP TABLE IF EXISTS vn2008.unary_scan__;
+DROP TABLE IF EXISTS vn2008.scan_line__;
+DROP TABLE IF EXISTS vn2008.Familias__;
+DROP TABLE IF EXISTS vn2008.language__;
+DROP TABLE IF EXISTS vn2008.Clientes_dits__;
+DROP TABLE IF EXISTS vn2008.unary_scan_line_expedition__;
+DROP TABLE IF EXISTS vn2008.warehouse_group__;
+DROP TABLE IF EXISTS vn2008.Espionajes__;
+DROP TABLE IF EXISTS vn2008.jerarquia__;
+DROP TABLE IF EXISTS vn2008.wks__;
+DROP TABLE IF EXISTS vn2008.Proveedores_comunicados__;
+DROP TABLE IF EXISTS vn2008.integra2_escala__;
+DROP TABLE IF EXISTS vn2008.cp__;
+DROP TABLE IF EXISTS vn2008.unary__;
+DROP TABLE IF EXISTS vn2008.Estados__;
+DROP TABLE IF EXISTS vn2008.agency_hour__;
+DROP TABLE IF EXISTS vn2008.Reservas__;
+DROP TABLE IF EXISTS vn2008.cyc_declaration__;
+DROP TABLE IF EXISTS vn2008.route__;
+DROP TABLE IF EXISTS vn2008.Proveedores_escritos__;
+DROP TABLE IF EXISTS vn2008.config__;

db/versions/11057-chocolateMoss/01-part.sql

@@ -0,0 +1,41 @@
+DROP TABLE IF EXISTS vn2008.form_query__;
+DROP TABLE IF EXISTS vn2008.filtros__;
+DROP TABLE IF EXISTS vn2008.Objetivos__;
+UPDATE IGNORE vn.province
+	SET zoneFk = NULL
+	WHERE zoneFk IN (
+		SELECT zoneFk
+			FROM vn.province
+			WHERE zoneFk IS NOT NULL AND zoneFk NOT IN (SELECT id FROM vn.`zone`)
+	);
+ALTER TABLE vn.province DROP FOREIGN KEY province_zone_fk;
+ALTER TABLE vn.province MODIFY COLUMN zoneFk int(11) DEFAULT NULL NULL;
+ALTER TABLE vn.province ADD CONSTRAINT
+    province_zone_FK FOREIGN KEY (zoneFk) REFERENCES vn.`zone`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+DROP TABLE IF EXISTS vn2008.zones__;
+DROP TABLE IF EXISTS vn2008.rec_translator__;
+DROP TABLE IF EXISTS vn2008.warehouse_joined__;
+DROP TABLE IF EXISTS vn2008.warehouse_filtro__;
+DROP TABLE IF EXISTS vn2008.viaxpress__;
+DROP TABLE IF EXISTS vn2008.cl_que__;
+DROP TABLE IF EXISTS vn2008.Recibos_recorded__;
+RENAME TABLE vn.coolerPathDetail TO vn.coolerPathDetail__;
+ALTER TABLE vn.coolerPathDetail__ DROP FOREIGN KEY coolerPathDetail_FK;
+DROP TABLE IF EXISTS vn2008.cooler_path__;
+DROP TABLE IF EXISTS vn2008.payrroll_apEmpresarial__;
+DROP TABLE IF EXISTS vn2008.Compres_ok__;
+DROP TABLE IF EXISTS vn2008.Movimientos_avisar__;
+DROP TABLE IF EXISTS vn2008.Clases__;
+DROP TABLE IF EXISTS vn2008.payroll_basess__;
+DROP TABLE IF EXISTS vn2008.payroll_tipobasess__;
+DROP TABLE IF EXISTS vn2008.guillen__;
+DROP TABLE IF EXISTS vn2008.guillen_carry__;
+DROP TABLE IF EXISTS vn2008.Series__;
+DROP TABLE IF EXISTS vn2008.Permisos__;
+ALTER TABLE vn.buy DROP FOREIGN KEY buy_FK_1;
+DROP TABLE IF EXISTS vn2008.container__;
+DROP TABLE IF EXISTS vn2008.travel_reserve__;
+DROP TABLE IF EXISTS vn2008.tmpNEWTARIFAS__;
+DROP TABLE IF EXISTS vn2008.Clientes_potenciales__;
+DROP TABLE IF EXISTS vn2008.duaDismissed__;
+DROP TABLE IF EXISTS vn2008.cl_pet__;

db/versions/11057-chocolateMoss/02-part.sql

@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS vn2008.expeditions_deleted__;
+DROP TABLE IF EXISTS vn2008.Tipos_f11__;
+DROP TABLE IF EXISTS vn2008.commission__;
+DROP TABLE IF EXISTS vn2008.Movimientos_revisar__;
+DROP TABLE IF EXISTS vn2008.recibida_agricola__;
+DROP TABLE IF EXISTS vn2008.tipsa__;
+DROP TABLE IF EXISTS vn2008.rounding__;
+DROP TABLE IF EXISTS vn2008.Informes__;
+DROP TABLE IF EXISTS vn2008.Monitoring__;
+DROP TABLE IF EXISTS vn2008.Forms__;
+DROP TABLE IF EXISTS vn2008.Clientes_event__;
+DROP TABLE IF EXISTS vn2008.wh_selection__;
+DROP TABLE IF EXISTS vn2008.template_bionic_component__;
+DROP TABLE IF EXISTS vn2008.Agencias_province__;
+DROP TABLE IF EXISTS vn2008.travel_pattern__;
+DROP TABLE IF EXISTS vn2008.sort_merge_results_ernesto__;
+DROP TABLE IF EXISTS vn2008.Conteo__;
+DROP TABLE IF EXISTS vn2008.Consignatarios_devices__;
+DROP TABLE IF EXISTS vn2008.link__;
+DROP TABLE IF EXISTS vn2008.agency_warehouse__;
+DROP TABLE IF EXISTS vn2008.warehouse_lc__;
+DROP TABLE IF EXISTS vn2008.emp_day_pay__;
+DROP TABLE IF EXISTS vn2008.Entradas_kop__;
+DROP TABLE IF EXISTS vn2008.dock__;
+DROP TABLE IF EXISTS vn2008.unaryScanFilter__;
+DROP TABLE IF EXISTS vn2008.Grupos__;
+DROP TABLE IF EXISTS vn2008.nichos__;

db/versions/11057-chocolateMoss/03-part.sql

@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS vn2008.preparation_exception__;
+DROP TABLE IF EXISTS vn2008.Clientes_empresa__;
+DROP TABLE IF EXISTS vn2008.call_information__;
+DROP TABLE IF EXISTS vn2008.template_bionic_price__;
+DROP TABLE IF EXISTS vn2008.invoice_observation__;
+DROP TABLE IF EXISTS vn2008.edi_testigos__;
+DROP TABLE IF EXISTS vn2008.cl_dep__;
+DROP TABLE IF EXISTS vn2008.agencia_descuadre__;
+DROP TABLE IF EXISTS vn2008.payroll_datos__;
+DROP TABLE IF EXISTS vn2008.tblIVA__;
+DROP TABLE IF EXISTS vn2008.cyc__;
+DROP TABLE IF EXISTS vn2008.Tickets_stack__;
+DROP TABLE IF EXISTS vn2008.config_host_forms__;
+DROP TABLE IF EXISTS vn2008.template_bionic_lot__;
+DROP TABLE IF EXISTS vn2008.payroll_bonificaciones__;
+DROP TABLE IF EXISTS vn2008.widget__;
+DROP TABLE IF EXISTS vn2008.accion_dits__;
+DROP TABLE IF EXISTS vn2008.credit_card__;
+DROP TABLE IF EXISTS vn2008.Brasa__;
+DROP TABLE IF EXISTS vn2008.Jefes__;
+DROP TABLE IF EXISTS vn2008.call_option__;
+DROP TABLE IF EXISTS vn2008.expeditions_pictures__;
+DROP TABLE IF EXISTS vn2008.scan__;
+DROP TABLE IF EXISTS vn2008.trolley__;
+DROP TABLE IF EXISTS vn2008.transport__;
+DROP TABLE IF EXISTS vn2008.Baldas__;

db/versions/11058-aquaCataractarum/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE floranet.`order` ADD IF NOT EXISTS observations TEXT NULL;

db/versions/11061-silverMastic/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.buy CHANGE containerFk containerFk__ smallint(5) unsigned DEFAULT NULL NULL;

e2e/paths/03-worker/07_pda.spec.js

@@ -1,41 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Worker pda path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('hr', 'worker');
-        await page.accessToSearchResult('employeeNick');
-        await page.accessToSection('worker.card.pda');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should check if worker has already a PDA allocated', async() => {
-        expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber1');
-    });
-
-    it('should deallocate the PDA', async() => {
-        await page.waitToClick(selectors.workerPda.delete);
-        let message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('PDA deallocated');
-    });
-
-    it('should allocate a new PDA', async() => {
-        await page.autocompleteSearch(selectors.workerPda.newPDA, 'serialNumber2');
-        await page.waitToClick(selectors.workerPda.submit);
-        let message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('PDA allocated');
-    });
-
-    it('should check if a new PDA has been allocated', async() => {
-        expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber2');
-    });
-});

modules/entry/back/methods/entry/addFromBuy.js

@@ -76,7 +76,6 @@ module.exports = Self => {
                     packing: buyUltimate.packing,
                     grouping: buyUltimate.grouping,
                     groupingMode: buyUltimate.groupingMode,
-                    containerFk: buyUltimate.containerFk,
                     comissionValue: buyUltimate.comissionValue,
                     packageValue: buyUltimate.packageValue,
                     location: buyUltimate.location,

modules/entry/back/models/buy.json

@@ -63,9 +63,6 @@
         "isIgnored": {
             "type": "boolean"
         },
-        "containerFk": {
-            "type": "number"
-        },
         "location": {
             "type": "number"
         },

modules/route/back/methods/roadmap/clone.js

@@ -62,12 +62,12 @@ module.exports = Self => {
 
                 const clone = await models.Roadmap.create(roadmap, options);
 
-                const expeditionTrucks = roadmap.expeditionTruck();
-                expeditionTrucks.map(expeditionTruck => {
-                    expeditionTruck.roadmapFk = clone.id;
-                    return expeditionTruck;
+                const roadmapStops = roadmap.roadmapStop();
+                roadmapStops.map(roadmapStop => {
+                    roadmapStop.roadmapFk = clone.id;
+                    return roadmapStop;
                 });
-                await models.ExpeditionTruck.create(expeditionTrucks, options);
+                await models.RoadmapStop.create(roadmapStops, options);
             }
 
             await tx.commit();

modules/route/back/model-config.json

@@ -8,7 +8,7 @@
     "DeliveryPoint": {
         "dataSource": "vn"
     },
-    "ExpeditionTruck": {
+    "RoadmapStop": {
         "dataSource": "vn"
     },
     "Roadmap": {

modules/route/back/models/roadmap.json

@@ -54,9 +54,9 @@
             "model": "Supplier",
             "foreignKey": "supplierFk"
         },
-        "expeditionTruck": {
+        "roadmapStop": {
             "type": "hasMany",
-            "model": "ExpeditionTruck",
+            "model": "RoadmapStop",
             "foreignKey": "roadmapFk"
         }
 	}

modules/route/back/models/roadmapStop.json

@@ -1,9 +1,9 @@
 {
-    "name": "ExpeditionTruck",
+    "name": "RoadmapStop",
     "base": "VnModel",
     "options": {
         "mysql": {
-        "table": "expeditionTruck"
+        "table": "roadmapStop"
         }
     },
     "properties": {

modules/route/front/roadmap/stops/index.html

@@ -1,22 +1,22 @@
 <vn-crud-model
     vn-id="model"
-    url="ExpeditionTrucks"
+    url="RoadmapStops"
     where="{roadmapFk: $ctrl.$params.id}"
     order="eta ASC"
-    data="$ctrl.expeditionTrucks"
+    data="$ctrl.roadmapStops"
     auto-load="true">
 </vn-crud-model>
 <vn-watcher
     vn-id="watcher"
-    data="$ctrl.expeditionTrucks"
+    data="$ctrl.roadmapStops"
     form="form">
 </vn-watcher>
 <form class="vn-w-md" name="form" ng-submit="$ctrl.onSubmit()">
     <vn-card class="vn-pa-lg">
-        <vn-horizontal ng-repeat="expeditionTruck in $ctrl.expeditionTrucks">
+        <vn-horizontal ng-repeat="roadmapStop in $ctrl.roadmapStops">
             <vn-autocomplete vn-one
                 label="Warehouse"
-                ng-model="expeditionTruck.warehouseFk"
+                ng-model="roadmapStop.warehouseFk"
                 url="Warehouses"
                 show-field="name"
                 value-field="id"
@@ -25,18 +25,18 @@
             </vn-autocomplete>
             <vn-date-picker vn-one
                 label="ETA date"
-                ng-model="expeditionTruck.eta"
+                ng-model="roadmapStop.eta"
                 rule>
             </vn-date-picker>
             <vn-input-time
                 vn-one
                 label="ETA hour"
-                ng-model="expeditionTruck.eta">
+                ng-model="roadmapStop.eta">
             </vn-input-time>
             <vn-textArea
                 vn-one
                 label="Description"
-                ng-model="expeditionTruck.description"
+                ng-model="roadmapStop.description"
                 rule>
             </vn-textArea>
             <vn-none>

modules/route/front/roadmap/summary/index.html

@@ -49,7 +49,7 @@
                         vn-bind="+"
                         vn-tooltip="Add stop"
                         icon="add_circle"
-                        vn-click-stop="addExpeditionTruck.show()">
+                        vn-click-stop="addRoadmapStop.show()">
                     </vn-icon-button>
                 </a>
             </h4>
@@ -61,9 +61,9 @@
                     </vn-tr>
                 </vn-thead>
                 <vn-tbody>
-                    <vn-tr ng-repeat="expeditionTruck in summary.expeditionTruck">
-                        <vn-td>{{expeditionTruck.warehouse.name}}</vn-td>
-                        <vn-td expand>{{expeditionTruck.eta | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                    <vn-tr ng-repeat="roadmapStop in summary.roadmapStop">
+                        <vn-td>{{roadmapStop.warehouse.name}}</vn-td>
+                        <vn-td expand>{{roadmapStop.eta | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>
@@ -75,14 +75,14 @@
 </vn-supplier-descriptor-popover>
 
 <vn-dialog
-    vn-id="addExpeditionTruck"
+    vn-id="addRoadmapStop"
     on-open="$ctrl.getETD()"
     on-accept="$ctrl.onAddAccept()">
     <tpl-body>
         <vn-horizontal>
             <vn-autocomplete
                 label="Warehouse"
-                ng-model="$ctrl.expeditionTruck.warehouseFk"
+                ng-model="$ctrl.roadmapStop.warehouseFk"
                 url="Warehouses"
                 show-field="name"
                 value-field="id"
@@ -93,18 +93,18 @@
         <vn-horizontal>
             <vn-date-picker
                 label="ETA date"
-                ng-model="$ctrl.expeditionTruck.eta"
+                ng-model="$ctrl.roadmapStop.eta"
                 rule>
             </vn-date-picker>
             <vn-input-time
                 label="ETA hour"
-                ng-model="$ctrl.expeditionTruck.eta">
+                ng-model="$ctrl.roadmapStop.eta">
             </vn-input-time>
         </vn-horizontal>
         <vn-horizontal>
             <vn-textArea
                 label="Description"
-                ng-model="$ctrl.expeditionTruck.description"
+                ng-model="$ctrl.roadmapStop.description"
                 rule>
             </vn-textArea>
         </vn-horizontal>

modules/route/front/roadmap/summary/index.js

@@ -20,7 +20,7 @@ class Controller extends Component {
             include: [
                 {relation: 'supplier'},
                 {relation: 'worker'},
-                {relation: 'expeditionTruck',
+                {relation: 'roadmapStop',
                     scope: {
                         include: [
                             {relation: 'warehouse'}
@@ -36,19 +36,19 @@ class Controller extends Component {
         const eta = new Date(this.roadmap.etd);
         eta.setDate(eta.getDate() + 1);
 
-        this.expeditionTruck = {eta: eta};
+        this.roadmapStop = {eta: eta};
     }
 
     onAddAccept() {
         try {
             const data = {
                 roadmapFk: this.roadmap.id,
-                warehouseFk: this.expeditionTruck.warehouseFk,
-                eta: this.expeditionTruck.eta,
-                description: this.expeditionTruck.description
+                warehouseFk: this.roadmapStop.warehouseFk,
+                eta: this.roadmapStop.eta,
+                description: this.roadmapStop.description
             };
 
-            this.$http.post(`ExpeditionTrucks`, data)
+            this.$http.post(`RoadmapStops`, data)
                 .then(() => {
                     this.loadData();
                     this.vnApp.showSuccess(this.$t('Data saved!'));

modules/ticket/back/models/expeditionPallet.json

@@ -23,9 +23,9 @@
         }
     },
     "relations": {
-        "expeditionTruck": {
+        "roadmapStop": {
             "type": "belongsTo",
-            "model": "ExpeditionTruck",
+            "model": "RoadmapStop",
             "foreignKey": "truckFk" 
         }
     }

modules/ticket/back/models/ticket-log.json

@@ -8,7 +8,8 @@
 	},
     "properties": {
         "id": {
-            "type": "string"
+            "type": "number",
+            "id": true
         },
         "originFk": {
             "type": "number"

modules/ticket/front/descriptor-menu/index.js

@@ -37,18 +37,19 @@ class Controller extends Section {
         });
 
         const filter = {
-            fields: ['originFk', 'creationDate', 'newInstance'],
+            fields: ['id', 'originFk', 'creationDate', 'newInstance'],
             where: {
                 originFk: value,
                 newInstance: {like: '%"isDeleted":true%'}
             },
-            order: 'creationDate DESC'
+            order: 'creationDate DESC',
+            limit: 1
         };
-        this.$http.get(`TicketLogs/findOne`, {filter})
+        this.$http.get(`TicketLogs`, {filter})
             .then(res => {
-                if (res && res.data) {
+                if (res && res.data && res.data.length) {
                     const now = Date.vnNew();
-                    const maxDate = new Date(res.data.creationDate);
+                    const maxDate = new Date(res.data[0].creationDate);
                     maxDate.setHours(maxDate.getHours() + 1);
                     if (now <= maxDate)
                         return this.canRestoreTicket = true;

modules/worker/front/pda/index.html

@@ -1,50 +0,0 @@
-<div class="vn-w-md" ng-show="$ctrl.currentPDA">
-    <vn-card class="vn-pa-lg">
-        <vn-horizontal>
-            <vn-textfield
-                label="Current PDA"
-                ng-model="$ctrl.currentPDA.description"
-                disabled="true">
-                <append>
-                    <vn-icon-button
-                        icon="delete"
-                        vn-tooltip="Deallocate PDA"
-                        ng-click="$ctrl.deallocatePDA()"
-                        vn-acl="hr, productionAssi">
-                    </vn-icon-button>
-                </append>
-            </vn-textfield>
-        </vn-horizontal>
-    </vn-card>
-</div>
-<form name="form" ng-show="!$ctrl.currentPDA" ng-submit="$ctrl.allocatePDA()" class="vn-w-md">
-    <vn-card class="vn-pa-lg">
-            <vn-horizontal>
-                <vn-autocomplete
-                    vn-acl="hr, productionAssi"
-                    ng-model="$ctrl.newPDA"
-                    url="DeviceProductions"
-                    fields="['id', 'modelFk', 'serialNumber']"
-                    where="{'stateFk': 'idle'}"
-                    label="New PDA"
-                    order="id"
-                    value-field="id"
-                    show-field="serialNumber">
-                    <tpl-item>
-                        <div>
-                            ID: {{id}}
-                        </div>
-                        <div class="text-caption text-grey">
-                            {{modelFk}}, {{serialNumber}}
-                        </div>
-                    </tpl-item>
-                </vn-autocomplete>
-            </vn-horizontal>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit
-            disabled="!$ctrl.newPDA"
-            label="Assign">
-        </vn-submit>
-    </vn-button-bar>
-</form>

modules/worker/front/pda/index.js

@@ -1,53 +1,18 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import './style.scss';
 
 class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        const filter = {
-            where: {userFk: this.$params.id},
-            include: {relation: 'deviceProduction'}
-        };
-        this.$http.get('DeviceProductionUsers', {filter}).
-            then(res => {
-                if (res.data && res.data.length > 0)
-                    this.setCurrentPDA(res.data[0]);
-            });
     }
 
-    deallocatePDA() {
-        this.$http.post(`Workers/${this.$params.id}/deallocatePDA`, {pda: this.currentPDA.deviceProductionFk})
-            .then(() => {
-                this.vnApp.showSuccess(this.$t('PDA deallocated'));
-                delete this.currentPDA;
-            });
-    }
-
-    allocatePDA() {
-        this.$http.post(`Workers/${this.$params.id}/allocatePDA`, {pda: this.newPDA})
-            .then(res => {
-                if (res.data)
-                    this.setCurrentPDA(res.data);
-
-                this.vnApp.showSuccess(this.$t('PDA allocated'));
-                delete this.newPDA;
-            });
-    }
-
-    setCurrentPDA(data) {
-        this.currentPDA = data;
-        this.currentPDA.description = [];
-        this.currentPDA.description.push(`ID: ${this.currentPDA.deviceProductionFk}`);
-        this.currentPDA.description.push(`${this.$t('Model')}: ${this.currentPDA.deviceProduction.modelFk}`);
-        this.currentPDA.description.push(`${this.$t('Serial Number')}: ${this.currentPDA.deviceProduction.serialNumber}`);
-        this.currentPDA.description = this.currentPDA.description.join(' ');
+    async $onInit() {
+        const url = await this.vnApp.getUrl(`worker/${this.$params.id}/pda`);
+        this.$state.go('worker.card.summary', {id: this.$params.id});
+        window.location.href = url;
     }
 }
 
-Controller.$inject = ['$element', '$scope'];
-
 ngModule.vnComponent('vnWorkerPda', {
-    template: require('./index.html'),
-    controller: Controller,
+    controller: Controller
 });

modules/worker/front/pda/index.spec.js

@@ -1,72 +0,0 @@
-import './index';
-
-describe('Worker', () => {
-    describe('Component vnWorkerPda', () => {
-        let $httpBackend;
-        let $scope;
-        let $element;
-        let controller;
-
-        beforeEach(ngModule('worker'));
-
-        beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
-            $httpBackend = _$httpBackend_;
-            $scope = $rootScope.$new();
-            $element = angular.element('<vn-worker-pda></vn-worker-pda>');
-            controller = $componentController('vnWorkerPda', {$element, $scope});
-            $httpBackend.expectGET(`DeviceProductionUsers`).respond();
-        }));
-
-        describe('deallocatePDA()', () => {
-            it('should make an HTTP Post query to deallocatePDA', () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                controller.currentPDA = {deviceProductionFk: 1};
-                controller.$params.id = 1;
-
-                $httpBackend
-                    .expectPOST(`Workers/${controller.$params.id}/deallocatePDA`,
-                        {pda: controller.currentPDA.deviceProductionFk})
-                    .respond();
-                controller.deallocatePDA();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-                expect(controller.currentPDA).toBeUndefined();
-            });
-        });
-
-        describe('allocatePDA()', () => {
-            it('should make an HTTP Post query to allocatePDA', () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                controller.newPDA = 4;
-                controller.$params.id = 1;
-
-                $httpBackend
-                    .expectPOST(`Workers/${controller.$params.id}/allocatePDA`,
-                        {pda: controller.newPDA})
-                    .respond();
-                controller.allocatePDA();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-                expect(controller.newPDA).toBeUndefined();
-            });
-        });
-
-        describe('setCurrentPDA()', () => {
-            it('should set CurrentPDA', () => {
-                const data = {
-                    deviceProductionFk: 1,
-                    deviceProduction: {
-                        modelFk: 1,
-                        serialNumber: 1
-                    }
-                };
-                controller.setCurrentPDA(data);
-
-                expect(controller.currentPDA).toBeDefined();
-                expect(controller.currentPDA.description).toBeDefined();
-            });
-        });
-    });
-});

modules/worker/front/pda/style.scss

@@ -1,6 +0,0 @@
-@import "./variables";
-
-.text-grey {
-    color: $color-font-light;
-}
-

myt.config.yml

@@ -227,7 +227,7 @@ localFixtures:
     - expeditionScan
     - expeditionState
     - expeditionStateType
-    - expeditionTruck
+    - roadmapStop
     - expense
     - genus
     - greuge