Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
577c21e601
|
|
@ -54,7 +54,6 @@ pipeline {
|
|||
}
|
||||
environment {
|
||||
PROJECT_NAME = 'lilium'
|
||||
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
|
||||
}
|
||||
stages {
|
||||
stage('Install') {
|
||||
|
|
@ -104,15 +103,18 @@ pipeline {
|
|||
when {
|
||||
expression { PROTECTED_BRANCH }
|
||||
}
|
||||
environment {
|
||||
DOCKER_HOST = "${env.SWARM_HOST}"
|
||||
}
|
||||
steps {
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
}
|
||||
sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
|
||||
withKubeConfig([
|
||||
serverUrl: "$KUBERNETES_API",
|
||||
credentialsId: 'kubernetes',
|
||||
namespace: 'lilium'
|
||||
]) {
|
||||
sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,7 @@
|
|||
version: '3.7'
|
||||
services:
|
||||
main:
|
||||
image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
|
||||
image: registry.verdnatura.es/salix-frontend:${VERSION:?}
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./Dockerfile
|
||||
ports:
|
||||
- 4000
|
||||
deploy:
|
||||
replicas: ${FRONT_REPLICAS:?}
|
||||
placement:
|
||||
constraints:
|
||||
- node.role == worker
|
||||
resources:
|
||||
limits:
|
||||
memory: 1G
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-front",
|
||||
"version": "24.24.0",
|
||||
"version": "24.24.1",
|
||||
"description": "Salix frontend",
|
||||
"productName": "Salix",
|
||||
"author": "Verdnatura",
|
||||
|
|
|
|||
|
|
@ -56,11 +56,20 @@ async function fetch() {
|
|||
}
|
||||
|
||||
const showRedirectToSummaryIcon = computed(() => {
|
||||
const routeExists = route.matched.some(
|
||||
(route) => route.name === `${route.meta.moduleName}Summary`
|
||||
);
|
||||
return !isSummary.value && route.meta.moduleName && routeExists;
|
||||
const exist = existSummary(route.matched);
|
||||
return !isSummary.value && route.meta.moduleName && exist;
|
||||
});
|
||||
|
||||
function existSummary(routes) {
|
||||
const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
|
||||
if (hasSummary) return hasSummary;
|
||||
for (const current of routes) {
|
||||
if (current.path != '/' && current.children) {
|
||||
const exist = existSummary(current.children);
|
||||
if (exist) return exist;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ const tags = computed(() => {
|
|||
.inline-tag {
|
||||
height: 1rem;
|
||||
margin: 0.05rem;
|
||||
color: $secondary;
|
||||
color: $color-font-secondary;
|
||||
text-align: center;
|
||||
font-size: smaller;
|
||||
padding: 1px;
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ const containerClasses = computed(() => {
|
|||
.q-calendar-month__head--workweek,
|
||||
.q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
|
||||
text-transform: capitalize;
|
||||
color: #777;
|
||||
color: var(---color-font-secondary);
|
||||
font-weight: bold;
|
||||
font-size: 0.8rem;
|
||||
text-align: center;
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 173 KiB After Width: | Height: | Size: 174 KiB |
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -1,418 +1,435 @@
|
|||
@font-face {
|
||||
font-family: 'icon';
|
||||
src: url('fonts/icon.eot?2omjsr');
|
||||
src: url('fonts/icon.eot?2omjsr#iefix') format('embedded-opentype'),
|
||||
url('fonts/icon.ttf?2omjsr') format('truetype'),
|
||||
url('fonts/icon.woff?2omjsr') format('woff'),
|
||||
url('fonts/icon.svg?2omjsr#icon') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
font-display: block;
|
||||
font-family: 'icon';
|
||||
src: url('fonts/icon.eot?1om04h');
|
||||
src: url('fonts/icon.eot?1om04h#iefix') format('embedded-opentype'),
|
||||
url('fonts/icon.ttf?1om04h') format('truetype'),
|
||||
url('fonts/icon.woff?1om04h') format('woff'),
|
||||
url('fonts/icon.svg?1om04h#icon') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
font-display: block;
|
||||
}
|
||||
|
||||
[class^='icon-'],
|
||||
[class*=' icon-'] {
|
||||
/* use !important to prevent issues with browser extensions that change fonts */
|
||||
font-family: 'icon' !important;
|
||||
speak: never;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
line-height: 1;
|
||||
[class^="icon-"], [class*=" icon-"] {
|
||||
/* use !important to prevent issues with browser extensions that change fonts */
|
||||
font-family: 'icon' !important;
|
||||
speak: never;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
line-height: 1;
|
||||
|
||||
/* Better Font Rendering =========== */
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
/* Better Font Rendering =========== */
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-100:before {
|
||||
content: '\e926';
|
||||
content: "\e901";
|
||||
}
|
||||
.icon-Client_unpaid:before {
|
||||
content: '\e925';
|
||||
}
|
||||
.icon-Client_unpaid:before {
|
||||
content: '\e925';
|
||||
content: "\e98c";
|
||||
}
|
||||
.icon-History:before {
|
||||
content: '\e964';
|
||||
content: "\e902";
|
||||
}
|
||||
.icon-Person:before {
|
||||
content: '\e984';
|
||||
content: "\e903";
|
||||
}
|
||||
.icon-accessory:before {
|
||||
content: '\e948';
|
||||
content: "\e904";
|
||||
}
|
||||
.icon-account:before {
|
||||
content: '\e927';
|
||||
content: "\e905";
|
||||
}
|
||||
.icon-actions:before {
|
||||
content: '\e928';
|
||||
content: "\e907";
|
||||
}
|
||||
.icon-addperson:before {
|
||||
content: '\e929';
|
||||
content: "\e908";
|
||||
}
|
||||
.icon-agency:before {
|
||||
content: '\e92a';
|
||||
}
|
||||
.icon-agency:before {
|
||||
content: '\e92a';
|
||||
content: "\e92a";
|
||||
}
|
||||
.icon-agency-term:before {
|
||||
content: '\e92b';
|
||||
content: "\e909";
|
||||
}
|
||||
.icon-albaran:before {
|
||||
content: '\e92c';
|
||||
}
|
||||
.icon-albaran:before {
|
||||
content: '\e92c';
|
||||
content: "\e92c";
|
||||
}
|
||||
.icon-anonymous:before {
|
||||
content: '\e92d';
|
||||
content: "\e90b";
|
||||
}
|
||||
.icon-apps:before {
|
||||
content: '\e92e';
|
||||
content: "\e90c";
|
||||
}
|
||||
.icon-artificial:before {
|
||||
content: '\e92f';
|
||||
content: "\e90d";
|
||||
}
|
||||
.icon-attach:before {
|
||||
content: '\e930';
|
||||
content: "\e90e";
|
||||
}
|
||||
.icon-barcode:before {
|
||||
content: '\e932';
|
||||
content: "\e90f";
|
||||
}
|
||||
.icon-basket:before {
|
||||
content: '\e933';
|
||||
content: "\e910";
|
||||
}
|
||||
.icon-basketadd:before {
|
||||
content: '\e934';
|
||||
content: "\e911";
|
||||
}
|
||||
.icon-bin:before {
|
||||
content: '\e935';
|
||||
content: "\e913";
|
||||
}
|
||||
.icon-botanical:before {
|
||||
content: '\e936';
|
||||
content: "\e914";
|
||||
}
|
||||
.icon-bucket:before {
|
||||
content: '\e937';
|
||||
content: "\e915";
|
||||
}
|
||||
.icon-buscaman:before {
|
||||
content: '\e938';
|
||||
content: "\e916";
|
||||
}
|
||||
.icon-buyrequest:before {
|
||||
content: '\e939';
|
||||
content: "\e917";
|
||||
}
|
||||
.icon-calc_volum:before {
|
||||
content: '\e93a';
|
||||
.icon-calc_volum .path1:before {
|
||||
content: "\e918";
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path2:before {
|
||||
content: "\e919";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path3:before {
|
||||
content: "\e91c";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path4:before {
|
||||
content: "\e91d";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path5:before {
|
||||
content: "\e91e";
|
||||
margin-left: -1em;
|
||||
color: rgb(0, 0, 0);
|
||||
}
|
||||
.icon-calc_volum .path6:before {
|
||||
content: "\e91f";
|
||||
margin-left: -1em;
|
||||
color: rgb(255, 255, 255);
|
||||
}
|
||||
.icon-calendar:before {
|
||||
content: '\e940';
|
||||
content: "\e920";
|
||||
}
|
||||
.icon-catalog:before {
|
||||
content: '\e941';
|
||||
content: "\e921";
|
||||
}
|
||||
.icon-claims:before {
|
||||
content: '\e942';
|
||||
content: "\e922";
|
||||
}
|
||||
.icon-client:before {
|
||||
content: '\e943';
|
||||
content: "\e923";
|
||||
}
|
||||
.icon-clone:before {
|
||||
content: '\e945';
|
||||
content: "\e924";
|
||||
}
|
||||
.icon-columnadd:before {
|
||||
content: '\e946';
|
||||
content: "\e925";
|
||||
}
|
||||
.icon-columndelete:before {
|
||||
content: '\e947';
|
||||
content: "\e926";
|
||||
}
|
||||
.icon-components:before {
|
||||
content: '\e949';
|
||||
content: "\e927";
|
||||
}
|
||||
.icon-consignatarios:before {
|
||||
content: '\e94b';
|
||||
content: "\e928";
|
||||
}
|
||||
.icon-control:before {
|
||||
content: '\e94c';
|
||||
content: "\e929";
|
||||
}
|
||||
.icon-credit:before {
|
||||
content: '\e94d';
|
||||
content: "\e92b";
|
||||
}
|
||||
.icon-defaulter:before {
|
||||
content: '\e94e';
|
||||
.icon-deaulter:before {
|
||||
content: "\e92d";
|
||||
}
|
||||
.icon-deletedTicket:before {
|
||||
content: '\e94f';
|
||||
content: "\e92e";
|
||||
}
|
||||
.icon-deleteline:before {
|
||||
content: '\e950';
|
||||
content: "\e92f";
|
||||
}
|
||||
.icon-delivery:before {
|
||||
content: '\e951';
|
||||
content: "\e930";
|
||||
}
|
||||
.icon-deliveryprices:before {
|
||||
content: '\e952';
|
||||
content: "\e932";
|
||||
}
|
||||
.icon-details:before {
|
||||
content: '\e954';
|
||||
content: "\e933";
|
||||
}
|
||||
.icon-dfiscales:before {
|
||||
content: '\e955';
|
||||
content: "\e934";
|
||||
}
|
||||
.icon-disabled:before {
|
||||
content: '\e965';
|
||||
content: "\e935";
|
||||
}
|
||||
.icon-doc:before {
|
||||
content: '\e956';
|
||||
content: "\e936";
|
||||
}
|
||||
.icon-entry:before {
|
||||
content: '\e958';
|
||||
content: "\e937";
|
||||
}
|
||||
.icon-exit:before {
|
||||
content: '\e959';
|
||||
content: "\e938";
|
||||
}
|
||||
.icon-eye:before {
|
||||
content: '\e95a';
|
||||
content: "\e939";
|
||||
}
|
||||
.icon-fixedPrice:before {
|
||||
content: '\e95b';
|
||||
content: "\e93a";
|
||||
}
|
||||
.icon-flower:before {
|
||||
content: '\e95c';
|
||||
content: "\e93b";
|
||||
}
|
||||
.icon-frozen:before {
|
||||
content: '\e95d';
|
||||
content: "\e93c";
|
||||
}
|
||||
.icon-fruit:before {
|
||||
content: '\e95e';
|
||||
content: "\e93d";
|
||||
}
|
||||
.icon-funeral:before {
|
||||
content: '\e95f';
|
||||
content: "\e93e";
|
||||
}
|
||||
.icon-grafana:before {
|
||||
content: '\e931';
|
||||
}
|
||||
.icon-grafana:before {
|
||||
content: '\e931';
|
||||
content: "\e906";
|
||||
}
|
||||
.icon-greenery:before {
|
||||
content: '\e91e';
|
||||
content: "\e93f";
|
||||
}
|
||||
.icon-greuge:before {
|
||||
content: '\e960';
|
||||
content: "\e940";
|
||||
}
|
||||
.icon-grid:before {
|
||||
content: '\e961';
|
||||
content: "\e941";
|
||||
}
|
||||
.icon-handmade:before {
|
||||
content: '\e94a';
|
||||
content: "\e942";
|
||||
}
|
||||
.icon-handmadeArtificial:before {
|
||||
content: '\e962';
|
||||
content: "\e943";
|
||||
}
|
||||
.icon-headercol:before {
|
||||
content: '\e963';
|
||||
content: "\e945";
|
||||
}
|
||||
.icon-info:before {
|
||||
content: '\e966';
|
||||
content: "\e946";
|
||||
}
|
||||
.icon-inventory:before {
|
||||
content: '\e967';
|
||||
content: "\e947";
|
||||
}
|
||||
.icon-invoice:before {
|
||||
content: '\e969';
|
||||
content: "\e968";
|
||||
color: #5f5f5f;
|
||||
}
|
||||
.icon-invoice-in:before {
|
||||
content: '\e96a';
|
||||
content: "\e949";
|
||||
}
|
||||
.icon-invoice-in-create:before {
|
||||
content: '\e96b';
|
||||
content: "\e94a";
|
||||
}
|
||||
.icon-invoice-out:before {
|
||||
content: '\e96c';
|
||||
content: "\e94b";
|
||||
}
|
||||
.icon-isTooLittle:before {
|
||||
content: '\e96e';
|
||||
content: "\e94c";
|
||||
}
|
||||
.icon-item:before {
|
||||
content: '\e96f';
|
||||
content: "\e94d";
|
||||
}
|
||||
.icon-languaje:before {
|
||||
content: '\e912';
|
||||
content: "\e970";
|
||||
}
|
||||
.icon-lines:before {
|
||||
content: '\e971';
|
||||
content: "\e94e";
|
||||
}
|
||||
.icon-linesprepaired:before {
|
||||
content: '\e972';
|
||||
content: "\e94f";
|
||||
}
|
||||
.icon-link-to-corrected:before {
|
||||
content: '\e900';
|
||||
content: "\e931";
|
||||
}
|
||||
.icon-link-to-correcting:before {
|
||||
content: '\e906';
|
||||
content: "\e944";
|
||||
}
|
||||
.icon-logout:before {
|
||||
content: '\e90a';
|
||||
content: "\e973";
|
||||
}
|
||||
.icon-mana:before {
|
||||
content: '\e974';
|
||||
content: "\e950";
|
||||
}
|
||||
.icon-mandatory:before {
|
||||
content: '\e975';
|
||||
content: "\e951";
|
||||
}
|
||||
.icon-net:before {
|
||||
content: '\e976';
|
||||
content: "\e952";
|
||||
}
|
||||
.icon-newalbaran:before {
|
||||
content: '\e977';
|
||||
content: "\e954";
|
||||
}
|
||||
.icon-niche:before {
|
||||
content: '\e979';
|
||||
content: "\e955";
|
||||
}
|
||||
.icon-no036:before {
|
||||
content: '\e97a';
|
||||
content: "\e956";
|
||||
}
|
||||
.icon-noPayMethod:before {
|
||||
content: '\e97b';
|
||||
content: "\e958";
|
||||
}
|
||||
.icon-notes:before {
|
||||
content: '\e97c';
|
||||
content: "\e959";
|
||||
}
|
||||
.icon-noweb:before {
|
||||
content: '\e97e';
|
||||
content: "\e95a";
|
||||
}
|
||||
.icon-onlinepayment:before {
|
||||
content: '\e97f';
|
||||
content: "\e95b";
|
||||
}
|
||||
.icon-package:before {
|
||||
content: '\e980';
|
||||
content: "\e95c";
|
||||
}
|
||||
.icon-payment:before {
|
||||
content: '\e982';
|
||||
content: "\e95d";
|
||||
}
|
||||
.icon-pbx:before {
|
||||
content: '\e983';
|
||||
content: "\e95e";
|
||||
}
|
||||
.icon-pets:before {
|
||||
content: '\e985';
|
||||
content: "\e95f";
|
||||
}
|
||||
.icon-photo:before {
|
||||
content: '\e986';
|
||||
content: "\e960";
|
||||
}
|
||||
.icon-plant:before {
|
||||
content: '\e987';
|
||||
content: "\e961";
|
||||
}
|
||||
.icon-polizon:before {
|
||||
content: '\e989';
|
||||
content: "\e962";
|
||||
}
|
||||
.icon-preserved:before {
|
||||
content: '\e98a';
|
||||
content: "\e963";
|
||||
}
|
||||
.icon-recovery:before {
|
||||
content: '\e98b';
|
||||
content: "\e964";
|
||||
}
|
||||
.icon-regentry:before {
|
||||
content: '\e901';
|
||||
content: "\e965";
|
||||
}
|
||||
.icon-reserva:before {
|
||||
content: '\e902';
|
||||
content: "\e966";
|
||||
}
|
||||
.icon-revision:before {
|
||||
content: '\e903';
|
||||
content: "\e967";
|
||||
}
|
||||
.icon-risk:before {
|
||||
content: '\e904';
|
||||
content: "\e969";
|
||||
}
|
||||
.icon-saysimple:before {
|
||||
content: "\e912";
|
||||
}
|
||||
.icon-services:before {
|
||||
content: '\e905';
|
||||
content: "\e96a";
|
||||
}
|
||||
.icon-settings:before {
|
||||
content: '\e907';
|
||||
content: "\e96b";
|
||||
}
|
||||
.icon-shipment:before {
|
||||
content: '\e908';
|
||||
content: "\e96c";
|
||||
}
|
||||
.icon-sign:before {
|
||||
content: '\e909';
|
||||
content: "\e90a";
|
||||
}
|
||||
.icon-sms:before {
|
||||
content: '\e90b';
|
||||
content: "\e96e";
|
||||
}
|
||||
.icon-solclaim:before {
|
||||
content: '\e90c';
|
||||
content: "\e96f";
|
||||
}
|
||||
.icon-solunion:before {
|
||||
content: '\e90d';
|
||||
content: "\e971";
|
||||
}
|
||||
.icon-splitline:before {
|
||||
content: '\e90e';
|
||||
content: "\e972";
|
||||
}
|
||||
.icon-splur:before {
|
||||
content: '\e90f';
|
||||
content: "\e974";
|
||||
}
|
||||
.icon-stowaway:before {
|
||||
content: '\e910';
|
||||
content: "\e975";
|
||||
}
|
||||
.icon-supplier:before {
|
||||
content: '\e911';
|
||||
content: "\e976";
|
||||
}
|
||||
.icon-supplierfalse:before {
|
||||
content: '\e913';
|
||||
content: "\e977";
|
||||
}
|
||||
.icon-tags:before {
|
||||
content: '\e914';
|
||||
content: "\e979";
|
||||
}
|
||||
.icon-tax:before {
|
||||
content: '\e915';
|
||||
content: "\e97a";
|
||||
}
|
||||
.icon-thermometer:before {
|
||||
content: '\e916';
|
||||
content: "\e97b";
|
||||
}
|
||||
.icon-ticket:before {
|
||||
content: '\e917';
|
||||
content: "\e97c";
|
||||
}
|
||||
.icon-ticketAdd:before {
|
||||
content: '\e918';
|
||||
content: "\e97e";
|
||||
}
|
||||
.icon-traceability:before {
|
||||
content: '\e919';
|
||||
content: "\e97f";
|
||||
}
|
||||
.icon-transaction:before {
|
||||
content: '\e93b';
|
||||
}
|
||||
.icon-transaction:before {
|
||||
content: '\e93b';
|
||||
content: "\e91b";
|
||||
}
|
||||
.icon-treatments:before {
|
||||
content: '\e91c';
|
||||
content: "\e980";
|
||||
}
|
||||
.icon-trolley:before {
|
||||
content: '\e91a';
|
||||
content: "\e900";
|
||||
}
|
||||
.icon-troncales:before {
|
||||
content: '\e91b';
|
||||
content: "\e982";
|
||||
}
|
||||
.icon-unavailable:before {
|
||||
content: '\e91d';
|
||||
content: "\e983";
|
||||
}
|
||||
.icon-visible_columns_Icono:before {
|
||||
content: "\e984";
|
||||
}
|
||||
.icon-volume:before {
|
||||
content: '\e91f';
|
||||
content: "\e985";
|
||||
}
|
||||
.icon-wand:before {
|
||||
content: '\e920';
|
||||
content: "\e986";
|
||||
}
|
||||
.icon-web:before {
|
||||
content: '\e921';
|
||||
content: "\e987";
|
||||
}
|
||||
.icon-wiki:before {
|
||||
content: '\e922';
|
||||
content: "\e989";
|
||||
}
|
||||
.icon-worker:before {
|
||||
content: '\e923';
|
||||
content: "\e98a";
|
||||
}
|
||||
.icon-zone:before {
|
||||
content: '\e924';
|
||||
content: "\e98b";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%);
|
|||
$dark-shadow-color: black;
|
||||
$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
|
||||
$spacing-md: 16px;
|
||||
|
||||
$color-font-secondary: #777;
|
||||
.bg-success {
|
||||
background-color: $positive;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -871,7 +871,7 @@ worker:
|
|||
sex: Sexo
|
||||
seniority: Antigüedad
|
||||
fi: DNI/NIE/NIF
|
||||
birth: Cumpleaños
|
||||
birth: Fecha de nacimiento
|
||||
isFreelance: Autónomo
|
||||
isSsDiscounted: Bonificación SS
|
||||
hasMachineryAuthorized: Autorizado para llevar maquinaria
|
||||
|
|
|
|||
|
|
@ -320,13 +320,13 @@ function exprBuilder(param, value) {
|
|||
<QTable
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
class="full-width q-mt-md"
|
||||
class="full-width"
|
||||
row-key="clientFk"
|
||||
selection="multiple"
|
||||
v-model:selected="selected"
|
||||
>
|
||||
<template #header="props">
|
||||
<QTr :props="props" class="bg">
|
||||
<QTr :props="props" class="bg" style="min-height: 200px">
|
||||
<QTh>
|
||||
<QCheckbox v-model="props.selected" />
|
||||
</QTh>
|
||||
|
|
@ -372,8 +372,9 @@ function exprBuilder(param, value) {
|
|||
<VnInput
|
||||
type="textarea"
|
||||
v-model="props.value"
|
||||
autogrow
|
||||
:disable="true"
|
||||
readonly
|
||||
dense
|
||||
rows="2"
|
||||
/>
|
||||
</div>
|
||||
<div v-else>{{ props.value }}</div>
|
||||
|
|
|
|||
|
|
@ -201,6 +201,6 @@ es:
|
|||
isDisable: Trabajador desactivado
|
||||
fi: DNI/NIE/NIF
|
||||
sex: Sexo
|
||||
birth: Cumpleaños
|
||||
birth: Fecha de Nacimiento
|
||||
isSsDiscounted: Bonificación SS
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ const filter = {
|
|||
<template #body="{ entity: worker }">
|
||||
<QCard class="vn-one">
|
||||
<VnTitle
|
||||
:url="workerUrl + `basic-data`"
|
||||
:url="`#/worker/${entityId}/basic-data`"
|
||||
:text="t('worker.summary.basicData')"
|
||||
/>
|
||||
<VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
|
||||
|
|
@ -113,7 +113,7 @@ const filter = {
|
|||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle
|
||||
:url="workerUrl + `basic-data`"
|
||||
:url="`#/worker/${entityId}/basic-data`"
|
||||
:text="t('worker.summary.basicData')"
|
||||
/>
|
||||
<VnLv
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ describe('VnLocation', () => {
|
|||
});
|
||||
it('Create postCode', function () {
|
||||
cy.get(
|
||||
':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
|
||||
':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
|
||||
).click();
|
||||
cy.get('.q-card > h1').should('have.text', 'New postcode');
|
||||
cy.get(dialogInputs).eq(0).clear('12');
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@ describe('ClaimPhoto', () => {
|
|||
cy.get('.q-notification__message').should('have.text', 'Data saved');
|
||||
});
|
||||
|
||||
/* it.skip('should open first image dialog change to second and close', () => {
|
||||
skiped fix on https://redmine.verdnatura.es/issues/7113
|
||||
it('should open first image dialog change to second and close', () => {
|
||||
cy.get(
|
||||
':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
|
||||
).click();
|
||||
|
|
@ -38,19 +37,23 @@ describe('ClaimPhoto', () => {
|
|||
cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
|
||||
'not.be.visible'
|
||||
);
|
||||
}); */
|
||||
});
|
||||
|
||||
it('should remove third and fourth file', () => {
|
||||
cy.get(
|
||||
'.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
|
||||
).click();
|
||||
cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
|
||||
cy.get(
|
||||
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
|
||||
).click();
|
||||
cy.get('.q-notification__message').should('have.text', 'Data deleted');
|
||||
|
||||
cy.get(
|
||||
'.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
|
||||
).click();
|
||||
cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
|
||||
cy.get(
|
||||
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
|
||||
).click();
|
||||
cy.get('.q-notification__message').should('have.text', 'Data deleted');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ describe('WorkerList', () => {
|
|||
.eq(0)
|
||||
.invoke('text')
|
||||
.should('include', 'Basic data');
|
||||
cy.get('.summary .header-link').eq(1).should('have.text', 'User data ');
|
||||
cy.get('.summary .header-link').eq(2).should('have.text', 'User data ');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
describe('WorkerList', () => {
|
||||
const workerId = 1109;
|
||||
const lockerCode = '201A';
|
||||
const lockerCode = '2F';
|
||||
const input = '.q-card input';
|
||||
const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
|
||||
beforeEach(() => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue