Compare commits

...

11 Commits

Author SHA1 Message Date
Jorge Penadés 86ecaedb0e ref #6119 scheme url removed
gitea/salix/pipeline/head This commit looks good Details
2023-09-06 14:33:31 +02:00
Jorge Penadés f46d6355dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-04 08:06:47 +02:00
Sergio De la torre 27a9881a6a Merge pull request 'refs #4815 feat:DeviceLog Model' (!1705) from 4815-deviLogModel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1705
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-01 10:45:16 +00:00
Sergio De la torre 3795404789 Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 10:15:26 +00:00
Sergio De la torre 7c6e3d3fc5 Merge pull request '6132-Modify-saveSign' (!1732) from 6132-Modify-saveSign into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1732
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-01 10:13:51 +00:00
Sergio De la torre 00201197cc Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 05:24:55 +00:00
Sergio De la torre 473e710d1b refs #4815 feat:DeviceLogModel
gitea/salix/pipeline/head Build queued... Details
2023-09-01 07:22:15 +02:00
Sergio De la torre 281ae0eb04 refs #4815 feat:DeviceLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 07:21:15 +02:00
Sergio De la torre 7d8828e604 refs #6132 fix: saveSign without route
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 13:50:31 +02:00
Sergio De la torre e7cd052199 refs #6132 add messageError 2023-08-31 13:49:00 +02:00
Sergio De la torre 8d0b3efa11 refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:39:40 +02:00
8 changed files with 57 additions and 6 deletions

View File

@ -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');

View File

@ -3,7 +3,7 @@
<span ng-if="$ctrl.showNumber">
{{ $ctrl.phoneNumber }}
</span>
<a href="{{$ctrl.schemeUrl}}:{{$ctrl.phoneNumber}}">
<a href="tel:{{$ctrl.phoneNumber}}">
<vn-icon
flat
round
@ -14,7 +14,7 @@
</vn-icon>
</a>
</span>
<a ng-if="!$ctrl.icon" href="$ctrl.schemeUrl:$ctrl.phoneNumber">
<a ng-if="!$ctrl.icon" href="tel:$ctrl.phoneNumber">
{{ $ctrl.phoneNumber }}
</a>
</span>

View File

@ -5,7 +5,6 @@ class Controller {
this.phoneNumber = null;
this.icon = true;
this.showNumber = true;
this.schemeUrl = 'tel';
}
}
@ -16,6 +15,5 @@ ngModule.vnComponent('vnLinkPhone', {
phoneNumber: '<',
icon: '<?',
showNumber: '<?',
schemeUrl: '<?',
}
});

View File

@ -185,5 +185,6 @@
"You don't have enough privileges.": "You don't have enough privileges.",
"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 ticket doesn't exist.": "The ticket doesn't exist.",
"Ticket without Route": "Ticket without route"
}

View File

@ -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"
}

View File

@ -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,

View File

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

View File

@ -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"
}
}
}