verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 71 Releases Wiki Activity

feat: add departmentMail #1058

Closed
jorgep wants to merge 3 commits from hotfix-addDeptMail into master
pull from: hotfix-addDeptMail
merge into: verdnatura:master
Conversation 0 Commits 3 Files Changed 4 +8
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 892fda888b - Show all commits

1
src/i18n/locale/en.yml
View File

@ -335,6 +335,7 @@ globals:
deleteConfirmTitle: Delete selected elements deleteConfirmTitle: Delete selected elements
changeState: Change state changeState: Change state
raid: 'Raid {daysInForward} days' raid: 'Raid {daysInForward} days'
departmentMail: Ce
errors: errors:
statusUnauthorized: Access denied statusUnauthorized: Access denied
statusInternalServerError: An internal server error has ocurred statusInternalServerError: An internal server error has ocurred

1
src/i18n/locale/es.yml
View File

@ -339,6 +339,7 @@ globals:
deleteConfirmTitle: Eliminar los elementos seleccionados deleteConfirmTitle: Eliminar los elementos seleccionados
changeState: Cambiar estado changeState: Cambiar estado
raid: 'Redada {daysInForward} días' raid: 'Redada {daysInForward} días'
departmentMail: Ce
errors: errors:
statusUnauthorized: Acceso denegado statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor statusInternalServerError: Ha ocurrido un error interno del servidor

6
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -10,6 +10,7 @@ import { useState } from 'src/composables/useState';
import axios from 'axios'; import axios from 'axios';
import VnImg from 'src/components/ui/VnImg.vue'; import VnImg from 'src/components/ui/VnImg.vue';
import EditPictureForm from 'components/EditPictureForm.vue'; import EditPictureForm from 'components/EditPictureForm.vue';
import department from 'src/router/modules/department';
const $props = defineProps({ const $props = defineProps({
id: { id: {
@ -143,6 +144,11 @@ const handlePhotoUpdated = (evt = false) => {
:value="entity.user?.emailUser?.email" :value="entity.user?.emailUser?.email"
copy copy
/> />
<VnLv
:label="t('globals.departmentMail')"
:value="entity?.department?.department?.notificationEmail"
copy
/>
<VnLv <VnLv
:label="t('worker.list.department')" :label="t('worker.list.department')"
:value="entity.department ? entity.department.department.name : null" :value="entity.department ? entity.department.department.name : null"