Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [24.18.01] - 2024-05-02
+
 ## [24.16.01] - 2024-04-18
 
 ## [2414.01] - 2024-04-04

db/routines/vn/procedures/entry_checkBooked.sql

@@ -15,7 +15,7 @@ BEGIN
 		FROM `entry`
 		WHERE id = vSelf;
 
-	IF vIsBooked THEN
+	IF vIsBooked AND NOT @isModeInventory THEN
 		CALL util.throw('Entry is already booked');
 	END IF;
 END$$

e2e/paths/06-claim/01_basic_data.spec.js

@@ -34,14 +34,6 @@ describe('Claim edit basic data path', () => {
         await page.waitForState('claim.card.detail');
     });
 
-    it('should check the "Pick up" checkbox', async() => {
-        await page.reloadSection('claim.card.basicData');
-        await page.waitToClick(selectors.claimBasicData.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
     it('should confirm the claim state was edited', async() => {
         await page.reloadSection('claim.card.basicData');
         await page.waitForSelector(selectors.claimBasicData.claimState);

front/core/services/auth.js

@@ -86,7 +86,8 @@ export default class Auth {
         return this.$http.get('VnUsers/ShareToken', {
             headers: {Authorization: json.data.token}
         }).then(({data}) => {
-            this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
+            // Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado
+            this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
             this.loadAcls().then(() => {
                 let continueHash = this.$state.params.continue;
                 if (continueHash)

modules/worker/front/time-control/index.js

@@ -4,10 +4,11 @@ import './style.scss';
 import UserError from 'core/lib/user-error';
 
 class Controller extends Section {
-    constructor($element, $, vnWeekDays) {
+    constructor($element, $, vnWeekDays, moment) {
         super($element, $);
         this.weekDays = [];
         this.weekdayNames = vnWeekDays.locales;
+        this.moment = moment;
         this.entryDirections = [
             {code: 'in', description: this.$t('In')},
             {code: 'middle', description: this.$t('Intermediate')},
@@ -364,14 +365,8 @@ class Controller extends Section {
     }
 
     getWeekNumber(date) {
-        const tempDate = new Date(date);
+        const tempDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
-        let dayOfWeek = tempDate.getDay();
+        return this.moment(tempDate).isoWeek();
-        dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
-        const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
-        const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
-        const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
-        const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
-        return weekNumber;
     }
 
     isSatisfied() {
@@ -499,7 +494,7 @@ class Controller extends Section {
     }
 }
 
-Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
+Controller.$inject = ['$element', '$scope', 'vnWeekDays', 'moment'];
 
 ngModule.vnComponent('vnWorkerTimeControl', {
     template: require('./index.html'),

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.16.0",
+    "version": "24.18.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",