@@ -466,11 +474,13 @@ const lockIconType = (groupingMode, mode) => {
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 305d29b8b..155c9eb4c 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -16,6 +16,7 @@ import useCardDescription from 'src/composables/useCardDescription';
import { useSession } from 'src/composables/useSession';
import { getUrl } from 'src/composables/getUrl';
import axios from 'axios';
+import { dashIfEmpty } from 'src/filters';
const $props = defineProps({
id: {
@@ -182,6 +183,10 @@ const openCloneDialog = async () => {
+
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
-
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
const { t } = useI18n();
const props = defineProps({
@@ -16,10 +16,11 @@ const props = defineProps({
});
const countries = ref();
+const warehouses = ref();
-
+
@@ -93,13 +94,13 @@ const countries = ref();
-
-
+
-
+
+
+
+
+
-
en:
params:
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 154e49977..cbfc3751a 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -14,6 +14,7 @@ const { t } = useI18n();
const { getTokenMultimedia } = useSession();
const token = getTokenMultimedia();
const selected = ref([]);
+const warehouses = ref([]);
const columns = computed(() => [
{
@@ -63,6 +64,13 @@ const columns = computed(() => [
sortable: true,
headerStyle: 'padding-left: 33px',
},
+ {
+ name: 'warehouseFk',
+ label: t('globals.warehouse'),
+ field: ({ warehouseFk }) => warehouseFk,
+ align: 'center',
+ sortable: true,
+ },
{
name: 'icons',
align: 'center',
@@ -99,7 +107,7 @@ function downloadPdfs() {
+
+
+ {{ warehouses.find(({ id }) => id === value)?.name }}
+
+
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index f55669619..0715cf7ba 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -35,6 +35,7 @@ const ticket = ref();
const salesLines = ref(null);
const editableStates = ref([]);
const ticketUrl = ref();
+const grafanaUrl = 'https://grafana.verdnatura.es';
onMounted(async () => {
ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -159,6 +160,20 @@ async function changeState(value) {
:label="t('ticket.summary.warehouse')"
:value="ticket.warehouse?.name"
/>
+
+
+
+ {{ ticket.ticketCollections[0]?.collectionFk }}
+
+
+
@@ -487,4 +502,7 @@ async function changeState(value) {
.fetched-tags {
max-width: 70%;
}
+.grafana {
+ color: $primary-light;
+}
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
new file mode 100644
index 000000000..ef75ba55a
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ Reset password: Restablecer contraseña
+ New password: Nueva contraseña
+ Repeat password: Repetir contraseña
+ You must enter a new password: Debes introducir la nueva contraseña
+ Passwords don't match: Las contraseñas no coinciden
+
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index daa290ea1..86c846aca 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -6,8 +6,10 @@ import { useSession } from 'src/composables/useSession';
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
import useCardDescription from 'src/composables/useCardDescription';
import { useState } from 'src/composables/useState';
+import axios from 'axios';
const $props = defineProps({
id: {
@@ -25,12 +27,16 @@ const route = useRoute();
const { t } = useI18n();
const { getTokenMultimedia } = useSession();
const state = useState();
+const user = state.getUser();
+const changePasswordFormDialog = ref(null);
+const cardDescriptorRef = ref(null);
const entityId = computed(() => {
return $props.id || route.params.id;
});
const worker = ref();
+const workerExcluded = ref(false);
const filter = {
include: [
{
@@ -71,14 +77,44 @@ function getWorkerAvatar() {
const token = getTokenMultimedia();
return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
}
+
const data = ref(useCardDescription());
const setData = (entity) => {
if (!entity) return;
data.value = useCardDescription(entity.user.nickname, entity.id);
};
+
+const openChangePasswordForm = () => changePasswordFormDialog.value.show();
+
+const getIsExcluded = async () => {
+ try {
+ const { data } = await axios.get(
+ `WorkerDisableExcludeds/${entityId.value}/exists`
+ );
+ if (!data) return;
+ workerExcluded.value = data.exists;
+ } catch (err) {
+ console.error('Error getting worker excluded: ', err);
+ }
+};
+
+const handleExcluded = async () => {
+ if (workerExcluded.value)
+ await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
+ else
+ await axios.post(`WorkerDisableExcludeds`, {
+ workerFk: entityId.value,
+ dated: new Date(),
+ });
+
+ workerExcluded.value = !workerExcluded.value;
+};
+
+const refetch = async () => await cardDescriptorRef.value.getData();
{
(data) => {
worker = data;
setData(data);
+ getIsExcluded();
}
"
>
+
+
+
+ {{
+ workerExcluded
+ ? t('Click to allow the user to be disabled')
+ : t('Click to exclude the user from getting disabled')
+ }}
+
+
+
+
+ {{ t('Change password') }}
+
+
+
+
+
+
@@ -139,3 +200,10 @@ const setData = (entity) => {
height: 256px;
}
+
+
+es:
+ Click to allow the user to be disabled: Marcar para deshabilitar
+ Click to exclude the user from getting disabled: Marcar para no deshabilitar
+ Change password: Cambiar contraseña
+
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d9a650d9a..f466c4f9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -460,7 +460,7 @@ onMounted(async () => {
style="margin-left: 1px"
/>
-
+
{
{
url-create="Workers/new"
model="worker"
:form-initial-data="formData"
- @on-data-saved="({ id }) => $router.push({ path: `/worker/${id}` })"
+ @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
>
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 34340b019..392539c86 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -6,12 +6,11 @@ import { useQuasar } from 'quasar';
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
import CreateDepartmentChild from './CreateDepartmentChild.vue';
import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
import { useRouter } from 'vue-router';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
const quasar = useQuasar();
const { t } = useI18n();
-const { notify } = useNotify();
const state = useState();
const router = useRouter();
@@ -62,25 +61,28 @@ const removeNode = (node) => {
const { id, parentFk } = node;
quasar
.dialog({
- title: t('Are you sure you want to delete it?'),
- message: t('Delete department'),
- ok: {
- push: true,
- color: 'primary',
+ component: VnConfirm,
+ componentProps: {
+ title: t('Are you sure you want to delete it?'),
+ message: t('Delete department'),
+ promise: () => remove(id),
},
- cancel: true,
})
- .onOk(async () => {
- try {
- await axios.post(`/Departments/${id}/removeChild`, id);
- notify(t('department.departmentRemoved'), 'positive');
- await fetchNodeLeaves(parentFk);
- } catch (err) {
- console.error('Error removing department');
- }
- });
+ .onOk(async () => await fetchNodeLeaves(parentFk));
};
+async function remove(id) {
+ try {
+ await axios.post(`/Departments/${id}/removeChild`, { id });
+ quasar.notify({
+ message: t('department.departmentRemoved'),
+ type: 'positive',
+ });
+ } catch (err) {
+ console.error('Error removing department');
+ }
+}
+
const showCreateNodeForm = (nodeId) => {
showCreateNodeFormVal.value = true;
creationNodeSelectedId.value = nodeId;
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
new file mode 100644
index 000000000..f947b30e7
--- /dev/null
+++ b/src/pages/Worker/locale/en.yml
@@ -0,0 +1 @@
+passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index f74cb4fdb..d2478535a 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -3,3 +3,4 @@ You can search by worker id or name: Puedes buscar por id o nombre del trabajado
Locker: Taquilla
Internal: Interno
External: Externo
+passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
diff --git a/src/router/index.js b/src/router/index.js
index 7a0aedcae..41ff4c1da 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,6 +13,7 @@ import { useRole } from 'src/composables/useRole';
import { useUserConfig } from 'src/composables/useUserConfig';
import { toLowerCamel } from 'src/filters';
import { useTokenConfig } from 'src/composables/useTokenConfig';
+import { useAcl } from 'src/composables/useAcl';
const state = useState();
const session = useSession();
@@ -55,6 +56,7 @@ export default route(function (/* { store, ssrContext } */) {
const stateRoles = state.getRoles().value;
if (stateRoles.length === 0) {
await useRole().fetch();
+ await useAcl().fetch();
await useUserConfig().fetch();
await useTokenConfig().fetch();
}
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index bc95719ef..f325a8dcd 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,16 @@ export default {
component: RouterView,
redirect: { name: 'AccountMain' },
menus: {
- main: ['AccountList', 'AccountAliasList', 'AccountRoles', 'AccountAcls'],
+ main: [
+ 'AccountList',
+ 'AccountAliasList',
+ 'AccountRoles',
+ 'AccountAccounts',
+ 'AccountLdap',
+ 'AccountSamba',
+ 'AccountAcls',
+ 'AccountConnections',
+ ],
card: [],
},
children: [
@@ -30,6 +39,15 @@ export default {
},
component: () => import('src/pages/Account/AccountList.vue'),
},
+ {
+ path: 'role-list',
+ name: 'AccountRoles',
+ meta: {
+ title: 'roles',
+ icon: 'group',
+ },
+ component: () => import('src/pages/Account/Role/AccountRoles.vue'),
+ },
{
path: 'alias-list',
name: 'AccountAliasList',
@@ -39,6 +57,45 @@ export default {
},
component: () => import('src/pages/Account/AccountAliasList.vue'),
},
+ {
+ path: 'connections',
+ name: 'AccountConnections',
+ meta: {
+ title: 'connections',
+ icon: 'check',
+ },
+ component: () => import('src/pages/Account/AccountConnections.vue'),
+ },
+ {
+ path: 'accounts',
+ name: 'AccountAccounts',
+ meta: {
+ title: 'accounts',
+ icon: 'accessibility',
+ roles: ['itManagement'],
+ },
+ component: () => import('src/pages/Account/AccountAccounts.vue'),
+ },
+ {
+ path: 'ldap',
+ name: 'AccountLdap',
+ meta: {
+ title: 'ldap',
+ icon: 'account_tree',
+ roles: ['itManagement'],
+ },
+ component: () => import('src/pages/Account/AccountLdap.vue'),
+ },
+ {
+ path: 'samba',
+ name: 'AccountSamba',
+ meta: {
+ title: 'samba',
+ icon: 'preview',
+ roles: ['itManagement'],
+ },
+ component: () => import('src/pages/Account/AccountSamba.vue'),
+ },
{
path: 'acls',
name: 'AccountAcls',
@@ -53,15 +110,6 @@ export default {
name: 'AccountAclForm',
component: () => import('src/pages/Account/Acls/AclFormView.vue'),
},
- {
- path: 'role-list',
- name: 'AccountRoles',
- meta: {
- title: 'roles',
- icon: 'group',
- },
- component: () => import('src/pages/Account/Role/AccountRoles.vue'),
- },
],
},
],
diff --git a/src/router/routes.js b/src/router/routes.js
index 8d5202dda..805eefb8c 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -10,6 +10,7 @@ import wagon from './modules/wagon';
import supplier from './modules/Supplier';
import travel from './modules/travel';
import department from './modules/department';
+import role from './modules/role';
import ItemType from './modules/itemType';
import shelving from 'src/router/modules/shelving';
import order from 'src/router/modules/order';
@@ -21,7 +22,6 @@ import zone from 'src/router/modules/zone';
import account from './modules/account';
import monitor from 'src/router/modules/monitor';
import mailAlias from './modules/mailAlias';
-import role from './modules/role';
const routes = [
{
diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
new file mode 100644
index 000000000..a2b44b5e7
--- /dev/null
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -0,0 +1,88 @@
+import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
+import { useAcl } from 'src/composables/useAcl';
+
+describe('useAcl', () => {
+ const acl = useAcl();
+ const mockAcls = [
+ {
+ model: 'Address',
+ property: '*',
+ accessType: '*',
+ permission: 'ALLOW',
+ principalType: 'ROLE',
+ principalId: 'employee',
+ },
+ {
+ model: 'Worker',
+ property: 'holidays',
+ accessType: 'READ',
+ permission: 'ALLOW',
+ principalType: 'ROLE',
+ principalId: 'employee',
+ },
+ {
+ model: 'Url',
+ property: 'getByUser',
+ accessType: 'READ',
+ permission: 'ALLOW',
+ principalType: 'ROLE',
+ principalId: '$everyone',
+ },
+ {
+ model: 'TpvTransaction',
+ property: 'start',
+ accessType: 'WRITE',
+ permission: 'ALLOW',
+ principalType: 'ROLE',
+ principalId: '$authenticated',
+ },
+ ];
+
+ beforeAll(async () => {
+ vi.spyOn(axios, 'get').mockResolvedValue({ data: mockAcls });
+ await acl.fetch();
+ });
+
+ afterAll(async () => await flushPromises());
+
+ describe('hasAny', () => {
+ it('should return false if no roles matched', async () => {
+ expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+ });
+
+ it('should return false if no roles matched', async () => {
+ expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+ });
+
+ describe('*', () => {
+ it('should return true if an acl matched', async () => {
+ expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+ });
+
+ it('should return false if no acls matched', async () => {
+ expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+ });
+ });
+
+ describe('$authenticated', () => {
+ it('should return false if no acls matched', async () => {
+ expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+ });
+
+ it('should return true if an acl matched', async () => {
+ expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+ });
+ });
+
+ describe('$everyone', () => {
+ it('should return false if no acls matched', async () => {
+ expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+ });
+
+ it('should return false if an acl matched', async () => {
+ expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+ });
+ });
+ });
+});
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 2292859a9..831acbf18 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -1,5 +1,5 @@
import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import { axios } from 'app/test/vitest/helper';
import { useSession } from 'composables/useSession';
import { useState } from 'composables/useState';
@@ -87,13 +87,17 @@ describe('session', () => {
},
},
];
+ beforeEach(() => {
+ vi.spyOn(axios, 'get').mockImplementation((url) => {
+ if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+ return Promise.resolve({
+ data: { roles: rolesData, user: expectedUser },
+ });
+ });
+ });
it('should fetch the user roles and then set token in the sessionStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
- vi.spyOn(axios, 'get').mockResolvedValue({
- data: { roles: rolesData, user: expectedUser },
- });
-
const expectedToken = 'mySessionToken';
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
const keepLogin = false;
@@ -117,10 +121,6 @@ describe('session', () => {
it('should fetch the user roles and then set token in the localStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
- vi.spyOn(axios, 'get').mockResolvedValue({
- data: { roles: rolesData, user: expectedUser },
- });
-
const expectedToken = 'myLocalToken';
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/test/vitest/__tests__/pages/Login/Login.spec.js
index 6e2de9870..9b9968736 100644
--- a/test/vitest/__tests__/pages/Login/Login.spec.js
+++ b/test/vitest/__tests__/pages/Login/Login.spec.js
@@ -23,8 +23,9 @@ describe('Login', () => {
},
};
vi.spyOn(axios, 'post').mockResolvedValueOnce({ data: { token: 'token' } });
- vi.spyOn(axios, 'get').mockResolvedValue({
- data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }},
+ vi.spyOn(axios, 'get').mockImplementation((url) => {
+ if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+ return Promise.resolve({data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }}});
});
vi.spyOn(vm.quasar, 'notify');