diff --git a/back/model-config.json b/back/model-config.json index 15725b9aa..fa412618d 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -43,5 +43,11 @@ }, "PersonMedia": { "dataSource": "vn" - } -} \ No newline at end of file + }, + "PersonDepartment": { + "dataSource": "vn" + } +} + + + diff --git a/back/models/person-department.json b/back/models/person-department.json new file mode 100644 index 000000000..246fa4f5d --- /dev/null +++ b/back/models/person-department.json @@ -0,0 +1,31 @@ +{ + "name": "PersonDepartment", + "base": "VnModel", + "options": { + "mysql": { + "table": "personDepartment" + } + }, + "properties": { + "name": { + "type": "String" + }, + "firstName": { + "type": "String" + }, + "workerFk": { + "id": true, + "type": "Number" + }, + "department": { + "type": "Number" + } + }, + "relations": { + "worker": { + "type": "belongsTo", + "model": "Worker", + "foreignKey": "workerFk" + } + } +} diff --git a/front/salix/components/login/style.scss b/front/salix/components/login/style.scss index eea328084..55497c545 100644 --- a/front/salix/components/login/style.scss +++ b/front/salix/components/login/style.scss @@ -55,7 +55,7 @@ vn-login { position: absolute; width: 0; top: .2em; - right: -.4em; + right: -.5em; overflow: visible; } } diff --git a/front/salix/components/main-menu/main-menu.html b/front/salix/components/main-menu/main-menu.html index 6aaef5a72..326d5e18b 100644 --- a/front/salix/components/main-menu/main-menu.html +++ b/front/salix/components/main-menu/main-menu.html @@ -5,14 +5,6 @@ class="unselectable"> {{currentUserName}} - - - - - - - + search-function="{or: [{code: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}">
{{::code}}
{{::name}}
@@ -35,7 +35,7 @@ show-field="description" value-field="id" field="$ctrl.item.intrastatFk" - search-function="{or: [{id: {like: '%'+ $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}"> + search-function="{or: [{id: {like: $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}">
{{::id}}
{{::description}}
diff --git a/modules/item/front/data/index.html b/modules/item/front/data/index.html index ba1f69d0d..329b3d21c 100644 --- a/modules/item/front/data/index.html +++ b/modules/item/front/data/index.html @@ -34,7 +34,7 @@ show-field="description" value-field="id" field="$ctrl.item.intrastatFk" - search-function="{or: [{id: {regexp: $search}}, {description: {regexp: $search}}]}" + search-function="{or: [{id: {like: $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}" initial-data="$ctrl.item.intrastat">
{{::id}}
diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html index 62962144d..00b606c6a 100644 --- a/modules/item/front/tags/index.html +++ b/modules/item/front/tags/index.html @@ -47,7 +47,7 @@ ng-show="tag.selection.isFree === false" vn-three url="{{$ctrl.sourceTables[itemTag.id].url}}" - search-function="{name: {regexp: $search}}" + search-function="{name: {like: '%'+ $search +'%'}}" label="Value" field="itemTag.value" show-field="{{$ctrl.sourceTables[itemTag.id].field}}" diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html index dea685afd..f52fbfc42 100644 --- a/modules/order/front/basic-data/index.html +++ b/modules/order/front/basic-data/index.html @@ -12,7 +12,7 @@ vn-one url="/api/Clients" label="Client" - search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" + search-function="{or: [{id: $search}, {name: {regexp: $search}}]}" show-field="name" value-field="id" field="$ctrl.order.clientFk" diff --git a/modules/order/front/create/card.html b/modules/order/front/create/card.html index e3d14bc5a..0b0f8822a 100644 --- a/modules/order/front/create/card.html +++ b/modules/order/front/create/card.html @@ -3,7 +3,7 @@ vn-id="client" url="/api/Clients" label="Client" - search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" + search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}" show-field="name" value-field="id" field="$ctrl.clientFk" diff --git a/modules/ticket/front/create/card.html b/modules/ticket/front/create/card.html index f55fb2787..34a21bcff 100644 --- a/modules/ticket/front/create/card.html +++ b/modules/ticket/front/create/card.html @@ -3,7 +3,7 @@ vn-id="client" url="/api/Clients" label="Client" - search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" + search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}" show-field="name" value-field="id" field="$ctrl.clientFk" diff --git a/modules/ticket/front/package/index.html b/modules/ticket/front/package/index.html index f6d9dfd2d..c32c131ec 100644 --- a/modules/ticket/front/package/index.html +++ b/modules/ticket/front/package/index.html @@ -21,7 +21,7 @@ label="Package" show-field="name" value-field="packagingFk" - search-function="{or: [{itemFk: {like: '%'+ $search +'%'}}, {'name': {like: '%'+ $search +'%'}}]}" + search-function="{or: [{itemFk: $search}, {'name': {like: '%'+ $search +'%'}}]}" field="package.packagingFk"> {{itemFk}} : {{name}} diff --git a/services/db/install/changes/1.2-CHECK/19-personDepartment.sql b/services/db/install/changes/1.2-CHECK/19-personDepartment.sql index 0f98bc539..523743326 100644 --- a/services/db/install/changes/1.2-CHECK/19-personDepartment.sql +++ b/services/db/install/changes/1.2-CHECK/19-personDepartment.sql @@ -5,7 +5,7 @@ CREATE SQL SECURITY DEFINER VIEW `vn`.`personDepartment` AS SELECT - `p`.`id_trabajador` AS `id_trabajador`, + `p`.`id_trabajador` AS `workerFk`, `p`.`name` AS `name`, `p`.`firstname` AS `firstname`, `d`.`name` AS `department` diff --git a/version-notes.html b/version-notes.html deleted file mode 100644 index 27cfd4023..000000000 --- a/version-notes.html +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#Asunto
290Componentes de ticket muestra todos los componentes existentes.
268Añadir componente de paginación a rutas con filtros
271Atajo de teclado para botones +
226Traduccion de error ticket tracking + e2e
269Test unitario de createWithInsurance.js
217Seccion Configuracion paso 3
289Cuando se modifica el crédito mostrar alerta
252No modifica visualmente el campo Facturar por consignatario al modificar el Recargo en cualquiera de sus consignatarios
284Seccion ticket.lineas icono papelera para eliminar lineas
253Actualizar los estilos para que concuerden con la paleta de colores de Vernatura
283Modificar encabezado el client.summary
277Hacer que el descriptor de ticket se actualice cuando se modifica el estado
278Refactor descriptor item
160Limpiar tablas/vistas obsoletas del esquema salix
285Optimizar tarea de tocker y añadir funciones compiladas
231Importar de vn2008 a vn toda la funcionalidad necesaria para mostrar precio
287Si en client.fiscaldata el nif empieza por B
265Añadir boton ok y estado
260Refactorización de rutas en back-end
267Preparar esqueleto para nueva entidad order
292En el descriptor de item.list no aparece toda la informacion que deberia
270Seccion Configuracion paso 2
264sumario ticket no respeta margenes
281ticket.lineas Mostrar boton editar
266Al hacer click en el ticket.lineas campo id articulo mostrar el descriptor de item
166refactorizar buscador avanzado de articulos
171Añadir revision
211Forzar a ciertos tags
213Sumario Tickets
216Seccion Configuracion paso 2
124address observations validations
199Añadir manejador de cliente que no existe
138Refactorización Popover
172E2E revision
175E2E embalajes
177Listar modelo saleChecked
182Listar volumen del ticket
196E2E listar lineas ticket
198refactorizar tag con nuevo + -
201Listar Mana del cliente
202Añadir a Sumario Cliente una seccion financia
209Contratos de credito
210item tags
212Mostrar solo las agencias con el campo isActive(tpv) en TRUE
215Seccion Configuracion paso 1
220Al crear un consignatario mirar RE
222nuevo dni españa
223Manejador de errores global
227traducciones pendientes
- - - -