Merge branch 'dev' into 6173-dump-BBDD

CHANGELOG.md

@@ -6,6 +6,15 @@ 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).
 
 
+## [2338.01] - 2023-09-21
+
+### Added
+
+### Changed
+- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
+
+### Fixed
+
 ## [2336.01] - 2023-09-07
 
 ### Added

db/changes/233401/01-deviceLog_acl.sql

@@ -0,0 +1,6 @@
+
+ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+

front/core/components/snackbar/snackbar.js

@@ -27,7 +27,7 @@ export default class Controller extends Component {
         setTimeout(() => element.classList.add('shown'), 30);
         shape.element = element;
 
-        if (data.additionalData) {
+        if (data.additionalData && this.vnToken.token) {
             this.additionalData = data.additionalData;
             let supportButton = document.createElement('i');
             supportButton.setAttribute('class', 'material-icons clickable');

front/core/components/support-dialog/index.js

@@ -7,12 +7,15 @@ export default class Controller extends Dialog {
     }
 
     responseHandler(response) {
+        if (response !== 'accept')
+            return super.responseHandler(response);
+
         this.$http.post('Ostickets/send-to-support', {
             reason: this.reason,
             additionalData: this.additionalData
         })
-        .then(() => super.responseHandler(response))
-        .then(() => this.vnApp.showSuccess(this.$t('Email sended!')));
+            .then(() => super.responseHandler(response))
+            .then(() => this.vnApp.showSuccess(this.$t('Email sended!')));
     }
 }
 

loopback/locale/en.json

@@ -186,5 +186,6 @@
 	"This ticket is locked.": "This ticket is locked.",
 	"This ticket is not editable.": "This ticket is not editable.",
 	"The ticket doesn't exist.": "The ticket doesn't exist.",
-	"The sales do not exists": "The sales do not exists"
-}
+	"The sales do not exists": "The sales do not exists",
+	"Ticket without Route": "Ticket without route"
+}

loopback/locale/es.json

@@ -315,5 +315,6 @@
 	"This ticket is not editable.": "Este ticket no es editable.",
 	"The ticket doesn't exist.": "No existe el ticket.",
     "Social name should be uppercase": "La razón social debe ir en mayúscula",
-	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula"
+	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+	"Ticket without Route": "Ticket sin ruta"
 }

modules/ticket/back/methods/ticket/priceDifference.js

@@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
 module.exports = Self => {
     Self.remoteMethodCtx('priceDifference', {
         description: 'Returns sales with price difference if the ticket is editable',

modules/ticket/back/methods/ticket/saveSign.js

@@ -93,6 +93,8 @@ module.exports = Self => {
                 }, myOptions);
             const dmsType = await models.DmsType.findOne({where: {code: 'Ticket'}, fields: ['id']}, myOptions);
             const ctxUploadFile = Object.assign({}, ctx);
+            if (ticket.route() === null)
+                throw new UserError('Ticket without route');
             ctxUploadFile.args = {
                 warehouseId: ticket.warehouseFk,
                 companyId: ticket.companyFk,

modules/worker/back/model-config.json

@@ -23,6 +23,9 @@
     "Device": {
         "dataSource": "vn"
     },
+    "DeviceLog": {
+        "dataSource": "vn"
+    },
     "DeviceProduction": {
         "dataSource": "vn"
     },

modules/worker/back/models/device-log.json

@@ -0,0 +1,40 @@
+{
+    "name": "DeviceLog",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "deviceLog"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number"
+        },
+        "android_id": {
+            "type": "string"
+        },
+        "userFk": {
+            "type": "number"
+        },
+        "created": {
+            "type": "date"
+        },
+        "nameApp": {
+            "type": "string"
+        },
+        "versionApp": {
+            "type": "string"
+        },
+        "deviceProductionFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "user": {
+            "type": "belongsTo",
+            "model": "VnUser",
+            "foreignKey": "userFk"
+        }
+    }
+}

modules/worker/front/calendar/index.html

@@ -84,7 +84,8 @@
     <div name="absenceTypes" class="input vn-py-md" style="overflow: hidden;">
         <vn-chip ng-repeat="absenceType in absenceTypes" ng-class="::{'selectable': $ctrl.isSubordinate}" ng-click="$ctrl.pick(absenceType)">
         <vn-avatar ng-style="{backgroundColor: absenceType.rgb}">
-        <vn-icon icon="check" ng-if="absenceType.id == $ctrl.absenceType.id"></vn-icon>
+        <vn-icon class="check" icon="check" ng-if="absenceType.id == $ctrl.absenceType.id"></vn-icon>
+
     </vn-avatar>
     {{absenceType.name}}
 </vn-chip>

modules/worker/front/calendar/style.scss

@@ -9,7 +9,7 @@ vn-worker-calendar {
         align-items: center;
         box-sizing: border-box;
         padding: $spacing-md;
-    
+
         & > vn-calendar {
             border: $border-thin;
             margin: $spacing-md;
@@ -32,7 +32,7 @@ vn-worker-calendar {
     }
 
     vn-icon[icon="info"] {
-        position: absolute; 
+        position: absolute;
         top: 16px;
         right: 16px
     }
@@ -40,7 +40,7 @@ vn-worker-calendar {
     vn-side-menu div > .input {
         border-bottom: $border-thin;
     }
-    
+
     .festive,
     vn-avatar.today {
         color: $color-font;
@@ -56,4 +56,10 @@ vn-worker-calendar {
     vn-avatar.today {
         border: 2px solid $color-font-link
     }
+
+    .check {
+        margin-top: 0.5px;
+        margin-left: -3px;
+        font-size: 125%;
+    }
 }

package.json

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