forked from verdnatura/salix-front
Merge branch 'dev' into 7129-finishRouteMigration
This commit is contained in:
commit
d6f085dc3d
99
CHANGELOG.md
99
CHANGELOG.md
|
@ -1,3 +1,100 @@
|
|||
# Version 24.24 - 2024-06-11
|
||||
|
||||
### Added 🆕
|
||||
|
||||
- feat: 6942 hashtag in key : value summary by:jgallego
|
||||
- feat: #6957: Rename FetchedTags instance tag by:Javier Segarra
|
||||
- feat: refactor template by:Javier Segarra
|
||||
- feat: refs #6600 Add option to add comment for photo motivation by:jorgep
|
||||
- feat: refs #6942 test e2e tobook & toUnbook by:jorgep
|
||||
- feat: refs #6942 to book summary button & reactive value by:jorgep
|
||||
- feat: refs #6942 to unbook by:jorgep
|
||||
- feat: refs #6942 url update by:jorgep
|
||||
- feat: refs #6942 use correct currency in InvoiceIn components by:jorgep
|
||||
- feat: refs #6942 vat rate total by:jorgep
|
||||
- feat: refs #7494 new icons (7494-icons) by:alexm
|
||||
- feat: refs #7494 new icons by:alexm
|
||||
- feat: refs #7542 drop space by:jorgep
|
||||
- feat: refs #7542 empty by:jorgep
|
||||
- fix: refs #6942 changes and new features by:jorgep
|
||||
- fix: style by:Javier Segarra
|
||||
- style: color transparent when is fetive by:Javier Segarra
|
||||
- style: fix color when is empty by:Javier Segarra
|
||||
- style: reset poc style (6957_refactorFetechedTags) by:Javier Segarra
|
||||
- style: reset poc style by:Javier Segarra
|
||||
- style updates by:Javier Segarra
|
||||
|
||||
### Changed 📦
|
||||
|
||||
- feat: refactor template by:Javier Segarra
|
||||
- perf: 6957 add color as new shared variable by:Javier Segarra
|
||||
- perf: 6957 change fetchedTags color by:Javier Segarra
|
||||
- perf: remove local tree variable by:Javier Segarra
|
||||
- refactor: add flat by:alexm
|
||||
- refactor: refs #6600 replace QInput to VnInput by:jorgep
|
||||
- refactor: refs #6652 improved defaulter section by:Jon
|
||||
- refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue by:jorgep
|
||||
- refactor: refs #6942 new summary layout by:jorgep
|
||||
- refactor: refs #6942 store key & actions by:jorgep
|
||||
- refactor: refs #6942 summary by:jorgep
|
||||
- refactor: refs #6942 use router hook by:jorgep
|
||||
- refactor: refs #6942 WIP summary layout by:jorgep
|
||||
|
||||
### Fixed 🛠️
|
||||
|
||||
- fix: 9-12 by:Javier Segarra
|
||||
- fix: defaulter icon by:alexm
|
||||
- fix: refs #5186 validation by:jorgep
|
||||
- fix: refs #6095 add reFfk null on search by:pablone
|
||||
- fix: refs #6942 cardDescriptor use store if its popup or different source data by:jorgep
|
||||
- fix: refs #6942 changes and new features by:jorgep
|
||||
- fix: refs #6942 drop comments by:jorgep
|
||||
- fix: refs #6942 drop console by:jorgep
|
||||
- fix: refs #6942 drop console.log by:jorgep
|
||||
- fix: refs #6942 e2e test (origin/6942-warmfix-fixFormModel) by:jorgep
|
||||
- fix: refs #6942 e2e tests by:jorgep
|
||||
- fix: refs #6942 e2e tests by:jorgep
|
||||
- fix: refs #6942 fix emit on data saved by:jorgep
|
||||
- fix: refs #6942 fix emit on reset by:jorgep
|
||||
- fix: refs #6942 fix vncard by:jorgep
|
||||
- fix: refs #6942 formModel & CardDescriptor by:jorgep
|
||||
- fix: refs #6942 formModel watch changes & invoiceInCreate by:jorgep
|
||||
- fix: refs #6942 import by:jorgep
|
||||
- fix: refs #6942 reloading by:jorgep
|
||||
- fix: refs #6942 rollback by:jorgep
|
||||
- fix: refs #6942 selectable expense by:jorgep
|
||||
- fix: refs #6942 skip e2e tests by:jorgep
|
||||
- fix: refs #6942 table bottom highlight & drop isBooked field by:jorgep
|
||||
- fix: refs #6942 tests e2e by:jorgep
|
||||
- fix: refs #6942 tests & summary table spacing by:jorgep
|
||||
- fix: refs #6942 unit tests by:jorgep
|
||||
- fix: refs #6942 vnLocation by:jorgep
|
||||
- fix: refs #6942 wip: formModel by:jorgep
|
||||
- fix: refs #7542 use right panel by:jorgep
|
||||
- fix: searchbar redirect by:alexm
|
||||
- fix: style by:Javier Segarra
|
||||
- fix: WorkerCalendarItem by:Javier Segarra
|
||||
- mini fix by:wbuezas
|
||||
- refs #6111 clean code fix changes by:carlossa
|
||||
- refs #6111 fix merge, fix column by:carlossa
|
||||
- refs #6111 fix qtable, actions, scroll by:carlossa
|
||||
- refs #6111 fix routeList by:carlossa
|
||||
- refs #6111 fix sticky by:carlossa
|
||||
- refs #6111 fix trad remove logs by:carlossa
|
||||
- refs #6111 fix visibleColumns by:carlossa
|
||||
- refs #6111 routeList fix by:carlossa
|
||||
- refs #6332 fix calendar by:carlossa
|
||||
- refs #6332 fix colors by:carlossa
|
||||
- refs #6332 fix festive by:carlossa
|
||||
- refs #6820 fix BasicData Tickets by:carlossa
|
||||
- refs #6820 fix error front by:carlossa
|
||||
- refs #6820 fix traduction by:carlossa
|
||||
- refs #7391 fix textarea by:carlossa
|
||||
- refs #7396 fix summary by:carlossa
|
||||
- Search childs fix by:wbuezas
|
||||
- small fix by:wbuezas
|
||||
- style: fix color when is empty by:Javier Segarra
|
||||
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
@ -10,6 +107,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
### Added
|
||||
|
||||
- (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
|
||||
- (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa
|
||||
- (Route) => Ahora se muestran todos los cmrs
|
||||
|
||||
## [2418.01]
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ pipeline {
|
|||
sh 'quasar build'
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
||||
}
|
||||
dockerBuild()
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ pipeline {
|
|||
steps {
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
||||
}
|
||||
withKubeConfig([
|
||||
serverUrl: "$KUBERNETES_API",
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
features_types=(chore feat style)
|
||||
changes_types=(refactor perf)
|
||||
fix_types=(fix revert)
|
||||
file="CHANGELOG.md"
|
||||
file_tmp="temp_log.txt"
|
||||
file_current_tmp="temp_current_log.txt"
|
||||
|
||||
setType(){
|
||||
echo "### $1" >> $file_tmp
|
||||
arr=("$@")
|
||||
echo "" > $file_current_tmp
|
||||
for i in "${arr[@]}"
|
||||
do
|
||||
git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
|
||||
done
|
||||
# remove duplicates
|
||||
sort -o $file_current_tmp -u $file_current_tmp
|
||||
cat $file_current_tmp >> $file_tmp
|
||||
echo "" >> $file_tmp
|
||||
# remove tmp current file
|
||||
[ -e $file_current_tmp ] && rm $file_current_tmp
|
||||
}
|
||||
|
||||
echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
|
||||
echo "" >> $file_tmp
|
||||
|
||||
setType "Added 🆕" "${features_types[@]}"
|
||||
setType "Changed 📦" "${changes_types[@]}"
|
||||
setType "Fixed 🛠️" "${fix_types[@]}"
|
||||
|
||||
cat $file >> $file_tmp
|
||||
mv $file_tmp $file
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-front",
|
||||
"version": "24.26.0",
|
||||
"version": "24.26.2",
|
||||
"description": "Salix frontend",
|
||||
"productName": "Salix",
|
||||
"author": "Verdnatura",
|
||||
|
|
|
@ -1,21 +1,48 @@
|
|||
import { getCurrentInstance } from 'vue';
|
||||
|
||||
const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
|
||||
const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
|
||||
|
||||
const filterAvailableInput = (element) => {
|
||||
return element.classList.contains('q-field__native') && !element.disabled;
|
||||
};
|
||||
const filterAvailableText = (element) => {
|
||||
return (
|
||||
element.__vueParentComponent.type.name === 'QInput' &&
|
||||
element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
|
||||
);
|
||||
};
|
||||
|
||||
export default {
|
||||
mounted: function () {
|
||||
const vm = getCurrentInstance();
|
||||
if (vm.type.name === 'QForm')
|
||||
if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
|
||||
if (vm.type.name === 'QForm') {
|
||||
if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
|
||||
// AUTOFOCUS
|
||||
const elementsArray = Array.from(this.$el.elements);
|
||||
const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
|
||||
const availableInputs = elementsArray.filter(filterAvailableInput);
|
||||
const firstInputElement = availableInputs.find(filterAvailableText);
|
||||
|
||||
if (firstInputElement) {
|
||||
firstInputElement.focus();
|
||||
}
|
||||
const that = this;
|
||||
this.$el.addEventListener('keyup', function (evt) {
|
||||
if (evt.key === 'Enter') {
|
||||
const input = evt.target;
|
||||
console.log('input', input);
|
||||
if (input.type == 'textarea' && evt.shiftKey) {
|
||||
evt.preventDefault();
|
||||
let { selectionStart, selectionEnd } = input;
|
||||
input.value =
|
||||
input.value.substring(0, selectionStart) +
|
||||
'\n' +
|
||||
input.value.substring(selectionEnd);
|
||||
selectionStart = selectionEnd = selectionStart + 1;
|
||||
return;
|
||||
}
|
||||
evt.preventDefault();
|
||||
that.onSubmit();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
|
|
@ -155,7 +155,7 @@ const rotateRight = () => {
|
|||
editor.value.rotate(-90);
|
||||
};
|
||||
|
||||
const onUploadAccept = () => {
|
||||
const onSubmit = () => {
|
||||
try {
|
||||
if (!newPhoto.files && !newPhoto.url) {
|
||||
notify(t('Select an image'), 'negative');
|
||||
|
@ -206,7 +206,7 @@ const makeRequest = async () => {
|
|||
@on-fetch="(data) => (allowedContentTypes = data.join(', '))"
|
||||
auto-load
|
||||
/>
|
||||
<QForm @submit="onUploadAccept()" class="all-pointer-events">
|
||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
||||
<QCard class="q-pa-lg">
|
||||
<span ref="closeButton" class="close-icon" v-close-popup>
|
||||
<QIcon name="close" size="sm" />
|
||||
|
|
|
@ -50,7 +50,7 @@ const onDataSaved = () => {
|
|||
closeForm();
|
||||
};
|
||||
|
||||
const submitData = async () => {
|
||||
const onSubmit = async () => {
|
||||
try {
|
||||
isLoading.value = true;
|
||||
const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
|
||||
|
@ -74,7 +74,7 @@ const closeForm = () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<QForm @submit="submitData()" class="all-pointer-events">
|
||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
||||
<QCard class="q-pa-lg">
|
||||
<span ref="closeButton" class="close-icon" v-close-popup>
|
||||
<QIcon name="close" size="sm" />
|
||||
|
|
|
@ -83,7 +83,7 @@ const tableColumns = computed(() => [
|
|||
},
|
||||
]);
|
||||
|
||||
const fetchResults = async () => {
|
||||
const onSubmit = async () => {
|
||||
try {
|
||||
let filter = itemFilter;
|
||||
const params = itemFilterParams;
|
||||
|
@ -145,7 +145,7 @@ const selectItem = ({ id }) => {
|
|||
@on-fetch="(data) => (InksOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
<QForm @submit="fetchResults()" class="all-pointer-events">
|
||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
||||
<QCard class="column" style="padding: 32px; z-index: 100">
|
||||
<span ref="closeButton" class="close-icon" v-close-popup>
|
||||
<QIcon name="close" size="sm" />
|
||||
|
|
|
@ -85,7 +85,7 @@ const tableColumns = computed(() => [
|
|||
},
|
||||
]);
|
||||
|
||||
const fetchResults = async () => {
|
||||
const onSubmit = async () => {
|
||||
try {
|
||||
let filter = travelFilter;
|
||||
const params = travelFilterParams;
|
||||
|
@ -138,7 +138,7 @@ const selectTravel = ({ id }) => {
|
|||
@on-fetch="(data) => (warehousesOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
<QForm @submit="fetchResults()" class="all-pointer-events">
|
||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
||||
<QCard class="column" style="padding: 32px; z-index: 100">
|
||||
<span ref="closeButton" class="close-icon" v-close-popup>
|
||||
<QIcon name="close" size="sm" />
|
||||
|
|
|
@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
|
|||
import VnConfirm from './ui/VnConfirm.vue';
|
||||
import { tMobile } from 'src/composables/tMobile';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
const { push } = useRouter();
|
||||
const quasar = useQuasar();
|
||||
|
@ -20,6 +21,7 @@ const stateStore = useStateStore();
|
|||
const { t } = useI18n();
|
||||
const { validate } = useValidator();
|
||||
const { notify } = useNotify();
|
||||
const route = useRoute();
|
||||
|
||||
const $props = defineProps({
|
||||
url: {
|
||||
|
@ -28,7 +30,7 @@ const $props = defineProps({
|
|||
},
|
||||
model: {
|
||||
type: String,
|
||||
default: '',
|
||||
default: null,
|
||||
},
|
||||
filter: {
|
||||
type: Object,
|
||||
|
@ -82,17 +84,18 @@ const $props = defineProps({
|
|||
description: 'It is used for redirect on click "save and continue"',
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onFetch', 'onDataSaved']);
|
||||
|
||||
const modelValue = computed(
|
||||
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
|
||||
);
|
||||
const componentIsRendered = ref(false);
|
||||
const arrayData = useArrayData($props.model);
|
||||
const arrayData = useArrayData(modelValue);
|
||||
const isLoading = ref(false);
|
||||
// Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
|
||||
const isResetting = ref(false);
|
||||
const hasChanges = ref(!$props.observeFormChanges);
|
||||
const originalData = ref({});
|
||||
const formData = computed(() => state.get($props.model));
|
||||
const formData = computed(() => state.get(modelValue));
|
||||
const formUrl = computed(() => $props.url);
|
||||
const defaultButtons = computed(() => ({
|
||||
save: {
|
||||
|
@ -114,7 +117,7 @@ onMounted(async () => {
|
|||
nextTick(() => (componentIsRendered.value = true));
|
||||
|
||||
// Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
|
||||
state.set($props.model, $props.formInitialData);
|
||||
state.set(modelValue, $props.formInitialData);
|
||||
|
||||
if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
|
||||
else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
|
||||
|
@ -161,8 +164,8 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
|
||||
onUnmounted(() => {
|
||||
// Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
|
||||
if (hasChanges.value) return state.set($props.model, originalData.value);
|
||||
if ($props.clearStoreOnUnmount) state.unset($props.model);
|
||||
if (hasChanges.value) return state.set(modelValue, originalData.value);
|
||||
if ($props.clearStoreOnUnmount) state.unset(modelValue);
|
||||
});
|
||||
|
||||
async function fetch() {
|
||||
|
@ -174,7 +177,7 @@ async function fetch() {
|
|||
|
||||
updateAndEmit('onFetch', data);
|
||||
} catch (e) {
|
||||
state.set($props.model, {});
|
||||
state.set(modelValue, {});
|
||||
originalData.value = {};
|
||||
}
|
||||
}
|
||||
|
@ -235,11 +238,11 @@ function filter(value, update, filterOptions) {
|
|||
}
|
||||
|
||||
function updateAndEmit(evt, val, res) {
|
||||
state.set($props.model, val);
|
||||
state.set(modelValue, val);
|
||||
originalData.value = val && JSON.parse(JSON.stringify(val));
|
||||
if (!$props.url) arrayData.store.data = val;
|
||||
|
||||
emit(evt, state.get($props.model), res);
|
||||
emit(evt, state.get(modelValue), res);
|
||||
}
|
||||
|
||||
defineExpose({ save, isLoading, hasChanges });
|
||||
|
|
|
@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
|
|||
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
|
||||
const emit = defineEmits(['onDataSaved']);
|
||||
const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
|
||||
|
||||
defineProps({
|
||||
title: {
|
||||
|
@ -15,26 +15,6 @@ defineProps({
|
|||
type: String,
|
||||
default: '',
|
||||
},
|
||||
url: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
model: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
filter: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
urlCreate: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
formInitialData: {
|
||||
type: Object,
|
||||
default: () => {},
|
||||
},
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
|
@ -43,8 +23,8 @@ const formModelRef = ref(null);
|
|||
const closeButton = ref(null);
|
||||
|
||||
const onDataSaved = (formData, requestResponse) => {
|
||||
emit('onDataSaved', formData, requestResponse);
|
||||
closeForm();
|
||||
emit('onDataSaved', formData, requestResponse);
|
||||
};
|
||||
|
||||
const isLoading = computed(() => formModelRef.value?.isLoading);
|
||||
|
@ -61,11 +41,9 @@ defineExpose({
|
|||
<template>
|
||||
<FormModel
|
||||
ref="formModelRef"
|
||||
:form-initial-data="formInitialData"
|
||||
:observe-form-changes="false"
|
||||
:default-actions="false"
|
||||
:url-create="urlCreate"
|
||||
:model="model"
|
||||
v-bind="$attrs"
|
||||
@on-data-saved="onDataSaved"
|
||||
>
|
||||
<template #form="{ data, validate }">
|
||||
|
@ -84,6 +62,7 @@ defineExpose({
|
|||
flat
|
||||
:disabled="isLoading"
|
||||
:loading="isLoading"
|
||||
@click="emit('onDataCanceled')"
|
||||
v-close-popup
|
||||
/>
|
||||
<QBtn
|
||||
|
|
|
@ -74,7 +74,7 @@ const closeForm = () => {
|
|||
:disabled="isLoading"
|
||||
:loading="isLoading"
|
||||
/>
|
||||
<slot name="customButtons" />
|
||||
<slot name="custom-buttons" />
|
||||
</div>
|
||||
</QCard>
|
||||
</QForm>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { onMounted, computed } from 'vue';
|
||||
import { onMounted, computed, ref } from 'vue';
|
||||
import { Dark, Quasar } from 'quasar';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRouter } from 'vue-router';
|
||||
|
@ -10,13 +10,12 @@ import { localeEquivalence } from 'src/i18n/index';
|
|||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import { useClipboard } from 'src/composables/useClipboard';
|
||||
|
||||
const state = useState();
|
||||
const session = useSession();
|
||||
const router = useRouter();
|
||||
const { t, locale } = useI18n();
|
||||
import { useClipboard } from 'src/composables/useClipboard';
|
||||
import { ref } from 'vue';
|
||||
const { copyText } = useClipboard();
|
||||
const userLocale = computed({
|
||||
get() {
|
||||
|
@ -91,6 +90,15 @@ function logout() {
|
|||
function copyUserToken() {
|
||||
copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
|
||||
}
|
||||
|
||||
function localUserData() {
|
||||
state.setUser(user.value);
|
||||
}
|
||||
|
||||
function saveUserData(param, value) {
|
||||
axios.post('UserConfigs/setUserConfig', { [param]: value });
|
||||
localUserData();
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -180,6 +188,7 @@ function copyUserToken() {
|
|||
option-value="id"
|
||||
input-debounce="0"
|
||||
hide-selected
|
||||
@update:model-value="localUserData"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('components.userPanel.localBank')"
|
||||
|
@ -189,6 +198,7 @@ function copyUserToken() {
|
|||
option-value="id"
|
||||
input-debounce="0"
|
||||
hide-selected
|
||||
@update:model-value="localUserData"
|
||||
>
|
||||
<template #option="{ itemProps, opt }">
|
||||
<QItem v-bind="itemProps">
|
||||
|
@ -210,6 +220,7 @@ function copyUserToken() {
|
|||
option-label="code"
|
||||
option-value="id"
|
||||
input-debounce="0"
|
||||
@update:model-value="localUserData"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('components.userPanel.userWarehouse')"
|
||||
|
@ -219,6 +230,7 @@ function copyUserToken() {
|
|||
option-label="name"
|
||||
option-value="id"
|
||||
input-debounce="0"
|
||||
@update:model-value="(v) => saveUserData('warehouseFk', v)"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
|
@ -232,6 +244,7 @@ function copyUserToken() {
|
|||
style="flex: 0"
|
||||
dense
|
||||
input-debounce="0"
|
||||
@update:model-value="(v) => saveUserData('companyFk', v)"
|
||||
/>
|
||||
</VnRow>
|
||||
</div>
|
||||
|
|
|
@ -22,6 +22,7 @@ const props = defineProps({
|
|||
searchbarInfo: { type: String, default: '' },
|
||||
searchCustomRouteRedirect: { type: String, default: undefined },
|
||||
searchRedirect: { type: Boolean, default: true },
|
||||
searchMakeFetch: { type: Boolean, default: true },
|
||||
});
|
||||
|
||||
const stateStore = useStateStore();
|
||||
|
|
|
@ -13,6 +13,10 @@ const $props = defineProps({
|
|||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
info: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
|
@ -83,6 +87,11 @@ const inputRules = [
|
|||
v-if="hover && value && !$attrs.disabled"
|
||||
@click="value = null"
|
||||
></QIcon>
|
||||
<QIcon v-if="info" name="info">
|
||||
<QTooltip max-width="350px">
|
||||
{{ info }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
</QInput>
|
||||
</div>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
import { computed, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import isValidDate from 'filters/isValidDate';
|
||||
import VnInput from 'components/common/VnInput.vue';
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
|
|
|
@ -622,8 +622,7 @@ setLogTree();
|
|||
</QList>
|
||||
</div>
|
||||
</div>
|
||||
<QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
|
||||
<QScrollArea class="fit text-grey-8">
|
||||
<Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
|
||||
<QList dense>
|
||||
<QSeparator />
|
||||
<QItem class="q-mt-sm">
|
||||
|
@ -686,10 +685,7 @@ setLogTree();
|
|||
hide-selected
|
||||
>
|
||||
<template #option="{ opt, itemProps }">
|
||||
<QItem
|
||||
v-bind="itemProps"
|
||||
class="q-pa-xs row items-center"
|
||||
>
|
||||
<QItem v-bind="itemProps" class="q-pa-xs row items-center">
|
||||
<QItemSection class="col-3 items-center">
|
||||
<VnAvatar :worker-id="opt.id" />
|
||||
</QItemSection>
|
||||
|
@ -759,8 +755,7 @@ setLogTree();
|
|||
/>
|
||||
</QItem>
|
||||
</QList>
|
||||
</QScrollArea>
|
||||
</QDrawer>
|
||||
</Teleport>
|
||||
<QDialog v-model="dateFromDialog">
|
||||
<QDate
|
||||
:years-in-month-view="false"
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
<script setup>
|
||||
const model = defineModel({ type: Boolean, required: true });
|
||||
</script>
|
||||
<template>
|
||||
<QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
|
||||
</template>
|
|
@ -0,0 +1,37 @@
|
|||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
|
||||
const props = defineProps({
|
||||
wdays: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['update:wdays']);
|
||||
|
||||
const weekdayStore = useWeekdayStore();
|
||||
|
||||
const selectedWDays = computed({
|
||||
get: () => props.wdays,
|
||||
set: (value) => emit('update:wdays', value),
|
||||
});
|
||||
|
||||
const toggleDay = (index) => (selectedWDays.value[index] = !selectedWDays.value[index]);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="q-gutter-x-sm" style="width: max-content">
|
||||
<QBtn
|
||||
v-for="(weekday, index) in weekdayStore.getLocalesMap"
|
||||
:key="index"
|
||||
:label="weekday.localeChar"
|
||||
rounded
|
||||
style="max-width: 36px"
|
||||
:color="selectedWDays[weekday.index] ? 'primary' : ''"
|
||||
@click="toggleDay(weekday.index)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
|
@ -28,7 +28,7 @@ const toggleCardCheck = (item) => {
|
|||
<div class="title text-primary text-weight-bold text-h5">
|
||||
{{ $props.title }}
|
||||
</div>
|
||||
<QChip class="q-chip-color" outline size="sm">
|
||||
<QChip v-if="$props.id" class="q-chip-color" outline size="sm">
|
||||
{{ t('ID') }}: {{ $props.id }}
|
||||
</QChip>
|
||||
</div>
|
||||
|
|
|
@ -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: var(---color-font-secondary);
|
||||
color: $color-font-secondary;
|
||||
font-weight: bold;
|
||||
font-size: 0.8rem;
|
||||
text-align: center;
|
||||
|
|
|
@ -20,7 +20,12 @@ const state = useState();
|
|||
const currentUser = ref(state.getUser());
|
||||
const newNote = ref('');
|
||||
const vnPaginateRef = ref();
|
||||
|
||||
function handleKeyUp(event) {
|
||||
if (event.key === 'Enter') {
|
||||
event.preventDefault();
|
||||
if (!event.shiftKey) insert();
|
||||
}
|
||||
}
|
||||
async function insert() {
|
||||
const body = $props.body;
|
||||
Object.assign(body, { text: newNote.value });
|
||||
|
@ -48,12 +53,12 @@ async function insert() {
|
|||
size="lg"
|
||||
autogrow
|
||||
autofocus
|
||||
@keyup.ctrl.enter.stop="insert"
|
||||
@keyup="handleKeyUp"
|
||||
clearable
|
||||
>
|
||||
<template #append
|
||||
><QBtn
|
||||
:title="t('Save (ctrl + Enter)')"
|
||||
<template #append>
|
||||
<QBtn
|
||||
:title="t('Save (Enter)')"
|
||||
icon="save"
|
||||
color="primary"
|
||||
flat
|
||||
|
@ -130,6 +135,6 @@ async function insert() {
|
|||
es:
|
||||
Add note here...: Añadir nota aquí...
|
||||
New note: Nueva nota
|
||||
Save (ctrl + Enter): Guardar (Ctrl + Intro)
|
||||
Save (Enter): Guardar (Intro)
|
||||
|
||||
</i18n>
|
||||
|
|
|
@ -67,6 +67,10 @@ const props = defineProps({
|
|||
type: String,
|
||||
default: '',
|
||||
},
|
||||
makeFetch: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
let arrayData = useArrayData(props.dataKey, { ...props });
|
||||
|
@ -94,6 +98,8 @@ async function search() {
|
|||
([key, value]) => value && (props.staticParams || []).includes(key)
|
||||
);
|
||||
store.skip = 0;
|
||||
|
||||
if (props.makeFetch)
|
||||
await arrayData.applyFilter({
|
||||
params: {
|
||||
...Object.fromEntries(staticParams),
|
||||
|
|
|
@ -18,7 +18,7 @@ onMounted(() => {
|
|||
const observer = new MutationObserver(
|
||||
() =>
|
||||
(hasContent.value =
|
||||
actions.value.childNodes.length + data.value.childNodes.length)
|
||||
actions.value?.childNodes?.length + data.value?.childNodes?.length)
|
||||
);
|
||||
if (actions.value) observer.observe(actions.value, opts);
|
||||
if (data.value) observer.observe(data.value, opts);
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
import axios from 'axios';
|
||||
import { useState } from './useState';
|
||||
|
||||
export function useAcl() {
|
||||
const state = useState();
|
||||
|
||||
async function fetch() {
|
||||
const { data } = await axios.get('VnUsers/acls');
|
||||
const acls = {};
|
||||
data.forEach((acl) => {
|
||||
acls[acl.model] = acls[acl.model] || {};
|
||||
acls[acl.model][acl.property] = acls[acl.model][acl.property] || {};
|
||||
acls[acl.model][acl.property][acl.accessType] = true;
|
||||
});
|
||||
|
||||
state.setAcls(acls);
|
||||
}
|
||||
|
||||
function hasAny(model, prop, accessType) {
|
||||
const acls = state.getAcls().value[model];
|
||||
if (acls)
|
||||
return ['*', prop].some((key) => {
|
||||
const acl = acls[key];
|
||||
return acl && (acl['*'] || acl[accessType]);
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
fetch,
|
||||
hasAny,
|
||||
state,
|
||||
};
|
||||
}
|
|
@ -6,7 +6,7 @@ import { buildFilter } from 'filters/filterPanel';
|
|||
|
||||
const arrayDataStore = useArrayDataStore();
|
||||
|
||||
export function useArrayData(key, userOptions) {
|
||||
export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
|
||||
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
||||
|
||||
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import { useState } from './useState';
|
||||
import { useRole } from './useRole';
|
||||
import { useAcl } from './useAcl';
|
||||
import { useUserConfig } from './useUserConfig';
|
||||
import axios from 'axios';
|
||||
import useNotify from './useNotify';
|
||||
|
@ -88,6 +89,7 @@ export function useSession() {
|
|||
setSession(data);
|
||||
|
||||
await useRole().fetch();
|
||||
await useAcl().fetch();
|
||||
await useUserConfig().fetch();
|
||||
await useTokenConfig().fetch();
|
||||
|
||||
|
|
|
@ -11,8 +11,11 @@ const user = ref({
|
|||
companyFk: null,
|
||||
warehouseFk: null,
|
||||
});
|
||||
if (sessionStorage.getItem('user'))
|
||||
user.value = JSON.parse(sessionStorage.getItem('user'));
|
||||
|
||||
const roles = ref([]);
|
||||
const acls = ref([]);
|
||||
const tokenConfig = ref({});
|
||||
const drawer = ref(true);
|
||||
const headerMounted = ref(false);
|
||||
|
@ -25,7 +28,10 @@ export function useState() {
|
|||
}
|
||||
|
||||
function setUser(data) {
|
||||
user.value = data;
|
||||
const currentUser = { ...JSON.parse(sessionStorage.getItem('user')), ...data };
|
||||
sessionStorage.setItem('user', JSON.stringify(currentUser));
|
||||
user.value = currentUser;
|
||||
return currentUser;
|
||||
}
|
||||
|
||||
function getRoles() {
|
||||
|
@ -37,6 +43,14 @@ export function useState() {
|
|||
function setRoles(data) {
|
||||
roles.value = data;
|
||||
}
|
||||
|
||||
function getAcls() {
|
||||
return computed(() => acls.value);
|
||||
}
|
||||
|
||||
function setAcls(data) {
|
||||
acls.value = data;
|
||||
}
|
||||
function getTokenConfig() {
|
||||
return computed(() => {
|
||||
return tokenConfig.value;
|
||||
|
@ -64,6 +78,8 @@ export function useState() {
|
|||
setUser,
|
||||
getRoles,
|
||||
setRoles,
|
||||
getAcls,
|
||||
setAcls,
|
||||
getTokenConfig,
|
||||
setTokenConfig,
|
||||
set,
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
import toCurrency from './toCurrency';
|
||||
|
||||
export default function (value) {
|
||||
if (value == null || value === '') return () => '-';
|
||||
return () => toCurrency(value);
|
||||
}
|
|
@ -10,6 +10,7 @@ import toLowerCamel from './toLowerCamel';
|
|||
import dashIfEmpty from './dashIfEmpty';
|
||||
import dateRange from './dateRange';
|
||||
import toHour from './toHour';
|
||||
import dashOrCurrency from './dashOrCurrency';
|
||||
|
||||
export {
|
||||
toLowerCase,
|
||||
|
@ -17,6 +18,7 @@ export {
|
|||
toDate,
|
||||
toHour,
|
||||
toDateString,
|
||||
dashOrCurrency,
|
||||
toDateHourMin,
|
||||
toDateHourMinSec,
|
||||
toRelativeDate,
|
||||
|
|
|
@ -103,6 +103,8 @@ globals:
|
|||
deliveryList: Delivery days
|
||||
upcomingList: Upcoming deliveries
|
||||
role: Role
|
||||
alias: Alias
|
||||
aliasUsers: Users
|
||||
subRoles: Subroles
|
||||
inheritedRoles: Inherited Roles
|
||||
created: Created
|
||||
|
@ -394,6 +396,7 @@ entry:
|
|||
type: Type
|
||||
color: Color
|
||||
id: ID
|
||||
printedStickers: Printed stickers
|
||||
notes:
|
||||
observationType: Observation type
|
||||
descriptor:
|
||||
|
@ -470,6 +473,7 @@ ticket:
|
|||
agency: Agency
|
||||
zone: Zone
|
||||
warehouse: Warehouse
|
||||
collection: Collection
|
||||
route: Route
|
||||
invoice: Invoice
|
||||
shipped: Shipped
|
||||
|
@ -579,6 +583,9 @@ claim:
|
|||
created: Created
|
||||
state: State
|
||||
pickup: Pick up
|
||||
null: No
|
||||
agency: Agency
|
||||
delivery: Delivery
|
||||
photo:
|
||||
fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
|
||||
noData: 'There are no images/videos, click here or drag and drop the file'
|
||||
|
@ -960,7 +967,7 @@ roadmap:
|
|||
route:
|
||||
pageTitles:
|
||||
routes: Routes
|
||||
cmrsList: External CMRs list
|
||||
cmrsList: CMRs list
|
||||
RouteList: List
|
||||
routeCreate: New route
|
||||
basicData: Basic Data
|
||||
|
@ -1187,6 +1194,7 @@ item:
|
|||
available: Available
|
||||
warehouseText: 'Calculated on the warehouse of { warehouseName }'
|
||||
itemDiary: Item diary
|
||||
producer: Producer
|
||||
list:
|
||||
id: Identifier
|
||||
grouping: Grouping
|
||||
|
|
|
@ -103,6 +103,8 @@ globals:
|
|||
deliveryList: Días de entrega
|
||||
upcomingList: Próximos repartos
|
||||
role: Role
|
||||
alias: Alias
|
||||
aliasUsers: Usuarios
|
||||
subRoles: Subroles
|
||||
inheritedRoles: Roles heredados
|
||||
workers: Trabajadores
|
||||
|
@ -393,6 +395,7 @@ entry:
|
|||
type: Tipo
|
||||
color: Color
|
||||
id: ID
|
||||
printedStickers: Etiquetas impresas
|
||||
notes:
|
||||
observationType: Tipo de observación
|
||||
descriptor:
|
||||
|
@ -469,6 +472,7 @@ ticket:
|
|||
agency: Agencia
|
||||
zone: Zona
|
||||
warehouse: Almacén
|
||||
collection: Colección
|
||||
route: Ruta
|
||||
invoice: Factura
|
||||
shipped: Enviado
|
||||
|
@ -949,7 +953,7 @@ roadmap:
|
|||
route:
|
||||
pageTitles:
|
||||
routes: Rutas
|
||||
cmrsList: Listado de CMRs externos
|
||||
cmrsList: Listado de CMRs
|
||||
RouteList: Listado
|
||||
routeCreate: Nueva ruta
|
||||
basicData: Datos básicos
|
||||
|
@ -1177,6 +1181,7 @@ item:
|
|||
available: Disponible
|
||||
warehouseText: 'Calculado sobre el almacén de { warehouseName }'
|
||||
itemDiary: Registro de compra-venta
|
||||
producer: Productor
|
||||
list:
|
||||
id: Identificador
|
||||
grouping: Grouping
|
||||
|
|
|
@ -0,0 +1,104 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import axios from 'axios';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
|
||||
const onSynchronizeAll = async () => {
|
||||
try {
|
||||
notify(t('Synchronizing in the background'), 'positive');
|
||||
await axios.patch(`Accounts/syncAll`);
|
||||
} catch (error) {
|
||||
console.error('Error synchronizing all accounts', error);
|
||||
}
|
||||
};
|
||||
|
||||
const onSynchronizeRoles = async () => {
|
||||
try {
|
||||
await axios.patch(`RoleInherits/sync`);
|
||||
notify(t('Roles synchronized!'), 'positive');
|
||||
} catch (error) {
|
||||
console.error('Error synchronizing roles', error);
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QPage>
|
||||
<VnSubToolbar />
|
||||
<FormModel
|
||||
:url="`AccountConfigs/${1}`"
|
||||
:url-update="`AccountConfigs/${1}`"
|
||||
model="AccountAccounts"
|
||||
auto-load
|
||||
>
|
||||
<template #moreActions>
|
||||
<QBtn
|
||||
class="q-ml-none"
|
||||
color="primary"
|
||||
:label="t('accounts.syncAll')"
|
||||
@click="onSynchronizeAll()"
|
||||
/>
|
||||
<QBtn
|
||||
color="primary"
|
||||
:label="t('accounts.syncRoles')"
|
||||
@click="onSynchronizeRoles()"
|
||||
/>
|
||||
</template>
|
||||
<template #form="{ data }">
|
||||
<div class="q-gutter-y-sm">
|
||||
<VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
|
||||
<VnInput :label="t('accounts.shell')" v-model="data.shell" />
|
||||
<VnInput
|
||||
:label="t('accounts.idBase')"
|
||||
v-model="data.idBase"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
<VnRow>
|
||||
<VnInput
|
||||
:label="t('accounts.min')"
|
||||
v-model="data.min"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('accounts.max')"
|
||||
v-model="data.max"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnInput
|
||||
:label="t('accounts.warn')"
|
||||
v-model="data.warn"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('accounts.inact')"
|
||||
v-model="data.inact"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
</VnRow>
|
||||
</div>
|
||||
</template>
|
||||
</FormModel>
|
||||
</QPage>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Roles synchronized!: ¡Roles sincronizados!
|
||||
Synchronizing in the background: Sincronizando en segundo plano
|
||||
</i18n>
|
|
@ -0,0 +1,151 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ref } from 'vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
|
||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||
import CardList from 'src/components/ui/CardList.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import AclFilter from './Acls/AclFilter.vue';
|
||||
import AclFormView from './Acls/AclFormView.vue';
|
||||
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import axios from 'axios';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
});
|
||||
|
||||
const { notify } = useNotify();
|
||||
const { t } = useI18n();
|
||||
const stateStore = useStateStore();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
||||
const paginateRef = ref();
|
||||
const formDialog = ref(false);
|
||||
const rolesOptions = ref([]);
|
||||
|
||||
const exprBuilder = (param, value) => {
|
||||
switch (param) {
|
||||
case 'search':
|
||||
return { model: { like: `%${value}%` } };
|
||||
default:
|
||||
return { [param]: value };
|
||||
}
|
||||
};
|
||||
|
||||
const deleteAcl = async (id) => {
|
||||
try {
|
||||
await axios.delete(`ACLs/${id}`);
|
||||
paginateRef.value.fetch();
|
||||
notify('ACL removed', 'positive');
|
||||
} catch (error) {
|
||||
console.error('Error deleting Acl: ', error);
|
||||
}
|
||||
};
|
||||
function showFormDialog(data) {
|
||||
formDialog.value = {
|
||||
show: true,
|
||||
formInitialData: { ...data },
|
||||
};
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="VnRoles"
|
||||
:filter="{ fields: ['name'], order: 'name ASC' }"
|
||||
@on-fetch="(data) => (rolesOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
<template v-if="stateStore.isHeaderMounted()">
|
||||
<Teleport to="#searchbar">
|
||||
<VnSearchbar
|
||||
data-key="AccountAcls"
|
||||
url="ACLs"
|
||||
:expr-builder="exprBuilder"
|
||||
:label="t('acls.search')"
|
||||
:info="t('acls.searchInfo')"
|
||||
/>
|
||||
</Teleport>
|
||||
</template>
|
||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||
<QScrollArea class="fit text-grey-8">
|
||||
<AclFilter data-key="AccountAcls" />
|
||||
</QScrollArea>
|
||||
</QDrawer>
|
||||
|
||||
<QPage class="flex justify-center q-pa-md">
|
||||
<div class="vn-card-list">
|
||||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="AccountAcls"
|
||||
url="ACLs"
|
||||
:expr-builder="exprBuilder"
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
<CardList
|
||||
v-for="row of rows"
|
||||
:id="row.id"
|
||||
:key="row.id"
|
||||
:title="`${row.model}.${row.property}`"
|
||||
@click="showFormDialog(row)"
|
||||
>
|
||||
<template #list-items>
|
||||
<VnLv :label="t('acls.role')" :value="row.principalId" />
|
||||
<VnLv :label="t('acls.accessType')" :value="row.accessType" />
|
||||
<VnLv
|
||||
:label="t('acls.permissions')"
|
||||
:value="row.permission"
|
||||
/>
|
||||
</template>
|
||||
<template #actions>
|
||||
<QBtn
|
||||
:label="t('globals.delete')"
|
||||
@click.stop="
|
||||
openConfirmationModal(
|
||||
t('ACL will be removed'),
|
||||
t('Are you sure you want to continue?'),
|
||||
() => deleteAcl(row.id)
|
||||
)
|
||||
"
|
||||
color="primary"
|
||||
style="margin-top: 15px"
|
||||
/>
|
||||
</template>
|
||||
</CardList>
|
||||
</template>
|
||||
</VnPaginate>
|
||||
</div>
|
||||
<QDialog
|
||||
v-model="formDialog.show"
|
||||
transition-show="scale"
|
||||
transition-hide="scale"
|
||||
>
|
||||
<AclFormView
|
||||
:form-initial-data="formDialog.formInitialData"
|
||||
@on-data-change="paginateRef.fetch()"
|
||||
:roles-options="rolesOptions"
|
||||
/>
|
||||
</QDialog>
|
||||
<QPageSticky position="bottom-right" :offset="[18, 18]">
|
||||
<QBtn fab icon="add" color="primary" @click="showFormDialog()">
|
||||
<QTooltip class="text-no-wrap">{{ t('New ACL') }}</QTooltip>
|
||||
</QBtn>
|
||||
</QPageSticky>
|
||||
</QPage>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
New ACL: Nuevo ACL
|
||||
ACL removed: ACL eliminado
|
||||
ACL will be removed: El ACL será eliminado
|
||||
Are you sure you want to continue?: ¿Seguro que quieres continuar?
|
||||
</i18n>
|
|
@ -0,0 +1,105 @@
|
|||
<script setup>
|
||||
import { useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ref } from 'vue';
|
||||
|
||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||
import CardList from 'src/components/ui/CardList.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import AliasSummary from './Alias/Card/AliasSummary.vue';
|
||||
import AliasCreateForm from './Alias/AliasCreateForm.vue';
|
||||
|
||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
|
||||
defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
const { viewSummary } = useSummaryDialog();
|
||||
const router = useRouter();
|
||||
const stateStore = useStateStore();
|
||||
const aliasCreateDialogRef = ref(null);
|
||||
|
||||
const exprBuilder = (param, value) => {
|
||||
switch (param) {
|
||||
case 'search':
|
||||
return /^\d+$/.test(value)
|
||||
? { id: value }
|
||||
: { alias: { like: `%${value}%` } };
|
||||
}
|
||||
};
|
||||
|
||||
const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
|
||||
|
||||
const openCreateModal = () => aliasCreateDialogRef.value.show();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<template v-if="stateStore.isHeaderMounted()">
|
||||
<Teleport to="#searchbar">
|
||||
<VnSearchbar
|
||||
data-key="AccountAliasList"
|
||||
url="MailAliases"
|
||||
:expr-builder="exprBuilder"
|
||||
:label="t('mailAlias.search')"
|
||||
:info="t('mailAlias.searchInfo')"
|
||||
/>
|
||||
</Teleport>
|
||||
</template>
|
||||
<QPage class="flex justify-center q-pa-md">
|
||||
<div class="vn-card-list">
|
||||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="AccountAliasList"
|
||||
url="MailAliases"
|
||||
:expr-builder="exprBuilder"
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
<CardList
|
||||
v-for="row of rows"
|
||||
:id="row.id"
|
||||
:key="row.id"
|
||||
:title="row.alias"
|
||||
@click="navigate(row.id)"
|
||||
>
|
||||
<template #list-items>
|
||||
<VnLv :label="t('mailAlias.alias')" :value="row.alias">
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('mailAlias.description')"
|
||||
:value="row.description"
|
||||
>
|
||||
</VnLv>
|
||||
</template>
|
||||
<template #actions>
|
||||
<QBtn
|
||||
:label="t('components.smartCard.openSummary')"
|
||||
@click.stop="viewSummary(row.id, AliasSummary)"
|
||||
color="primary"
|
||||
style="margin-top: 15px"
|
||||
/>
|
||||
</template>
|
||||
</CardList>
|
||||
</template>
|
||||
</VnPaginate>
|
||||
</div>
|
||||
<QDialog
|
||||
ref="aliasCreateDialogRef"
|
||||
transition-show="scale"
|
||||
transition-hide="scale"
|
||||
>
|
||||
<AliasCreateForm />
|
||||
</QDialog>
|
||||
<QPageSticky position="bottom-right" :offset="[18, 18]">
|
||||
<QBtn fab icon="add" color="primary" @click="openCreateModal()">
|
||||
<QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
|
||||
</QBtn>
|
||||
</QPageSticky>
|
||||
</QPage>
|
||||
</template>
|
|
@ -0,0 +1,112 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||
import CardList from 'src/components/ui/CardList.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
|
||||
import { toDateTimeFormat } from 'src/filters/date.js';
|
||||
import axios from 'axios';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
|
||||
const { t } = useI18n();
|
||||
const router = useRouter();
|
||||
const { notify } = useNotify();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
||||
const paginateRef = ref(null);
|
||||
const filter = {
|
||||
fields: ['id', 'created', 'userId'],
|
||||
include: {
|
||||
relation: 'user',
|
||||
scope: {
|
||||
fields: ['username'],
|
||||
},
|
||||
},
|
||||
order: 'created DESC',
|
||||
};
|
||||
|
||||
const urlPath = 'AccessTokens';
|
||||
|
||||
const refresh = () => paginateRef.value.fetch();
|
||||
|
||||
const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
|
||||
|
||||
const killSession = async (id) => {
|
||||
try {
|
||||
await axios.delete(`${urlPath}/${id}`);
|
||||
paginateRef.value.fetch();
|
||||
notify(t('Session killed'), 'positive');
|
||||
} catch (error) {
|
||||
console.error('Error killing session', error);
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QPage class="column items-center q-pa-md">
|
||||
<div class="vn-card-list">
|
||||
<VnPaginate
|
||||
:data-key="urlPath"
|
||||
ref="paginateRef"
|
||||
:filter="filter"
|
||||
:url="urlPath"
|
||||
order="created DESC"
|
||||
auto-load
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
<CardList
|
||||
:key="row.id"
|
||||
:title="row.user?.username"
|
||||
@click="navigate(row.userId)"
|
||||
v-for="row of rows"
|
||||
>
|
||||
<template #list-items>
|
||||
<div style="flex-direction: column; width: 100%">
|
||||
<VnLv
|
||||
:label="t('connections.username')"
|
||||
:value="row.user?.username"
|
||||
>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('connections.created')"
|
||||
:value="toDateTimeFormat(row.created)"
|
||||
>
|
||||
</VnLv>
|
||||
</div>
|
||||
</template>
|
||||
<template #actions>
|
||||
<QBtn
|
||||
class="q-mt-xs"
|
||||
:label="t('connections.killSession')"
|
||||
@click.stop="
|
||||
openConfirmationModal(
|
||||
t('Session will be killed'),
|
||||
t('Are you sure you want to continue?'),
|
||||
() => killSession(row.id)
|
||||
)
|
||||
"
|
||||
outline
|
||||
/>
|
||||
</template>
|
||||
</CardList>
|
||||
</template>
|
||||
</VnPaginate>
|
||||
</div>
|
||||
<QPageSticky position="bottom-right" :offset="[18, 18]">
|
||||
<QBtn fab icon="refresh" color="primary" @click="refresh()">
|
||||
<QTooltip>{{ t('connections.refresh') }}</QTooltip>
|
||||
</QBtn>
|
||||
</QPageSticky>
|
||||
</QPage>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Session killed: Sesión matada
|
||||
Session will be killed: Se va a matar la sesión
|
||||
Are you sure you want to continue?: ¿Seguro que quieres continuar?
|
||||
</i18n>
|
|
@ -0,0 +1,171 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import axios from 'axios';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
|
||||
const arrayData = useArrayData('AccountLdap');
|
||||
|
||||
const URL_UPDATE = `LdapConfigs/${1}`;
|
||||
const URL_CREATE = `LdapConfigs`;
|
||||
const DEFAULT_DATA = {
|
||||
id: 1,
|
||||
hasData: false,
|
||||
groupDn: null,
|
||||
password: null,
|
||||
rdn: null,
|
||||
server: null,
|
||||
userDn: null,
|
||||
};
|
||||
|
||||
const initialData = ref({
|
||||
...DEFAULT_DATA,
|
||||
});
|
||||
|
||||
const hasData = computed({
|
||||
get: () => initialData.value.hasData,
|
||||
set: (val) => {
|
||||
initialData.value.hasData = val;
|
||||
if (!val) formCustomFn.value = deleteMailForward;
|
||||
else formCustomFn.value = null;
|
||||
},
|
||||
});
|
||||
|
||||
const initialDataLoaded = ref(false);
|
||||
const formUrlCreate = ref(null);
|
||||
const formUrlUpdate = ref(null);
|
||||
const formCustomFn = ref(null);
|
||||
|
||||
const onTestConection = async () => {
|
||||
try {
|
||||
await axios.get(`LdapConfigs/test`);
|
||||
notify(t('LDAP connection established!'), 'positive');
|
||||
} catch (error) {
|
||||
console.error('Error testing connection', error);
|
||||
}
|
||||
};
|
||||
|
||||
const getInitialLdapConfig = async () => {
|
||||
try {
|
||||
initialDataLoaded.value = false;
|
||||
const { data } = await axios.get(URL_UPDATE);
|
||||
initialData.value = data;
|
||||
hasData.value = true;
|
||||
return data;
|
||||
} catch (error) {
|
||||
hasData.value = false;
|
||||
arrayData.destroy();
|
||||
console.error('Error fetching initial LDAP config', error);
|
||||
return null;
|
||||
} finally {
|
||||
// Si asignamos un valor a urlUpdate, debemos asignar null a urlCreate y viceversa, ya puede causar problemas en formModel
|
||||
if (hasData.value) {
|
||||
formUrlUpdate.value = URL_UPDATE;
|
||||
formUrlCreate.value = null;
|
||||
} else {
|
||||
formUrlUpdate.value = null;
|
||||
formUrlCreate.value = URL_CREATE;
|
||||
}
|
||||
initialDataLoaded.value = true;
|
||||
}
|
||||
};
|
||||
|
||||
const deleteMailForward = async () => {
|
||||
try {
|
||||
await axios.delete(URL_UPDATE);
|
||||
initialData.value = { ...DEFAULT_DATA };
|
||||
hasData.value = false;
|
||||
notify(t('globals.dataSaved'), 'positive');
|
||||
} catch (err) {
|
||||
console.error('Error deleting mail forward', err);
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(async () => await getInitialLdapConfig());
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QPage>
|
||||
<VnSubToolbar />
|
||||
<FormModel
|
||||
:key="initialDataLoaded"
|
||||
model="AccountLdap"
|
||||
:form-initial-data="initialData"
|
||||
:url-create="formUrlCreate"
|
||||
:url-update="formUrlUpdate"
|
||||
:save-fn="formCustomFn"
|
||||
auto-load
|
||||
@on-data-saved="getInitialLdapConfig()"
|
||||
>
|
||||
<template #moreActions>
|
||||
<QBtn
|
||||
class="q-ml-none"
|
||||
color="primary"
|
||||
:label="t('ldap.testConnection')"
|
||||
@click="onTestConection()"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('ldap.testConnection') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</template>
|
||||
<template #form="{ data, validate }">
|
||||
<VnRow class="row q-gutter-md">
|
||||
<div class="col">
|
||||
<QCheckbox
|
||||
:label="t('ldap.enableSync')"
|
||||
v-model="data.hasData"
|
||||
@update:model-value="($event) => (hasData = $event)"
|
||||
:toggle-indeterminate="false"
|
||||
/>
|
||||
</div>
|
||||
</VnRow>
|
||||
<template v-if="hasData">
|
||||
<VnInput
|
||||
:label="t('ldap.server')"
|
||||
clearable
|
||||
v-model="data.server"
|
||||
:required="true"
|
||||
:rules="validate('LdapConfig.server')"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('ldap.rdn')"
|
||||
clearable
|
||||
v-model="data.rdn"
|
||||
:required="true"
|
||||
:rules="validate('LdapConfig.rdn')"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('ldap.password')"
|
||||
clearable
|
||||
type="password"
|
||||
v-model="data.password"
|
||||
:required="true"
|
||||
:rules="validate('LdapConfig.password')"
|
||||
/>
|
||||
<VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
|
||||
<VnInput
|
||||
:label="t('ldap.groupDN')"
|
||||
clearable
|
||||
v-model="data.groupDn"
|
||||
/>
|
||||
</template>
|
||||
</template>
|
||||
</FormModel>
|
||||
</QPage>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
LDAP connection established!: ¡Conexión con LDAP establecida!
|
||||
</i18n>
|
|
@ -1 +1 @@
|
|||
<template>account list view</template>
|
||||
<template>Account list</template>
|
||||
|
|
|
@ -0,0 +1,187 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import axios from 'axios';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
|
||||
const arrayData = useArrayData('AccountSamba');
|
||||
|
||||
const formModel = ref(null);
|
||||
|
||||
const URL_UPDATE = `SambaConfigs/${1}`;
|
||||
const URL_CREATE = `SambaConfigs`;
|
||||
|
||||
const DEFAULT_DATA = {
|
||||
id: 1,
|
||||
hasData: false,
|
||||
adDomain: null,
|
||||
adController: null,
|
||||
adUser: null,
|
||||
adPassword: null,
|
||||
userDn: null,
|
||||
verifyCert: false,
|
||||
};
|
||||
|
||||
const initialData = ref({
|
||||
...DEFAULT_DATA,
|
||||
});
|
||||
|
||||
const hasData = computed({
|
||||
get: () => initialData.value.hasData,
|
||||
set: (val) => {
|
||||
initialData.value.hasData = val;
|
||||
if (!val) formCustomFn.value = deleteMailForward;
|
||||
else formCustomFn.value = null;
|
||||
},
|
||||
});
|
||||
|
||||
const initialDataLoaded = ref(false);
|
||||
const formUrlCreate = ref(null);
|
||||
const formUrlUpdate = ref(null);
|
||||
const formCustomFn = ref(null);
|
||||
|
||||
const onTestConection = async () => {
|
||||
try {
|
||||
await axios.get(`SambaConfigs/test`);
|
||||
notify(t('Samba connection established!'), 'positive');
|
||||
} catch (error) {
|
||||
console.error('Error testing connection', error);
|
||||
}
|
||||
};
|
||||
|
||||
const getInitialSambaConfig = async () => {
|
||||
try {
|
||||
initialDataLoaded.value = false;
|
||||
const { data } = await axios.get(URL_UPDATE);
|
||||
initialData.value = data;
|
||||
hasData.value = true;
|
||||
return data;
|
||||
} catch (error) {
|
||||
hasData.value = false;
|
||||
arrayData.destroy();
|
||||
console.error('Error fetching initial Samba config', error);
|
||||
return null;
|
||||
} finally {
|
||||
if (hasData.value) {
|
||||
formUrlUpdate.value = URL_UPDATE;
|
||||
formUrlCreate.value = null;
|
||||
} else {
|
||||
formUrlUpdate.value = null;
|
||||
formUrlCreate.value = URL_CREATE;
|
||||
}
|
||||
initialDataLoaded.value = true;
|
||||
}
|
||||
};
|
||||
|
||||
const deleteMailForward = async () => {
|
||||
try {
|
||||
await axios.delete(URL_UPDATE);
|
||||
initialData.value = { ...DEFAULT_DATA };
|
||||
hasData.value = false;
|
||||
notify(t('globals.dataSaved'), 'positive');
|
||||
} catch (err) {
|
||||
console.error('Error deleting mail forward', err);
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(async () => await getInitialSambaConfig());
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QPage>
|
||||
<VnSubToolbar />
|
||||
<FormModel
|
||||
ref="formModel"
|
||||
:key="initialDataLoaded"
|
||||
model="AccountSamba"
|
||||
:form-initial-data="initialData"
|
||||
:url-create="formUrlCreate"
|
||||
:url-update="formUrlUpdate"
|
||||
:save-fn="formCustomFn"
|
||||
auto-load
|
||||
@on-data-saved="getInitialSambaConfig()"
|
||||
>
|
||||
<template #moreActions>
|
||||
<QBtn
|
||||
class="q-ml-none"
|
||||
color="primary"
|
||||
:label="t('samba.testConnection')"
|
||||
:disable="formModel.hasChanges"
|
||||
@click="onTestConection()"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('samba.testConnection') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</template>
|
||||
<template #form="{ data, validate }">
|
||||
<VnRow class="row q-gutter-md">
|
||||
<div class="col">
|
||||
<QCheckbox
|
||||
:label="t('samba.enableSync')"
|
||||
v-model="data.hasData"
|
||||
@update:model-value="($event) => (hasData = $event)"
|
||||
:toggle-indeterminate="false"
|
||||
/>
|
||||
</div>
|
||||
</VnRow>
|
||||
<template v-if="hasData">
|
||||
<VnInput
|
||||
:label="t('samba.domainAD')"
|
||||
clearable
|
||||
v-model="data.adDomain"
|
||||
:required="true"
|
||||
:rules="validate('SambaConfigs.server')"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('samba.domainController')"
|
||||
clearable
|
||||
v-model="data.adController"
|
||||
:required="true"
|
||||
:rules="validate('SambaConfigs.adController')"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('samba.userAD')"
|
||||
clearable
|
||||
v-model="data.adUser"
|
||||
:rules="validate('SambaConfigs.adUser')"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('samba.passwordAD')"
|
||||
clearable
|
||||
type="password"
|
||||
v-model="data.adPassword"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('samba.domainPart')"
|
||||
clearable
|
||||
v-model="data.userDn"
|
||||
:required="true"
|
||||
:rules="validate('SambaConfigs.userDn')"
|
||||
/>
|
||||
<QCheckbox
|
||||
:label="t('samba.verifyCertificate')"
|
||||
v-model="data.verifyCert"
|
||||
:rules="validate('SambaConfigs.groupDn')"
|
||||
:toggle-indeterminate="false"
|
||||
/>
|
||||
</template>
|
||||
</template>
|
||||
</FormModel>
|
||||
</QPage>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Samba connection established!: ¡Conexión con LDAP establecida!
|
||||
</i18n>
|
|
@ -0,0 +1,128 @@
|
|||
<script setup>
|
||||
import { ref, onBeforeMount } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||
import VnSelect from 'components/common/VnSelect.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import { useValidator } from 'src/composables/useValidator';
|
||||
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
const validationsStore = useValidator();
|
||||
const { models } = validationsStore;
|
||||
|
||||
const validations = ref([]);
|
||||
const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
|
||||
const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
|
||||
const rolesOptions = ref([]);
|
||||
|
||||
onBeforeMount(() => {
|
||||
for (let model in models) validations.value.push({ name: model });
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="VnRoles"
|
||||
:filter="{ fields: ['name'], order: 'name ASC' }"
|
||||
@on-fetch="(data) => (rolesOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnFilterPanel
|
||||
:data-key="props.dataKey"
|
||||
:search-button="true"
|
||||
:hidden-tags="['search']"
|
||||
>
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
<strong>{{ t(`acls.aclFilter.${tag.label}`) }}: </strong>
|
||||
<span>{{ formatFn(tag.value) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<template #body="{ params, searchFn }">
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.principalId')"
|
||||
v-model="params.principalId"
|
||||
@update:model-value="searchFn()"
|
||||
:options="rolesOptions"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.model')"
|
||||
v-model="params.model"
|
||||
@update:model-value="searchFn()"
|
||||
:options="validations"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnInput
|
||||
:label="t('acls.aclFilter.property')"
|
||||
v-model="params.property"
|
||||
lazy-rules
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.accessType')"
|
||||
v-model="params.accessType"
|
||||
@update:model-value="searchFn()"
|
||||
:options="accessTypes"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.permission')"
|
||||
v-model="params.permission"
|
||||
@update:model-value="searchFn()"
|
||||
:options="permissions"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnFilterPanel>
|
||||
</template>
|
|
@ -0,0 +1,126 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ref, onBeforeMount, onMounted } from 'vue';
|
||||
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||
|
||||
import { useValidator } from 'src/composables/useValidator';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
|
||||
const emit = defineEmits(['onDataChange']);
|
||||
const { t } = useI18n();
|
||||
const validationsStore = useValidator();
|
||||
const { models } = validationsStore;
|
||||
const arrayData = useArrayData('aclCreate');
|
||||
const { store } = arrayData;
|
||||
|
||||
const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
|
||||
const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
|
||||
const validations = ref([]);
|
||||
|
||||
const url = ref();
|
||||
const urlCreate = ref('ACLs');
|
||||
const urlUpdate = ref();
|
||||
const action = ref('New');
|
||||
|
||||
const $props = defineProps({
|
||||
formInitialData: {
|
||||
type: Object,
|
||||
default: () => {
|
||||
return {
|
||||
property: '*',
|
||||
principalType: 'ROLE',
|
||||
accessType: 'READ',
|
||||
permission: 'ALLOW',
|
||||
};
|
||||
},
|
||||
},
|
||||
rolesOptions: {
|
||||
type: Array,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
onBeforeMount(() => {
|
||||
for (let model in models) validations.value.push({ name: model });
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
store.data = $props.formInitialData;
|
||||
if ($props.formInitialData.id) {
|
||||
urlCreate.value = null;
|
||||
urlUpdate.value = 'ACLs';
|
||||
action.value = 'Edit';
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormModelPopup
|
||||
v-if="urlCreate || urlUpdate"
|
||||
:title="t(`${action} ACL`)"
|
||||
:url="url"
|
||||
:url-update="urlUpdate"
|
||||
:url-create="urlCreate"
|
||||
:form-initial-data="formInitialData"
|
||||
auto-load
|
||||
model="aclCreate"
|
||||
@on-data-saved="emit('onDataChange')"
|
||||
@on-data-canceled="emit('onDataChange')"
|
||||
>
|
||||
<template #form-inputs="{ data }">
|
||||
<div class="column q-gutter-y-md">
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.principalId')"
|
||||
v-model="data.principalId"
|
||||
:options="$props.rolesOptions"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
rounded
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.model')"
|
||||
v-model="data.model"
|
||||
:options="validations"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
rounded
|
||||
/>
|
||||
|
||||
<VnInput
|
||||
:label="t('acls.aclFilter.property')"
|
||||
v-model="data.property"
|
||||
lazy-rules
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip>{{ t('acls.tooltip') }}</QTooltip>
|
||||
</QIcon>
|
||||
</template></VnInput
|
||||
>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.accessType')"
|
||||
v-model="data.accessType"
|
||||
:options="accessTypes"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
rounded
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('acls.aclFilter.permission')"
|
||||
v-model="data.permission"
|
||||
:options="permissions"
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
use-input
|
||||
rounded
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</FormModelPopup>
|
||||
</template>
|
|
@ -0,0 +1,57 @@
|
|||
<script setup>
|
||||
import { useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const arrayData = useArrayData('AliasCreate');
|
||||
const { store } = arrayData;
|
||||
|
||||
const defaultInitialData = {
|
||||
alias: null,
|
||||
description: null,
|
||||
};
|
||||
|
||||
const onDataSaved = ({ id }) => {
|
||||
router.push({ name: 'AliasBasicData', params: { id } });
|
||||
store.data = null;
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormModelPopup
|
||||
:title="t('Create alias')"
|
||||
ref="formModelPopupRef"
|
||||
url-create="MailAliases"
|
||||
model="AliasCreate"
|
||||
:form-initial-data="defaultInitialData"
|
||||
@on-data-saved="onDataSaved"
|
||||
>
|
||||
<template #form-inputs="{ data }">
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<div class="col">
|
||||
<VnInput v-model="data.alias" :label="t('mailAlias.name')" />
|
||||
</div>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<div class="col">
|
||||
<VnInput
|
||||
v-model="data.description"
|
||||
:label="t('mailAlias.description')"
|
||||
/>
|
||||
</div>
|
||||
</VnRow>
|
||||
</template>
|
||||
</FormModelPopup>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Create alias: Crear alias
|
||||
</i18n>
|
|
@ -0,0 +1,20 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormModel model="Alias">
|
||||
<template #form="{ data }">
|
||||
<div class="column q-gutter-y-md">
|
||||
<VnInput v-model="data.alias" :label="t('mailAlias.name')" />
|
||||
<VnInput v-model="data.description" :label="t('mailAlias.description')" />
|
||||
<QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
|
||||
</div>
|
||||
</template>
|
||||
</FormModel>
|
||||
</template>
|
|
@ -0,0 +1,33 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { computed } from 'vue';
|
||||
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import AliasDescriptor from './AliasDescriptor.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
const routeName = computed(() => route.name);
|
||||
const customRouteRedirectName = computed(() => {
|
||||
return routeName.value;
|
||||
});
|
||||
const searchBarDataKeys = {
|
||||
AliasBasicData: 'AliasBasicData',
|
||||
AliasUsers: 'AliasUsers',
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCard
|
||||
data-key="Alias"
|
||||
base-url="MailAliases"
|
||||
:descriptor="AliasDescriptor"
|
||||
:search-data-key="searchBarDataKeys[routeName]"
|
||||
:search-custom-route-redirect="customRouteRedirectName"
|
||||
:search-redirect="!!customRouteRedirectName"
|
||||
:searchbar-label="t('mailAlias.search')"
|
||||
:searchbar-info="t('mailAlias.searchInfo')"
|
||||
/>
|
||||
</template>
|
|
@ -0,0 +1,88 @@
|
|||
<script setup>
|
||||
import { ref, computed } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
|
||||
import useCardDescription from 'src/composables/useCardDescription';
|
||||
import axios from 'axios';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
required: false,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const quasar = useQuasar();
|
||||
const router = useRouter();
|
||||
const { notify } = useNotify();
|
||||
|
||||
const entityId = computed(() => {
|
||||
return $props.id || route.params.id;
|
||||
});
|
||||
|
||||
const data = ref(useCardDescription());
|
||||
const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
|
||||
|
||||
const removeAlias = () => {
|
||||
quasar
|
||||
.dialog({
|
||||
title: t('Alias will be removed'),
|
||||
message: t('Are you sure you want to continue?'),
|
||||
ok: {
|
||||
push: true,
|
||||
color: 'primary',
|
||||
},
|
||||
cancel: true,
|
||||
})
|
||||
.onOk(async () => {
|
||||
try {
|
||||
await axios.delete(`MailAliases/${entityId.value}`);
|
||||
notify(t('Alias removed'), 'positive');
|
||||
router.push({ name: 'AccountAlias' });
|
||||
} catch (err) {
|
||||
console.error('Error removing alias');
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<CardDescriptor
|
||||
ref="descriptor"
|
||||
:url="`MailAliases/${entityId}`"
|
||||
module="Alias"
|
||||
@on-fetch="setData"
|
||||
data-key="aliasData"
|
||||
:title="data.title"
|
||||
:subtitle="data.subtitle"
|
||||
>
|
||||
<template #menu>
|
||||
<QItem v-ripple clickable @click="removeAlias()">
|
||||
<QItemSection>{{ t('Delete') }}</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<VnLv :label="t('mailAlias.description')" :value="entity.description" />
|
||||
</template>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
en:
|
||||
accountRate: Claming rate
|
||||
es:
|
||||
accountRate: Ratio de reclamación
|
||||
Delete: Eliminar
|
||||
Alias will be removed: El alias será eliminado
|
||||
Are you sure you want to continue?: ¿Seguro que quieres continuar?
|
||||
Alias removed: Alias eliminado
|
||||
</i18n>
|
|
@ -0,0 +1,49 @@
|
|||
<script setup>
|
||||
import { ref, computed } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import CardSummary from 'components/ui/CardSummary.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
});
|
||||
|
||||
const { store } = useArrayData('Alias');
|
||||
const alias = ref(store.data);
|
||||
const entityId = computed(() => $props.id || route.params.id);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<CardSummary
|
||||
ref="summary"
|
||||
:url="`MailAliases/${entityId}`"
|
||||
@on-fetch="(data) => (alias = data)"
|
||||
>
|
||||
<template #header> {{ alias.id }} - {{ alias.alias }} </template>
|
||||
<template #body>
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
<router-link
|
||||
:to="{ name: 'AliasBasicData', params: { id: entityId } }"
|
||||
class="header header-link"
|
||||
>
|
||||
{{ t('globals.summary.basicData') }}
|
||||
<QIcon name="open_in_new" />
|
||||
</router-link>
|
||||
</QCardSection>
|
||||
<VnLv :label="t('mailAlias.id')" :value="alias.id" />
|
||||
<VnLv :label="t('mailAlias.description')" :value="alias.description" />
|
||||
</QCard>
|
||||
</template>
|
||||
</CardSummary>
|
||||
</template>
|
|
@ -0,0 +1,122 @@
|
|||
<script setup>
|
||||
import { useRoute } from 'vue-router';
|
||||
import { computed, ref, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import axios from 'axios';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
const route = useRoute();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
||||
const paginateRef = ref(null);
|
||||
|
||||
const arrayData = useArrayData('AliasUsers');
|
||||
const { store } = arrayData;
|
||||
|
||||
const data = computed(() => {
|
||||
const dataCopy = JSON.parse(JSON.stringify(store.data));
|
||||
return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
|
||||
});
|
||||
|
||||
const filter = {
|
||||
include: {
|
||||
relation: 'user',
|
||||
scope: {
|
||||
fields: ['id', 'name'],
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
|
||||
|
||||
const columns = computed(() => [
|
||||
{
|
||||
name: 'alias',
|
||||
},
|
||||
{
|
||||
name: 'action',
|
||||
},
|
||||
]);
|
||||
|
||||
const deleteAlias = async (row) => {
|
||||
try {
|
||||
await axios.delete(`${urlPath.value}/${row.id}`);
|
||||
notify(t('User removed'), 'positive');
|
||||
fetchAliases();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
watch(
|
||||
() => route.params.id,
|
||||
() => {
|
||||
store.url = urlPath.value;
|
||||
store.filter = filter;
|
||||
fetchAliases();
|
||||
}
|
||||
);
|
||||
|
||||
const fetchAliases = () => paginateRef.value.fetch();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QPage class="column items-center q-pa-md">
|
||||
<div class="full-width" style="max-width: 400px">
|
||||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="AliasUsers"
|
||||
:filter="filter"
|
||||
:url="urlPath"
|
||||
:limit="0"
|
||||
auto-load
|
||||
>
|
||||
<template #body>
|
||||
<QTable :rows="data" :columns="columns" hide-header>
|
||||
<template #body="{ row }">
|
||||
<QTr>
|
||||
<QTd>
|
||||
<span>{{ row.user?.name }}</span>
|
||||
</QTd>
|
||||
<QTd style="width: 50px !important">
|
||||
<QIcon
|
||||
name="delete"
|
||||
size="sm"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
t('User will be removed from alias'),
|
||||
t('Are you sure you want to continue?'),
|
||||
() => deleteAlias(row)
|
||||
)
|
||||
"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('Delete') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
</QTd>
|
||||
</QTr>
|
||||
</template>
|
||||
</QTable>
|
||||
</template>
|
||||
</VnPaginate>
|
||||
</div>
|
||||
</QPage>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
User will be removed from alias: El usuario será borrado del alias
|
||||
Are you sure you want to continue?: ¿Seguro que quieres continuar?
|
||||
User removed: Usuario borrado
|
||||
Delete: Eliminar
|
||||
</i18n>
|
|
@ -1,256 +0,0 @@
|
|||
<script setup>
|
||||
import { ref, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import CrudModel from 'components/CrudModel.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnSelect from 'components/common/VnSelect.vue';
|
||||
import { tMobile } from 'composables/tMobile';
|
||||
|
||||
const route = useRoute();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const accountDevelopmentForm = ref();
|
||||
const accountReasons = ref([]);
|
||||
const accountResults = ref([]);
|
||||
const accountResponsibles = ref([]);
|
||||
const accountRedeliveries = ref([]);
|
||||
const workers = ref([]);
|
||||
const selected = ref([]);
|
||||
const saveButtonRef = ref();
|
||||
|
||||
const developmentsFilter = {
|
||||
fields: [
|
||||
'id',
|
||||
'accountFk',
|
||||
'accountReasonFk',
|
||||
'accountResultFk',
|
||||
'accountResponsibleFk',
|
||||
'workerFk',
|
||||
'accountRedeliveryFk',
|
||||
],
|
||||
where: {
|
||||
accountFk: route.params.id,
|
||||
},
|
||||
};
|
||||
|
||||
const columns = computed(() => [
|
||||
{
|
||||
name: 'accountReason',
|
||||
label: t('Reason'),
|
||||
field: (row) => row.accountReasonFk,
|
||||
sortable: true,
|
||||
options: accountReasons.value,
|
||||
required: true,
|
||||
model: 'accountReasonFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'description',
|
||||
tabIndex: 1,
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
name: 'accountResult',
|
||||
label: t('Result'),
|
||||
field: (row) => row.accountResultFk,
|
||||
sortable: true,
|
||||
options: accountResults.value,
|
||||
required: true,
|
||||
model: 'accountResultFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'description',
|
||||
tabIndex: 2,
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
name: 'accountResponsible',
|
||||
label: t('Responsible'),
|
||||
field: (row) => row.accountResponsibleFk,
|
||||
sortable: true,
|
||||
options: accountResponsibles.value,
|
||||
required: true,
|
||||
model: 'accountResponsibleFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'description',
|
||||
tabIndex: 3,
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
name: 'worker',
|
||||
label: t('Worker'),
|
||||
field: (row) => row.workerFk,
|
||||
sortable: true,
|
||||
options: workers.value,
|
||||
model: 'workerFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'nickname',
|
||||
tabIndex: 4,
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
name: 'accountRedelivery',
|
||||
label: t('Redelivery'),
|
||||
field: (row) => row.accountRedeliveryFk,
|
||||
sortable: true,
|
||||
options: accountRedeliveries.value,
|
||||
required: true,
|
||||
model: 'accountRedeliveryFk',
|
||||
optionValue: 'id',
|
||||
optionLabel: 'description',
|
||||
tabIndex: 5,
|
||||
align: 'left',
|
||||
},
|
||||
]);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
url="AccountReasons"
|
||||
order="description"
|
||||
@on-fetch="(data) => (accountReasons = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="AccountResults"
|
||||
order="description"
|
||||
@on-fetch="(data) => (accountResults = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="AccountResponsibles"
|
||||
order="description"
|
||||
@on-fetch="(data) => (accountResponsibles = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="AccountRedeliveries"
|
||||
order="description"
|
||||
@on-fetch="(data) => (accountRedeliveries = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="Workers/search"
|
||||
:where="{ active: 1 }"
|
||||
order="name ASC"
|
||||
@on-fetch="(data) => (workers = data)"
|
||||
auto-load
|
||||
/>
|
||||
<CrudModel
|
||||
data-key="AccountDevelopments"
|
||||
url="AccountDevelopments"
|
||||
model="accountDevelopment"
|
||||
:filter="developmentsFilter"
|
||||
ref="accountDevelopmentForm"
|
||||
:data-required="{ accountFk: route.params.id }"
|
||||
v-model:selected="selected"
|
||||
auto-load
|
||||
@save-changes="$router.push(`/account/${route.params.id}/action`)"
|
||||
:default-save="false"
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
<QTable
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
row-key="$index"
|
||||
selection="multiple"
|
||||
v-model:selected="selected"
|
||||
:grid="$q.screen.lt.md"
|
||||
table-header-class="text-left"
|
||||
>
|
||||
<template #body-cell="{ row, col }">
|
||||
<QTd
|
||||
auto-width
|
||||
@keyup.ctrl.enter.stop="accountDevelopmentForm.saveChanges()"
|
||||
>
|
||||
<VnSelect
|
||||
v-model="row[col.model]"
|
||||
:options="col.options"
|
||||
:option-value="col.optionValue"
|
||||
:option-label="col.optionLabel"
|
||||
:autofocus="col.tabIndex == 1"
|
||||
input-debounce="0"
|
||||
hide-selected
|
||||
>
|
||||
<template #option="scope" v-if="col.name == 'worker'">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
|
||||
<QItemLabel caption>
|
||||
{{ scope.opt?.nickname }}
|
||||
{{ scope.opt?.code }}
|
||||
</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #item="props">
|
||||
<div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
|
||||
<QCard
|
||||
bordered
|
||||
flat
|
||||
@keyup.ctrl.enter.stop="accountDevelopmentForm?.saveChanges()"
|
||||
>
|
||||
<QCardSection>
|
||||
<QCheckbox v-model="props.selected" dense />
|
||||
</QCardSection>
|
||||
<QSeparator />
|
||||
<QList dense>
|
||||
<QItem v-for="col in props.cols" :key="col.name">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="col.label"
|
||||
v-model="props.row[col.model]"
|
||||
:options="col.options"
|
||||
:option-value="col.optionValue"
|
||||
:option-label="col.optionLabel"
|
||||
dense
|
||||
input-debounce="0"
|
||||
:autofocus="col.tabIndex == 1"
|
||||
hide-selected
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</QList>
|
||||
</QCard>
|
||||
</div>
|
||||
</template>
|
||||
</QTable>
|
||||
</template>
|
||||
<template #moreAfterActions>
|
||||
<QBtn
|
||||
:label="tMobile('globals.save')"
|
||||
ref="saveButtonRef"
|
||||
color="primary"
|
||||
icon="save"
|
||||
:disable="!accountDevelopmentForm?.hasChanges"
|
||||
@click="accountDevelopmentForm?.onSubmit"
|
||||
:title="t('globals.save')"
|
||||
/>
|
||||
</template>
|
||||
</CrudModel>
|
||||
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
||||
<QBtn
|
||||
fab
|
||||
color="primary"
|
||||
icon="add"
|
||||
@keydown.tab.prevent="saveButtonRef.$el.focus()"
|
||||
@click="accountDevelopmentForm.insert()"
|
||||
/>
|
||||
</QPageSticky>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.grid-style-transition {
|
||||
transition: transform 0.28s, background-color 0.28s;
|
||||
}
|
||||
</style>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Reason: Motivo
|
||||
Result: Consecuencia
|
||||
Responsible: Responsable
|
||||
Worker: Trabajador
|
||||
Redelivery: Devolución
|
||||
</i18n>
|
|
@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
|
|||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
</script>
|
||||
|
@ -24,6 +23,11 @@ const { t } = useI18n();
|
|||
/>
|
||||
</div>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<div class="col">
|
||||
<QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
|
||||
</div>
|
||||
</VnRow>
|
||||
</template>
|
||||
</FormModel>
|
||||
</template>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
import { ref, computed } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import useCardDescription from 'src/composables/useCardDescription';
|
||||
|
@ -64,7 +63,7 @@ const removeRole = () => {
|
|||
ref="descriptor"
|
||||
:url="`VnRoles`"
|
||||
:filter="filter"
|
||||
module="Account"
|
||||
module="Role"
|
||||
@on-fetch="setData"
|
||||
data-key="accountData"
|
||||
:title="data.title"
|
||||
|
|
|
@ -15,6 +15,7 @@ account:
|
|||
privileges: Privileges
|
||||
mailAlias: Mail Alias
|
||||
mailForwarding: Mail Forwarding
|
||||
aliasUsers: Users
|
||||
card:
|
||||
name: Name
|
||||
nickname: User
|
||||
|
@ -45,6 +46,18 @@ role:
|
|||
searchInfo: Search role by id or name
|
||||
name: Name
|
||||
description: Description
|
||||
id: Id
|
||||
mailAlias:
|
||||
pageTitles:
|
||||
aliasUsers: Users
|
||||
search: Search mail alias
|
||||
searchInfo: Search alias by id or name
|
||||
alias: Alias
|
||||
description: Description
|
||||
id: Id
|
||||
newAlias: New alias
|
||||
name: Name
|
||||
isPublic: Public
|
||||
ldap:
|
||||
enableSync: Enable synchronization
|
||||
server: Server
|
||||
|
@ -54,6 +67,7 @@ ldap:
|
|||
groupDN: Group DN
|
||||
testConnection: Test connection
|
||||
success: LDAP connection established!
|
||||
password: Password
|
||||
samba:
|
||||
enableSync: Enable synchronization
|
||||
domainController: Domain controller
|
||||
|
@ -65,3 +79,31 @@ samba:
|
|||
verifyCertificate: Verify certificate
|
||||
testConnection: Test connection
|
||||
success: Samba connection established!
|
||||
accounts:
|
||||
homedir: Homedir base
|
||||
shell: Shell
|
||||
idBase: User and role base id
|
||||
min: Min
|
||||
max: Max
|
||||
warn: Warn
|
||||
inact: Inact
|
||||
syncAll: Synchronize all
|
||||
syncRoles: Synchronize roles
|
||||
connections:
|
||||
refresh: Refresh
|
||||
username: Username
|
||||
created: Created
|
||||
killSession: Kill session
|
||||
acls:
|
||||
role: Role
|
||||
accessType: Access type
|
||||
permissions: Permission
|
||||
search: Search acls
|
||||
searchInfo: Search acls by model name
|
||||
tooltip: Use * to match all properties
|
||||
aclFilter:
|
||||
principalId: Role
|
||||
model: Model
|
||||
property: Property
|
||||
accessType: Access type
|
||||
permission: Permission
|
||||
|
|
|
@ -15,6 +15,7 @@ account:
|
|||
privileges: Privilegios
|
||||
mailAlias: Alias de correo
|
||||
mailForwarding: Reenvío de correo
|
||||
aliasUsers: Usuarios
|
||||
card:
|
||||
nickname: Usuario
|
||||
name: Nombre
|
||||
|
@ -56,7 +57,20 @@ role:
|
|||
searchInfo: Buscar rol por id o nombre
|
||||
name: Nombre
|
||||
description: Descripción
|
||||
id: Id
|
||||
mailAlias:
|
||||
pageTitles:
|
||||
aliasUsers: Usuarios
|
||||
search: Buscar alias de correo
|
||||
searchInfo: Buscar alias por id o nombre
|
||||
alias: Alias
|
||||
description: Descripción
|
||||
id: Id
|
||||
newAlias: Nuevo alias
|
||||
name: Nombre
|
||||
isPublic: Público
|
||||
ldap:
|
||||
password: Contraseña
|
||||
enableSync: Habilitar sincronización
|
||||
server: Servidor
|
||||
rdn: RDN
|
||||
|
@ -73,6 +87,34 @@ samba:
|
|||
userAD: Usuario AD
|
||||
passwordAD: Contraseña AD
|
||||
domainPart: DN usuarios (sin la parte del dominio)
|
||||
Verify certificate: Verificar certificado
|
||||
verifyCertificate: Verificar certificado
|
||||
testConnection: Probar conexión
|
||||
success: ¡Conexión con Samba establecida!
|
||||
accounts:
|
||||
homedir: Directorio base para carpetas de usuario
|
||||
shell: Intérprete de línea de comandos
|
||||
idBase: Id base usuarios y roles
|
||||
min: Min
|
||||
max: Max
|
||||
warn: Warn
|
||||
inact: Inact
|
||||
syncAll: Sincronizar todo
|
||||
syncRoles: Sincronizar roles
|
||||
connections:
|
||||
refresh: Actualizar
|
||||
username: Nombre de usuario
|
||||
created: Creado
|
||||
killSession: Matar sesión
|
||||
acls:
|
||||
role: Rol
|
||||
accessType: Tipo de acceso
|
||||
permissions: Permiso
|
||||
search: Buscar acls
|
||||
searchInfo: Buscar acls por nombre
|
||||
tooltip: Usa * para marcar todas las propiedades
|
||||
aclFilter:
|
||||
principalId: Rol
|
||||
model: Modelo
|
||||
property: Propiedad
|
||||
accessType: Tipo de acceso
|
||||
permission: Permiso
|
||||
|
|
|
@ -158,8 +158,7 @@ const statesFilter = {
|
|||
map-options
|
||||
use-input
|
||||
:input-debounce="0"
|
||||
>
|
||||
</QSelect>
|
||||
/>
|
||||
</VnRow>
|
||||
</template>
|
||||
</FormModel>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRouter } from 'vue-router';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import { toDate } from 'filters/index';
|
||||
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||
|
@ -14,7 +13,6 @@ import ClaimSummary from './Card/ClaimSummary.vue';
|
|||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
|
||||
const stateStore = useStateStore();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const { viewSummary } = useSummaryDialog();
|
||||
|
|
|
@ -234,7 +234,7 @@ const showBalancePdf = (balance) => {
|
|||
<template #body-cell-employee="{ row }">
|
||||
<QTd auto-width @click.stop>
|
||||
<QBtn color="blue" flat no-caps>{{ row.userName }}</QBtn>
|
||||
<WorkerDescriptorProxy :id="row.clientFk" />
|
||||
<WorkerDescriptorProxy :id="row.workerFk" />
|
||||
</QTd>
|
||||
</template>
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
import { computed, ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useQuasar } from 'quasar';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
|
||||
|
@ -23,7 +22,6 @@ const $props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const quasar = useQuasar();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
||||
|
|
|
@ -82,6 +82,16 @@ const tableColumnComponents = computed(() => ({
|
|||
},
|
||||
event: getInputEvents,
|
||||
},
|
||||
printedStickers: {
|
||||
component: VnInput,
|
||||
props: {
|
||||
type: 'number',
|
||||
min: 0,
|
||||
class: 'input-number',
|
||||
dense: true,
|
||||
},
|
||||
event: getInputEvents,
|
||||
},
|
||||
weight: {
|
||||
component: VnInput,
|
||||
props: {
|
||||
|
@ -147,7 +157,7 @@ const entriesTableColumns = computed(() => {
|
|||
return [
|
||||
{
|
||||
label: t('entry.summary.item'),
|
||||
field: 'id',
|
||||
field: 'itemFk',
|
||||
name: 'item',
|
||||
align: 'left',
|
||||
},
|
||||
|
@ -169,6 +179,12 @@ const entriesTableColumns = computed(() => {
|
|||
name: 'stickers',
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
label: t('entry.buys.printedStickers'),
|
||||
field: 'printedStickers',
|
||||
name: 'printedStickers',
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
label: t('entry.summary.weight'),
|
||||
field: 'weight',
|
||||
|
@ -216,7 +232,6 @@ const entriesTableColumns = computed(() => {
|
|||
});
|
||||
|
||||
const copyOriginalRowsData = (rows) => {
|
||||
// el objetivo de esto es guardar los valores iniciales de todas las rows para evitar guardar cambios si la data no cambió al disparar los eventos
|
||||
originalRowDataCopy.value = JSON.parse(JSON.stringify(rows));
|
||||
};
|
||||
|
||||
|
@ -386,19 +401,16 @@ const lockIconType = (groupingMode, mode) => {
|
|||
</template>
|
||||
<ItemDescriptorProxy
|
||||
v-if="col.name === 'item'"
|
||||
:id="props.row.id"
|
||||
:id="props.row.item.id"
|
||||
/>
|
||||
</component>
|
||||
</QTd>
|
||||
</QTr>
|
||||
<QTr no-hover>
|
||||
<QTr no-hover class="full-width infoRow" style="column-span: all">
|
||||
<QTd />
|
||||
<QTd>
|
||||
<QTd cols>
|
||||
<span>{{ props.row.item.itemType.code }}</span>
|
||||
</QTd>
|
||||
<QTd>
|
||||
<span>{{ props.row.item.id }}</span>
|
||||
</QTd>
|
||||
<QTd>
|
||||
<span>{{ props.row.item.size }}</span>
|
||||
</QTd>
|
||||
|
@ -413,10 +425,6 @@ const lockIconType = (groupingMode, mode) => {
|
|||
<FetchedTags :item="props.row.item" :max-length="5" />
|
||||
</QTd>
|
||||
</QTr>
|
||||
<!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
|
||||
<QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
|
||||
<QTd colspan="12" class="vn-table-separation-row" />
|
||||
</QTr>
|
||||
</template>
|
||||
<template #item="props">
|
||||
<div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
|
||||
|
@ -466,11 +474,13 @@ const lockIconType = (groupingMode, mode) => {
|
|||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.separation-row {
|
||||
background-color: var(--vn-section-color) !important;
|
||||
.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
|
||||
border-bottom-width: 0px;
|
||||
border-top-width: 2px;
|
||||
border-color: var(--vn-text-color);
|
||||
}
|
||||
.grid-style-transition {
|
||||
transition: transform 0.28s, background-color 0.28s;
|
||||
.infoRow > td {
|
||||
color: var(--vn-label-color);
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ const redirectToBuysView = () => {
|
|||
@on-fetch="(data) => (packagingsOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
<QForm>
|
||||
<QForm @submit="onSubmit()">
|
||||
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
|
||||
<div>
|
||||
<QBtnGroup push class="q-gutter-x-sm">
|
||||
|
|
|
@ -34,7 +34,7 @@ const entryFilter = {
|
|||
{
|
||||
relation: 'travel',
|
||||
scope: {
|
||||
fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
|
||||
fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
|
||||
include: [
|
||||
{
|
||||
relation: 'agency',
|
||||
|
@ -125,10 +125,8 @@ watch;
|
|||
:label="t('entry.descriptor.agency')"
|
||||
:value="entity.travel?.agency?.name"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('entry.descriptor.landed')"
|
||||
:value="toDate(entity.travel?.landed)"
|
||||
/>
|
||||
<VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
|
||||
<VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
|
||||
<VnLv
|
||||
:label="t('entry.descriptor.warehouseOut')"
|
||||
:value="entity.travel?.warehouseOut?.name"
|
||||
|
|
|
@ -221,10 +221,7 @@ const fetchEntryBuys = async () => {
|
|||
:value="entry.travel.agency.name"
|
||||
/>
|
||||
|
||||
<VnLv
|
||||
:label="t('entry.summary.travelShipped')"
|
||||
:value="toDate(entry.travel.shipped)"
|
||||
/>
|
||||
<VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
|
||||
|
||||
<VnLv
|
||||
:label="t('entry.summary.travelWarehouseOut')"
|
||||
|
@ -236,10 +233,7 @@ const fetchEntryBuys = async () => {
|
|||
v-model="entry.travel.isDelivered"
|
||||
:disable="true"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('entry.summary.travelLanded')"
|
||||
:value="toDate(entry.travel.landed)"
|
||||
/>
|
||||
<VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
|
||||
|
||||
<VnLv
|
||||
:label="t('entry.summary.travelWarehouseIn')"
|
||||
|
|
|
@ -78,10 +78,7 @@ onMounted(async () => {
|
|||
</QIcon>
|
||||
</template>
|
||||
<template #list-items>
|
||||
<VnLv
|
||||
:label="t('entry.list.landed')"
|
||||
:value="toDate(row.landed)"
|
||||
/>
|
||||
<VnLv :label="t('landed')" :value="toDate(row.landed)" />
|
||||
<VnLv
|
||||
:label="t('entry.list.booked')"
|
||||
:value="!!row.isBooked"
|
||||
|
|
|
@ -6,3 +6,5 @@ entryFilter:
|
|||
filter:
|
||||
search: General search
|
||||
reference: Reference
|
||||
landed: Landed
|
||||
shipped: Shipped
|
||||
|
|
|
@ -8,3 +8,6 @@ entryFilter:
|
|||
filter:
|
||||
search: Búsqueda general
|
||||
reference: Referencia
|
||||
|
||||
landed: F. llegada
|
||||
shipped: F. salida
|
||||
|
|
|
@ -19,7 +19,8 @@ const { t } = useI18n();
|
|||
const dms = ref({});
|
||||
const route = useRoute();
|
||||
const editDownloadDisabled = ref(false);
|
||||
const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
|
||||
const arrayData = useArrayData();
|
||||
const invoiceIn = computed(() => arrayData.store.data);
|
||||
const userConfig = ref(null);
|
||||
const invoiceId = computed(() => +route.params.id);
|
||||
|
||||
|
@ -81,7 +82,7 @@ async function setCreateDms() {
|
|||
createDmsRef.value.show();
|
||||
}
|
||||
|
||||
async function upsert() {
|
||||
async function onSubmit() {
|
||||
try {
|
||||
const isEdit = !!dms.value.id;
|
||||
const errors = {
|
||||
|
@ -318,15 +319,15 @@ async function upsert() {
|
|||
</template>
|
||||
</FormModel>
|
||||
<QDialog ref="editDmsRef">
|
||||
<QCard>
|
||||
<QCardSection class="q-pb-none">
|
||||
<QItem class="q-px-none">
|
||||
<span class="text-primary text-h6 full-width">
|
||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
||||
<QCard class="q-pa-sm">
|
||||
<QCardSection class="row items-center q-pb-none">
|
||||
<span class="text-primary text-h6">
|
||||
<QIcon name="edit" class="q-mr-xs" />
|
||||
{{ t('Edit document') }}
|
||||
</span>
|
||||
<QSpace />
|
||||
<QBtn icon="close" flat round dense v-close-popup />
|
||||
</QItem>
|
||||
</QCardSection>
|
||||
<QCardSection class="q-py-none">
|
||||
<QItem>
|
||||
|
@ -423,21 +424,27 @@ async function upsert() {
|
|||
</QItem>
|
||||
</QCardSection>
|
||||
<QCardActions class="justify-end">
|
||||
<QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
|
||||
<QBtn :label="t('globals.save')" color="primary" @click="upsert" />
|
||||
<QBtn
|
||||
flat
|
||||
:label="t('globals.close')"
|
||||
color="primary"
|
||||
v-close-popup
|
||||
/>
|
||||
<QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
|
||||
</QCardActions>
|
||||
</QCard>
|
||||
</QForm>
|
||||
</QDialog>
|
||||
<QDialog ref="createDmsRef">
|
||||
<QCard>
|
||||
<QCardSection class="q-pb-none">
|
||||
<QItem>
|
||||
<span class="text-primary text-h6 full-width">
|
||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
||||
<QCard class="q-pa-sm">
|
||||
<QCardSection class="row items-center q-pb-none">
|
||||
<span class="text-primary text-h6">
|
||||
<QIcon name="edit" class="q-mr-xs" />
|
||||
{{ t('Create document') }}
|
||||
</span>
|
||||
<QBtn icon="close" flat round dense v-close-popup align="right" />
|
||||
</QItem>
|
||||
<QSpace />
|
||||
<QBtn icon="close" flat round dense v-close-popup />
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pb-none">
|
||||
<QItem>
|
||||
|
@ -532,10 +539,16 @@ async function upsert() {
|
|||
</QItem>
|
||||
</QCardSection>
|
||||
<QCardActions align="right">
|
||||
<QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
|
||||
<QBtn :label="t('globals.save')" color="primary" @click="upsert" />
|
||||
<QBtn
|
||||
flat
|
||||
:label="t('globals.close')"
|
||||
color="primary"
|
||||
v-close-popup
|
||||
/>
|
||||
<QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
|
||||
</QCardActions>
|
||||
</QCard>
|
||||
</QForm>
|
||||
</QDialog>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
@ -12,7 +12,7 @@ const { push, currentRoute } = useRouter();
|
|||
const { t } = useI18n();
|
||||
|
||||
const invoiceId = +currentRoute.value.params.id;
|
||||
const arrayData = useArrayData(currentRoute.value.meta.moduleName);
|
||||
const arrayData = useArrayData();
|
||||
const invoiceIn = computed(() => arrayData.store.data);
|
||||
const invoiceInCorrectionRef = ref();
|
||||
const filter = {
|
||||
|
|
|
@ -27,9 +27,9 @@ const quasar = useQuasar();
|
|||
const { hasAny } = useRole();
|
||||
const { t } = useI18n();
|
||||
const { openReport, sendEmail } = usePrintService();
|
||||
const { store } = useArrayData(currentRoute.value.meta.moduleName);
|
||||
const arrayData = useArrayData();
|
||||
|
||||
const invoiceIn = computed(() => store.data);
|
||||
const invoiceIn = computed(() => arrayData.store.data);
|
||||
const cardDescriptorRef = ref();
|
||||
const correctionDialogRef = ref();
|
||||
const entityId = computed(() => $props.id || +currentRoute.value.params.id);
|
||||
|
@ -184,7 +184,7 @@ async function toUnbook() {
|
|||
: t('isNotLinked', { bookEntry });
|
||||
|
||||
quasar.notify({ type, message });
|
||||
if (!isLinked) store.data.isBooked = false;
|
||||
if (!isLinked) arrayData.store.data.isBooked = false;
|
||||
}
|
||||
|
||||
async function deleteInvoice() {
|
||||
|
@ -487,9 +487,6 @@ const createInvoiceInCorrection = async () => {
|
|||
.q-dialog {
|
||||
.q-card {
|
||||
max-width: 45em;
|
||||
.q-item__section > .q-input {
|
||||
padding-bottom: 1.4em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ import { toCurrency } from 'src/filters';
|
|||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const arrayData = useArrayData(route.meta.moduleName);
|
||||
const arrayData = useArrayData();
|
||||
const invoiceIn = computed(() => arrayData.store.data);
|
||||
|
||||
const rowsSelected = ref([]);
|
||||
|
|
|
@ -11,9 +11,8 @@ import { useArrayData } from 'src/composables/useArrayData';
|
|||
const { t } = useI18n();
|
||||
|
||||
const route = useRoute();
|
||||
const currency = computed(
|
||||
() => useArrayData(route.meta.moduleName).store.data?.currency?.code
|
||||
);
|
||||
const arrayData = useArrayData();
|
||||
const currency = computed(() => arrayData.store.data?.currency?.code);
|
||||
const invoceInIntrastat = ref([]);
|
||||
const rowsSelected = ref([]);
|
||||
const countries = ref([]);
|
||||
|
|
|
@ -14,9 +14,10 @@ import VnTitle from 'src/components/common/VnTitle.vue';
|
|||
const props = defineProps({ id: { type: [Number, String], default: 0 } });
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const arrayData = useArrayData();
|
||||
|
||||
const entityId = computed(() => props.id || +route.params.id);
|
||||
const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
|
||||
const invoiceIn = computed(() => arrayData.store.data);
|
||||
const currency = computed(() => invoiceIn.value?.currency?.code);
|
||||
const invoiceInUrl = ref();
|
||||
const amountsNotMatch = ref(null);
|
||||
|
|
|
@ -11,13 +11,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
|||
import CrudModel from 'src/components/CrudModel.vue';
|
||||
import VnCurrency from 'src/components/common/VnCurrency.vue';
|
||||
|
||||
const router = useRoute();
|
||||
const { t } = useI18n();
|
||||
const quasar = useQuasar();
|
||||
|
||||
const arrayData = useArrayData(router.meta.moduleName);
|
||||
const arrayData = useArrayData();
|
||||
const invoiceIn = computed(() => arrayData.store.data);
|
||||
const invoiceId = +router.params.id;
|
||||
const invoiceId = +useRoute().params.id;
|
||||
const currency = computed(() => invoiceIn.value?.currency?.code);
|
||||
const expenses = ref([]);
|
||||
const sageTaxTypes = ref([]);
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
<script setup>
|
||||
import { useRoute } from 'vue-router';
|
||||
import axios from 'axios';
|
||||
import { useQuasar } from 'quasar';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
@ -10,7 +9,7 @@ const { t } = useI18n();
|
|||
|
||||
defineExpose({ checkToBook });
|
||||
|
||||
const { store } = useArrayData(useRoute().meta.moduleName);
|
||||
const { store } = useArrayData();
|
||||
|
||||
async function checkToBook(id) {
|
||||
let directBooking = true;
|
||||
|
|
|
@ -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 () => {
|
|||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('item.descriptor.producer')"
|
||||
:value="dashIfEmpty(entity.subName)"
|
||||
/>
|
||||
<VnLv
|
||||
v-if="entity.value5"
|
||||
:label="t('item.descriptor.color')"
|
||||
|
|
|
@ -56,7 +56,7 @@ const params = reactive({});
|
|||
const arrayData = useArrayData('ItemFixedPrices', {
|
||||
url: 'FixedPrices/filter',
|
||||
userParams: params,
|
||||
order: ['itemFk'],
|
||||
order: ['name ASC', 'itemFk'],
|
||||
exprBuilder: exprBuilder,
|
||||
});
|
||||
const store = arrayData.store;
|
||||
|
|
|
@ -33,7 +33,7 @@ const addToOrder = async () => {
|
|||
|
||||
<template>
|
||||
<div class="container order-catalog-item q-pb-md">
|
||||
<QForm @submit.prevent="addToOrder">
|
||||
<QForm @submit="addToOrder">
|
||||
<QMarkupTable class="shadow-0">
|
||||
<tbody>
|
||||
<tr v-for="item in fields" :key="item.warehouse">
|
||||
|
|
|
@ -11,13 +11,10 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
|||
import VnInput from 'components/common/VnInput.vue';
|
||||
import axios from 'axios';
|
||||
import VnInputTime from 'components/common/VnInputTime.vue';
|
||||
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const stateStore = useStateStore();
|
||||
const shelvingId = ref(route.params?.id || null);
|
||||
const isNew = Boolean(!shelvingId.value);
|
||||
const defaultInitialData = {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<script setup>
|
||||
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();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
|
||||
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
|
@ -93,13 +94,13 @@ const countries = ref();
|
|||
<QItemSection v-if="!countries">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
</QItemSection>
|
||||
<QItemSection v-if="countries" class="q-mb-sm">
|
||||
<QSelect
|
||||
<QItemSection v-if="countries">
|
||||
<VnSelect
|
||||
:label="t('route.cmr.list.country')"
|
||||
v-model="params.country"
|
||||
:options="countries"
|
||||
option-value="country"
|
||||
option-label="country"
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
transition-show="jump-down"
|
||||
transition-hide="jump-up"
|
||||
emit-value
|
||||
|
@ -111,9 +112,23 @@ const countries = ref();
|
|||
<template #prepend>
|
||||
<QIcon name="flag" size="sm"></QIcon>
|
||||
</template>
|
||||
</QSelect>
|
||||
</VnSelect>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<VnSelect
|
||||
:label="t('globals.warehouse')"
|
||||
:options="warehouses"
|
||||
hide-selected
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
v-model="params.warehouseFk"
|
||||
rounded
|
||||
dense
|
||||
outlined
|
||||
>
|
||||
</VnSelect>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInputDate
|
||||
|
@ -126,7 +141,6 @@ const countries = ref();
|
|||
</template>
|
||||
</VnFilterPanel>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
en:
|
||||
params:
|
||||
|
|
|
@ -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() {
|
|||
<div class="list">
|
||||
<VnPaginate
|
||||
data-key="CmrList"
|
||||
:url="`Routes/getExternalCmrs`"
|
||||
:url="`Routes/cmrs`"
|
||||
order="cmrFk DESC"
|
||||
limit="null"
|
||||
auto-load
|
||||
|
@ -147,6 +155,11 @@ function downloadPdfs() {
|
|||
<CustomerDescriptorProxy :id="value" />
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-warehouseFk="{ value }">
|
||||
<QTd align="center">
|
||||
{{ warehouses.find(({ id }) => id === value)?.name }}
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-icons="{ value }">
|
||||
<QTd align="center">
|
||||
<a :href="getCmrUrl(value)" target="_blank">
|
||||
|
|
|
@ -34,7 +34,7 @@ const updateDefaultStop = (data) => {
|
|||
const onSave = async () => {
|
||||
isLoading.value = true;
|
||||
try {
|
||||
await axios.post('ExpeditionTrucks', { ...roadmapStopForm });
|
||||
await axios.post('RoadmapStops', { ...roadmapStopForm });
|
||||
emit('ok');
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
|
|
|
@ -23,28 +23,43 @@ const props = defineProps({
|
|||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
const warehouseList = ref([]);
|
||||
const addressList = ref([]);
|
||||
const form = computed(() => props.formData);
|
||||
const isDialog = computed(() => props.layout === 'dialog');
|
||||
const onFetch = (data) => {
|
||||
addressList.value = data.map((roadmap) => ({
|
||||
id: roadmap.addressFk,
|
||||
nickname: roadmap.address ? roadmap.address.nickname : '',
|
||||
}));
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="Warehouses"
|
||||
url="RoadmapAddresses"
|
||||
auto-load
|
||||
:filter="{ fields: ['id', 'name'] }"
|
||||
sort-by="name"
|
||||
:filter="{
|
||||
include: [
|
||||
{
|
||||
relation: 'address',
|
||||
scope: {
|
||||
fields: ['nickname'],
|
||||
},
|
||||
},
|
||||
],
|
||||
}"
|
||||
limit="30"
|
||||
@on-fetch="(data) => (warehouseList = data)"
|
||||
@on-fetch="onFetch"
|
||||
/>
|
||||
<div :class="[isDialog ? 'column' : 'form-gap', 'full-width flex']">
|
||||
<QCardSection class="flex-grow q-px-none flex-1">
|
||||
<VnSelect
|
||||
v-model.number="form.warehouseFk"
|
||||
v-model.number="form.addressFk"
|
||||
class="full-width"
|
||||
:label="t('Warehouse')"
|
||||
:options="warehouseList"
|
||||
:label="t('Address')"
|
||||
:options="addressList"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
option-label="nickname"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
|
@ -80,6 +95,7 @@ const isDialog = computed(() => props.layout === 'dialog');
|
|||
</QCardSection>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.form-gap {
|
||||
gap: 16px;
|
||||
|
@ -93,9 +109,10 @@ const isDialog = computed(() => props.layout === 'dialog');
|
|||
flex: 2;
|
||||
}
|
||||
</style>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Warehouse: Almacén
|
||||
Address: Dirección
|
||||
ETA date: Fecha ETA
|
||||
ETA hour: Hora ETA
|
||||
Description: Descripción
|
||||
|
|
|
@ -3,7 +3,6 @@ import { useI18n } from 'vue-i18n';
|
|||
import { useRoute, useRouter } from 'vue-router';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import VnInput from 'components/common/VnInput.vue';
|
||||
import VnInputTime from 'components/common/VnInputTime.vue';
|
||||
|
@ -22,7 +21,6 @@ const onSave = (data, response) => {
|
|||
};
|
||||
</script>
|
||||
<template>
|
||||
<VnSubToolbar />
|
||||
<FetchData
|
||||
url="Suppliers"
|
||||
auto-load
|
||||
|
|
|
@ -1,21 +1,17 @@
|
|||
<script setup>
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import LeftMenu from 'components/LeftMenu.vue';
|
||||
import RoadmapDescriptor from "pages/Route/Roadmap/RoadmapDescriptor.vue";
|
||||
|
||||
const stateStore = useStateStore();
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
|
||||
import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
|
||||
</script>
|
||||
<template>
|
||||
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
|
||||
<QScrollArea class="fit">
|
||||
<RoadmapDescriptor />
|
||||
<QSeparator />
|
||||
<LeftMenu source="card" />
|
||||
</QScrollArea>
|
||||
</QDrawer>
|
||||
<QPageContainer>
|
||||
<QPage>
|
||||
<RouterView></RouterView>
|
||||
</QPage>
|
||||
</QPageContainer>
|
||||
<VnCard
|
||||
data-key="Roadmap"
|
||||
base-url="Roadmaps"
|
||||
:descriptor="RoadmapDescriptor"
|
||||
:filter-panel="RoadmapFilter"
|
||||
search-data-key="RoadmapList"
|
||||
search-url="Roadmaps"
|
||||
searchbar-label="Search roadmap"
|
||||
searchbar-info="You can search by roadmap id or customer name"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import { ref } from 'vue';
|
||||
import CrudModel from 'components/CrudModel.vue';
|
||||
|
@ -23,7 +22,6 @@ const updateDefaultStop = (data) => {
|
|||
};
|
||||
</script>
|
||||
<template>
|
||||
<VnSubToolbar />
|
||||
<FetchData
|
||||
:url="`Roadmaps/${route.params?.id}`"
|
||||
auto-load
|
||||
|
@ -33,9 +31,9 @@ const updateDefaultStop = (data) => {
|
|||
<div class="q-pa-lg">
|
||||
<CrudModel
|
||||
ref="roadmapStopsCrudRef"
|
||||
data-key="ExpeditionTrucks"
|
||||
url="ExpeditionTrucks"
|
||||
model="ExpeditionTrucks"
|
||||
data-key="RoadmapStops"
|
||||
url="RoadmapStops"
|
||||
model="RoadmapStops"
|
||||
:filter="{ where: { roadmapFk: route.params?.id } }"
|
||||
:default-remove="false"
|
||||
:data-required="defaultStop"
|
||||
|
@ -86,7 +84,7 @@ const updateDefaultStop = (data) => {
|
|||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
Warehouse: Almacén
|
||||
Address: Consignatario
|
||||
ETA date: Fecha ETA
|
||||
ETA hour: Hora ETA
|
||||
Description: Descripción
|
||||
|
|
|
@ -35,9 +35,9 @@ onUnmounted(hideRightDrawer);
|
|||
|
||||
const columns = ref([
|
||||
{
|
||||
name: 'warehouse',
|
||||
label: t('Warehouse'),
|
||||
field: (row) => dashIfEmpty(row?.warehouse?.name),
|
||||
name: 'address',
|
||||
label: t('Address'),
|
||||
field: (row) => dashIfEmpty(row?.address?.nickname),
|
||||
sortable: true,
|
||||
align: 'left',
|
||||
},
|
||||
|
@ -54,8 +54,17 @@ const filter = {
|
|||
{ relation: 'supplier' },
|
||||
{ relation: 'worker' },
|
||||
{
|
||||
relation: 'expeditionTruck',
|
||||
scope: { include: [{ relation: 'warehouse' }] },
|
||||
relation: 'roadmapStop',
|
||||
scope: {
|
||||
include: [
|
||||
{
|
||||
relation: 'address',
|
||||
scope: {
|
||||
fields: ['nickname'],
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
|
@ -151,11 +160,9 @@ const openAddStopDialog = () => {
|
|||
</div>
|
||||
<QTable
|
||||
:columns="columns"
|
||||
:rows="entity?.expeditionTruck"
|
||||
:rows="entity?.roadmapStop"
|
||||
:rows-per-page-options="[0]"
|
||||
row-key="id"
|
||||
flat
|
||||
hide-pagination
|
||||
/>
|
||||
</QCard>
|
||||
</template>
|
||||
|
@ -171,7 +178,7 @@ es:
|
|||
Worker: Trabajador
|
||||
Observations: Observaciones
|
||||
Stops: Paradas
|
||||
Warehouse: Almacén
|
||||
Address: Dirección
|
||||
Go to stops: Ir a paradas
|
||||
Add stop: Añadir parada
|
||||
</i18n>
|
||||
|
|
|
@ -266,9 +266,9 @@ function navigateToRoadmapSummary(event, row) {
|
|||
<i18n>
|
||||
es:
|
||||
Search roadmaps: Buscar troncales
|
||||
You can search by roadmap reference: Puedes buscar por referencia de la troncal
|
||||
You can search by roadmap reference: Puedes buscar por referencia del troncal
|
||||
Delete roadmap(s): Eliminar troncal(es)
|
||||
Selected roadmaps will be removed: Las troncales seleccionadas serán eliminadas
|
||||
Selected roadmaps will be removed: Los troncales seleccionadas serán eliminados
|
||||
Are you sure you want to continue?: ¿Seguro que quieres continuar?
|
||||
The date can't be empty: La fecha no puede estar vacía
|
||||
Clone Selected Routes: Clonar rutas seleccionadas
|
||||
|
|
|
@ -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"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('ticket.summary.collection')"
|
||||
:value="ticket.ticketCollections[0]?.collectionFk"
|
||||
>
|
||||
<template #value>
|
||||
<a
|
||||
:href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`"
|
||||
target="_blank"
|
||||
class="grafana"
|
||||
>
|
||||
{{ ticket.ticketCollections[0]?.collectionFk }}
|
||||
</a>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
|
||||
<VnLv :label="t('ticket.summary.invoice')">
|
||||
<template #value>
|
||||
|
@ -487,4 +502,7 @@ async function changeState(value) {
|
|||
.fetched-tags {
|
||||
max-width: 70%;
|
||||
}
|
||||
.grafana {
|
||||
color: $primary-light;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -136,13 +136,6 @@ const getEventByTimestamp = ({ year, month, day }) => {
|
|||
return props.events[stamp] || null;
|
||||
};
|
||||
|
||||
const isFestive = (timestamp) => {
|
||||
const event = getEventByTimestamp(timestamp);
|
||||
if (!event) return false;
|
||||
|
||||
const { isFestive } = event;
|
||||
return isFestive;
|
||||
};
|
||||
const getEventAttrs = (timestamp) => {
|
||||
const event = getEventByTimestamp(timestamp);
|
||||
if (!event) return {};
|
||||
|
|
|
@ -0,0 +1,99 @@
|
|||
<script setup>
|
||||
import { ref, reactive, onMounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import FormPopup from 'src/components/FormPopup.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import axios from 'axios';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
type: Object,
|
||||
default: () => {},
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onSubmit']);
|
||||
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
|
||||
const formData = reactive({
|
||||
newPassword: null,
|
||||
repeatPassword: null,
|
||||
});
|
||||
|
||||
const passRequirements = ref([]);
|
||||
|
||||
const setPassword = async () => {
|
||||
try {
|
||||
if (!formData.newPassword) {
|
||||
notify(t('You must enter a new password'), 'negative');
|
||||
return;
|
||||
}
|
||||
|
||||
if (formData.newPassword != formData.repeatPassword) {
|
||||
notify(t(`Passwords don't match`), 'negative');
|
||||
return;
|
||||
}
|
||||
|
||||
await axios.patch(`Workers/${$props.id}/setPassword`, {
|
||||
newPass: formData.newPassword,
|
||||
});
|
||||
notify(t('Password changed!'), 'positive');
|
||||
emit('onSubmit');
|
||||
} catch (err) {
|
||||
console.error('Error setting password', err);
|
||||
}
|
||||
};
|
||||
|
||||
const getPassRequirements = async () => {
|
||||
const { data } = await axios.get('UserPasswords/findOne');
|
||||
passRequirements.value = data;
|
||||
};
|
||||
|
||||
onMounted(async () => await getPassRequirements());
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormPopup :title="t('Reset password')" @on-submit="setPassword()">
|
||||
<template #form-inputs>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInput
|
||||
:label="t('New password')"
|
||||
v-model="formData.newPassword"
|
||||
type="password"
|
||||
:required="true"
|
||||
:info="
|
||||
t('passwordRequirements', {
|
||||
length: passRequirements.length,
|
||||
nAlpha: passRequirements.nAlpha,
|
||||
nUpper: passRequirements.nUpper,
|
||||
nDigits: passRequirements.nDigits,
|
||||
nPunct: passRequirements.nPunct,
|
||||
})
|
||||
"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInput
|
||||
:label="t('Repeat password')"
|
||||
v-model="formData.repeatPassword"
|
||||
type="password"
|
||||
/>
|
||||
</VnRow>
|
||||
</template>
|
||||
</FormPopup>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
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
|
||||
</i18n>
|
|
@ -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();
|
||||
</script>
|
||||
<template>
|
||||
<CardDescriptor
|
||||
ref="cardDescriptorRef"
|
||||
module="Worker"
|
||||
data-key="workerData"
|
||||
:url="`Workers/${entityId}`"
|
||||
|
@ -90,9 +126,34 @@ const setData = (entity) => {
|
|||
(data) => {
|
||||
worker = data;
|
||||
setData(data);
|
||||
getIsExcluded();
|
||||
}
|
||||
"
|
||||
>
|
||||
<template #menu="{}">
|
||||
<QItem v-ripple clickable @click="handleExcluded()">
|
||||
<QItemSection>
|
||||
{{
|
||||
workerExcluded
|
||||
? t('Click to allow the user to be disabled')
|
||||
: t('Click to exclude the user from getting disabled')
|
||||
}}
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem
|
||||
v-if="!worker.user.emailVerified && user.id != worker.id"
|
||||
v-ripple
|
||||
clickable
|
||||
@click="openChangePasswordForm()"
|
||||
>
|
||||
<QItemSection>
|
||||
{{ t('Change password') }}
|
||||
<QDialog ref="changePasswordFormDialog">
|
||||
<WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
|
||||
</QDialog>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
<template #before>
|
||||
<QImg :src="getWorkerAvatar()" class="photo">
|
||||
<template #error>
|
||||
|
@ -139,3 +200,10 @@ const setData = (entity) => {
|
|||
height: 256px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<i18n>
|
||||
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
|
||||
</i18n>
|
||||
|
|
|
@ -460,7 +460,7 @@ onMounted(async () => {
|
|||
style="margin-left: 1px"
|
||||
/>
|
||||
</QBtnGroup>
|
||||
<QBtnGroup push class="q-gutter-x-sm" flat style="margin-left: 0px">
|
||||
<QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
|
||||
<QBtn
|
||||
v-if="reason && state && (isHimSelf || isHr)"
|
||||
:label="t('Reason')"
|
||||
|
|
|
@ -1,59 +1,29 @@
|
|||
<script setup>
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { onBeforeMount, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import axios from 'axios';
|
||||
import { useUserConfig } from 'src/composables/useUserConfig';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
|
||||
import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
|
||||
import VnLocation from 'src/components/common/VnLocation.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
|
||||
import { useUserConfig } from 'src/composables/useUserConfig';
|
||||
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
|
||||
import VnRadio from 'src/components/common/VnRadio.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const workerConfigFilter = {
|
||||
field: ['payMethodFk'],
|
||||
};
|
||||
|
||||
const newWorkerForm = ref({
|
||||
companyFk: null,
|
||||
payMethodFk: null,
|
||||
firstName: null,
|
||||
lastNames: null,
|
||||
birth: null,
|
||||
fi: null,
|
||||
code: null,
|
||||
phone: null,
|
||||
postcode: null,
|
||||
provinceFk: null,
|
||||
city: null,
|
||||
street: null,
|
||||
name: null,
|
||||
email: null,
|
||||
bossFk: null,
|
||||
iban: null,
|
||||
bankEntityFk: null,
|
||||
});
|
||||
|
||||
const companiesOptions = ref([]);
|
||||
const workersOptions = ref([]);
|
||||
const payMethodsOptions = ref([]);
|
||||
const bankEntitiesOptions = ref([]);
|
||||
const postcodesOptions = ref([]);
|
||||
|
||||
const onFetchWorkerConfig = (workerConfig) => {
|
||||
newWorkerForm.value.payMethodFk = workerConfig.payMethodFk;
|
||||
};
|
||||
|
||||
const onBankEntityCreated = (data) => {
|
||||
bankEntitiesOptions.value.push(data);
|
||||
};
|
||||
const formData = ref({ isFreelance: false });
|
||||
const defaultPayMethod = ref(0);
|
||||
|
||||
function handleLocation(data, location) {
|
||||
const { town, code, provinceFk, countryFk } = location ?? {};
|
||||
|
@ -63,20 +33,18 @@ function handleLocation(data, location) {
|
|||
data.countryFk = countryFk;
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
onBeforeMount(async () => {
|
||||
const userInfo = await useUserConfig().fetch();
|
||||
newWorkerForm.value = { companyFk: userInfo.companyFk };
|
||||
formData.value.companyFk = userInfo.companyFk;
|
||||
|
||||
const { data } = await axios.get('WorkerConfigs/findOne', {
|
||||
params: { field: ['payMethodFk'] },
|
||||
});
|
||||
defaultPayMethod.value = data.payMethodFk;
|
||||
formData.value.payMethodFk = defaultPayMethod.value;
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="WorkerConfigs/findOne"
|
||||
@on-fetch="(data) => onFetchWorkerConfig(data)"
|
||||
:filter="workerConfigFilter"
|
||||
auto-load
|
||||
/>
|
||||
|
||||
<FetchData
|
||||
url="Companies"
|
||||
@on-fetch="(data) => (companiesOptions = data)"
|
||||
|
@ -97,16 +65,31 @@ onMounted(async () => {
|
|||
@on-fetch="(data) => (bankEntitiesOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
|
||||
<QPage>
|
||||
<VnSubToolbar />
|
||||
<VnSubToolbar>
|
||||
<template #st-data>
|
||||
<VnRadio
|
||||
v-model="formData.isFreelance"
|
||||
:val="false"
|
||||
:label="`${t('Internal')}`"
|
||||
@update:model-value="formData.payMethodFk = defaultPayMethod"
|
||||
/>
|
||||
<VnRadio
|
||||
v-model="formData.isFreelance"
|
||||
:val="true"
|
||||
:label="`${t('External')}`"
|
||||
@update:model-value="delete formData.payMethodFk"
|
||||
/>
|
||||
</template>
|
||||
</VnSubToolbar>
|
||||
<FormModel
|
||||
url-create="Workers/new"
|
||||
model="worker"
|
||||
:form-initial-data="newWorkerForm"
|
||||
:form-initial-data="formData"
|
||||
@on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
|
||||
>
|
||||
<template #form="{ data, validate }">
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnRow>
|
||||
<VnInput
|
||||
v-model="data.firstName"
|
||||
:label="t('worker.create.name')"
|
||||
|
@ -117,47 +100,13 @@ onMounted(async () => {
|
|||
:label="t('worker.create.lastName')"
|
||||
:rules="validate('Worker.lastNames')"
|
||||
/>
|
||||
<VnInputDate
|
||||
v-model="data.birth"
|
||||
:label="t('worker.create.birth')"
|
||||
:rules="validate('Worker.birth')"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInput
|
||||
v-model="data.fi"
|
||||
:label="t('worker.create.fi')"
|
||||
:rules="validate('Worker.fi')"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.code"
|
||||
:label="t('worker.create.code')"
|
||||
:rules="validate('Worker.code')"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.phone"
|
||||
:label="t('worker.create.phone')"
|
||||
:rules="validate('Worker.phone')"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnLocation
|
||||
:rules="validate('Worker.postcode')"
|
||||
:roles-allowed-to-create="['deliveryAssistant']"
|
||||
:options="postcodesOptions"
|
||||
v-model="data.location"
|
||||
@update:model-value="(location) => handleLocation(data, location)"
|
||||
>
|
||||
</VnLocation>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInput
|
||||
:label="t('worker.create.street')"
|
||||
v-model="data.street"
|
||||
:rules="validate('Worker.street')"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnRow>
|
||||
<VnInput
|
||||
v-model="data.name"
|
||||
:label="t('worker.create.webUser')"
|
||||
|
@ -169,7 +118,7 @@ onMounted(async () => {
|
|||
:rules="validate('Worker.email')"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnRow>
|
||||
<VnSelect
|
||||
:label="t('worker.create.company')"
|
||||
v-model="data.companyFk"
|
||||
|
@ -201,7 +150,45 @@ onMounted(async () => {
|
|||
</template>
|
||||
</VnSelect>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnRow>
|
||||
<VnInput
|
||||
v-model="data.fi"
|
||||
:label="t('worker.create.fi')"
|
||||
:rules="validate('Worker.fi')"
|
||||
/>
|
||||
<VnInputDate
|
||||
v-model="data.birth"
|
||||
:label="t('worker.create.birth')"
|
||||
:rules="validate('Worker.birth')"
|
||||
:disable="formData.isFreelance"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.phone"
|
||||
:label="t('worker.create.phone')"
|
||||
:rules="validate('Worker.phone')"
|
||||
:disable="formData.isFreelance"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnLocation
|
||||
:rules="validate('Worker.postcode')"
|
||||
:roles-allowed-to-create="['deliveryAssistant']"
|
||||
:options="postcodesOptions"
|
||||
v-model="data.location"
|
||||
@update:model-value="(location) => handleLocation(data, location)"
|
||||
:disable="formData.isFreelance"
|
||||
>
|
||||
</VnLocation>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnInput
|
||||
:label="t('worker.create.street')"
|
||||
v-model="data.street"
|
||||
:rules="validate('Worker.street')"
|
||||
:disable="formData.isFreelance"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnSelect
|
||||
:label="t('worker.create.payMethods')"
|
||||
v-model="data.payMethodFk"
|
||||
|
@ -211,11 +198,14 @@ onMounted(async () => {
|
|||
map-options
|
||||
hide-selected
|
||||
:rules="validate('Worker.payMethodFk')"
|
||||
:disable="formData.isFreelance"
|
||||
@update:model-value="(val) => !val && delete formData.payMethodFk"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.iban"
|
||||
:label="t('worker.create.iban')"
|
||||
:rules="validate('Worker.iban')"
|
||||
:disable="formData.isFreelance"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-info">
|
||||
|
@ -232,10 +222,11 @@ onMounted(async () => {
|
|||
hide-selected
|
||||
:roles-allowed-to-create="['salesAssistant', 'hr']"
|
||||
:rules="validate('Worker.bankEntity')"
|
||||
:disable="formData.isFreelance"
|
||||
>
|
||||
<template #form>
|
||||
<CreateBankEntityForm
|
||||
@on-data-saved="onBankEntityCreated($event)"
|
||||
@on-data-saved="(data) => bankEntitiesOptions.push(data)"
|
||||
/>
|
||||
</template>
|
||||
<template #option="scope">
|
||||
|
|
|
@ -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'
|
|
@ -1,3 +1,6 @@
|
|||
Search worker: Buscar trabajador
|
||||
You can search by worker id or name: Puedes buscar por id o nombre del trabajador
|
||||
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: $%&.)'
|
||||
|
|
|
@ -14,10 +14,12 @@ const customRouteRedirectName = computed(() => {
|
|||
if (routeName.value === 'ZoneLocations') return null;
|
||||
return routeName.value;
|
||||
});
|
||||
const searchbarMakeFetch = computed(() => routeName.value !== 'ZoneEvents');
|
||||
const searchBarDataKeys = {
|
||||
ZoneWarehouses: 'ZoneWarehouses',
|
||||
ZoneSummary: 'ZoneSummary',
|
||||
ZoneLocations: 'ZoneLocations',
|
||||
ZoneEvents: 'ZoneEvents',
|
||||
};
|
||||
</script>
|
||||
<template>
|
||||
|
@ -27,6 +29,7 @@ const searchBarDataKeys = {
|
|||
:search-data-key="searchBarDataKeys[routeName]"
|
||||
:search-custom-route-redirect="customRouteRedirectName"
|
||||
:search-redirect="!!customRouteRedirectName"
|
||||
:search-make-fetch="searchbarMakeFetch"
|
||||
:searchbar-label="t('list.searchZone')"
|
||||
:searchbar-info="t('list.searchInfo')"
|
||||
/>
|
||||
|
|
|
@ -0,0 +1,207 @@
|
|||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import FormPopup from 'components/FormPopup.vue';
|
||||
import ZoneLocationsTree from './ZoneLocationsTree.vue';
|
||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import axios from 'axios';
|
||||
|
||||
const props = defineProps({
|
||||
date: {
|
||||
type: Date,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
event: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
isNewMode: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
eventType: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
geoIds: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onSubmit', 'closeForm']);
|
||||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
||||
const isNew = computed(() => props.isNewMode);
|
||||
const dated = ref(null);
|
||||
const tickedNodes = ref();
|
||||
|
||||
const _excludeType = ref('all');
|
||||
const excludeType = computed({
|
||||
get: () => _excludeType.value,
|
||||
set: (val) => {
|
||||
_excludeType.value = val;
|
||||
},
|
||||
});
|
||||
|
||||
const arrayData = useArrayData('ZoneEvents');
|
||||
|
||||
const exclusionGeoCreate = async () => {
|
||||
try {
|
||||
if (isNew.value) {
|
||||
const params = {
|
||||
zoneFk: parseInt(route.params.id),
|
||||
date: dated.value,
|
||||
geoIds: tickedNodes.value,
|
||||
};
|
||||
await axios.post('Zones/exclusionGeo', params);
|
||||
} else {
|
||||
const params = {
|
||||
zoneExclusionFk: props.event?.zoneExclusionFk,
|
||||
geoIds: tickedNodes.value,
|
||||
};
|
||||
await axios.post('Zones/updateExclusionGeo', params);
|
||||
}
|
||||
await refetchEvents();
|
||||
} catch (err) {
|
||||
console.error('Error creating exclusion geo: ', err);
|
||||
}
|
||||
};
|
||||
|
||||
const exclusionCreate = async () => {
|
||||
try {
|
||||
if (isNew.value)
|
||||
await axios.post(`Zones/${route.params.id}/exclusions`, [
|
||||
{ dated: dated.value },
|
||||
]);
|
||||
else
|
||||
await axios.put(`Zones/${route.params.id}/exclusions/${props.event?.id}`, {
|
||||
dated: dated.value,
|
||||
});
|
||||
|
||||
await refetchEvents();
|
||||
} catch (err) {
|
||||
console.error('Error creating exclusion: ', err);
|
||||
}
|
||||
};
|
||||
|
||||
const onSubmit = async () => {
|
||||
if (excludeType.value === 'all') exclusionCreate();
|
||||
else exclusionGeoCreate();
|
||||
};
|
||||
|
||||
const deleteEvent = async () => {
|
||||
try {
|
||||
if (!props.event) return;
|
||||
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
|
||||
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
|
||||
await refetchEvents();
|
||||
} catch (err) {
|
||||
console.error('Error deleting event: ', err);
|
||||
}
|
||||
};
|
||||
|
||||
const closeForm = () => emit('closeForm');
|
||||
|
||||
const refetchEvents = async () => {
|
||||
await arrayData.refresh({ append: false });
|
||||
closeForm();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
if (props.event) {
|
||||
dated.value = props.event?.dated;
|
||||
excludeType.value =
|
||||
props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
|
||||
tickedNodes.value = props.geoIds || [];
|
||||
} else if (props.date) dated.value = props.date;
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormPopup
|
||||
:title="
|
||||
isNew
|
||||
? t('eventsExclusionForm.addExclusion')
|
||||
: t('eventsExclusionForm.editExclusion')
|
||||
"
|
||||
@on-submit="onSubmit()"
|
||||
:default-cancel-button="false"
|
||||
:default-submit-button="false"
|
||||
>
|
||||
<template #form-inputs>
|
||||
<VnRow class="row q-gutter-md q-mb-lg">
|
||||
<VnInputDate :label="t('eventsInclusionForm.day')" v-model="dated" />
|
||||
</VnRow>
|
||||
<div class="column q-gutter-y-sm q-mb-md">
|
||||
<QRadio
|
||||
v-model="excludeType"
|
||||
dense
|
||||
val="all"
|
||||
:label="t('eventsExclusionForm.all')"
|
||||
/>
|
||||
<QRadio
|
||||
v-model="excludeType"
|
||||
dense
|
||||
val="specificLocations"
|
||||
:label="t('eventsExclusionForm.specificLocations')"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
v-if="excludeType === 'specificLocations'"
|
||||
style="min-height: 60vh; overflow-y: scroll"
|
||||
>
|
||||
<ZoneLocationsTree
|
||||
:root-label="t('eventsExclusionForm.rootTreeLabel')"
|
||||
v-model:tickedNodes="tickedNodes"
|
||||
show-search-bar
|
||||
show-default-checkboxes
|
||||
>
|
||||
<template #content="{ node }">
|
||||
<span>{{ node.name }}</span>
|
||||
</template>
|
||||
</ZoneLocationsTree>
|
||||
</div>
|
||||
</template>
|
||||
<template #custom-buttons>
|
||||
<QBtn
|
||||
:label="t('globals.cancel')"
|
||||
color="primary"
|
||||
flat
|
||||
class="q-mr-sm"
|
||||
v-close-popup
|
||||
/>
|
||||
<QBtn
|
||||
v-if="
|
||||
!isNew && (eventType === 'exclusion' || eventType === 'geoExclusion')
|
||||
"
|
||||
:label="t('globals.delete')"
|
||||
color="primary"
|
||||
flat
|
||||
class="q-mr-sm"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
t('eventsPanel.deleteTitle'),
|
||||
t('eventsPanel.deleteSubtitle'),
|
||||
() => deleteEvent()
|
||||
)
|
||||
"
|
||||
/>
|
||||
<QBtn
|
||||
:label="isNew ? t('globals.add') : t('globals.save')"
|
||||
type="submit"
|
||||
color="primary"
|
||||
/>
|
||||
</template>
|
||||
</FormPopup>
|
||||
</template>
|
|
@ -0,0 +1,240 @@
|
|||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import FormPopup from 'components/FormPopup.vue';
|
||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||
import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
|
||||
import VnInputTime from 'components/common/VnInputTime.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import axios from 'axios';
|
||||
|
||||
const props = defineProps({
|
||||
date: {
|
||||
type: Date,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
event: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
isNewMode: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
eventType: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onSubmit', 'closeForm']);
|
||||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
||||
const isNew = computed(() => props.isNewMode);
|
||||
const eventInclusionFormData = ref({ wdays: [] });
|
||||
|
||||
const _inclusionType = ref('indefinitely');
|
||||
const inclusionType = computed({
|
||||
get: () => _inclusionType.value,
|
||||
set: (val) => {
|
||||
_inclusionType.value = val;
|
||||
eventInclusionFormData.value.type = val;
|
||||
},
|
||||
});
|
||||
|
||||
const arrayData = useArrayData('ZoneEvents');
|
||||
|
||||
const createEvent = async () => {
|
||||
try {
|
||||
eventInclusionFormData.value.weekDays = weekdayStore.toSet(
|
||||
eventInclusionFormData.value.wdays
|
||||
);
|
||||
|
||||
if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
|
||||
else eventInclusionFormData.value.dated = null;
|
||||
|
||||
if (inclusionType.value != 'range') {
|
||||
eventInclusionFormData.value.started = null;
|
||||
eventInclusionFormData.value.ended = null;
|
||||
}
|
||||
|
||||
if (isNew.value)
|
||||
await axios.post(
|
||||
`Zones/${route.params.id}/events`,
|
||||
eventInclusionFormData.value
|
||||
);
|
||||
else
|
||||
await axios.put(
|
||||
`Zones/${route.params.id}/events/${props.event?.id}`,
|
||||
eventInclusionFormData.value
|
||||
);
|
||||
|
||||
await refetchEvents();
|
||||
emit('onSubmit');
|
||||
} catch (err) {
|
||||
console.error('Error creating event', err);
|
||||
}
|
||||
};
|
||||
|
||||
const deleteEvent = async () => {
|
||||
try {
|
||||
if (!props.event) return;
|
||||
await axios.delete(`Zones/${route.params.id}/events/${props.event?.id}`);
|
||||
await refetchEvents();
|
||||
} catch (err) {
|
||||
console.error('Error deleting event: ', err);
|
||||
}
|
||||
};
|
||||
|
||||
const closeForm = () => {
|
||||
emit('closeForm');
|
||||
};
|
||||
|
||||
const refetchEvents = async () => {
|
||||
await arrayData.refresh({ append: false });
|
||||
closeForm();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
if (props.event) {
|
||||
eventInclusionFormData.value = { ...props.event };
|
||||
inclusionType.value = props.event?.type || 'day';
|
||||
} else if (props.date) {
|
||||
eventInclusionFormData.value.dated = props.date;
|
||||
inclusionType.value = 'day';
|
||||
} else inclusionType.value = 'indefinitely';
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormPopup
|
||||
:title="
|
||||
isNew ? t('eventsInclusionForm.addEvent') : t('eventsInclusionForm.editEvent')
|
||||
"
|
||||
@on-submit="createEvent()"
|
||||
:default-cancel-button="false"
|
||||
:default-submit-button="false"
|
||||
>
|
||||
<template #form-inputs>
|
||||
<div class="column q-gutter-y-sm q-mb-md">
|
||||
<QRadio
|
||||
v-model="inclusionType"
|
||||
dense
|
||||
val="day"
|
||||
:label="t('eventsInclusionForm.oneDay')"
|
||||
/>
|
||||
<QRadio
|
||||
v-model="inclusionType"
|
||||
dense
|
||||
val="indefinitely"
|
||||
:label="t('eventsInclusionForm.indefinitely')"
|
||||
/>
|
||||
<QRadio
|
||||
v-model="inclusionType"
|
||||
dense
|
||||
val="range"
|
||||
:label="t('eventsInclusionForm.rangeOfDates')"
|
||||
class="q-mb-sm"
|
||||
/>
|
||||
</div>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<div class="col flex justify-center">
|
||||
<VnInputDate
|
||||
v-if="inclusionType === 'day'"
|
||||
:label="t('eventsInclusionForm.day')"
|
||||
v-model="eventInclusionFormData.dated"
|
||||
class="full-width"
|
||||
/>
|
||||
<VnWeekdayPicker
|
||||
v-else
|
||||
v-model:wdays="eventInclusionFormData.wdays"
|
||||
/>
|
||||
</div>
|
||||
</VnRow>
|
||||
<VnRow v-if="inclusionType === 'range'" class="row q-gutter-md q-mb-md">
|
||||
<VnInputDate
|
||||
:label="t('eventsInclusionForm.from')"
|
||||
v-model="eventInclusionFormData.started"
|
||||
/>
|
||||
<VnInputDate
|
||||
:label="t('eventsInclusionForm.to')"
|
||||
v-model="eventInclusionFormData.ended"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInputTime
|
||||
v-model="eventInclusionFormData.hour"
|
||||
:label="t('eventsInclusionForm.closing')"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="eventInclusionFormData.travelingDays"
|
||||
:label="t('eventsInclusionForm.travelingDays')"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInput
|
||||
v-model="eventInclusionFormData.price"
|
||||
:label="t('eventsInclusionForm.price')"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="eventInclusionFormData.bonus"
|
||||
:label="t('eventsInclusionForm.bonus')"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInput
|
||||
v-model="eventInclusionFormData.m3Max"
|
||||
:label="t('eventsInclusionForm.m3Max')"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
</VnRow>
|
||||
</template>
|
||||
<template #custom-buttons>
|
||||
<QBtn
|
||||
:label="t('globals.cancel')"
|
||||
color="primary"
|
||||
flat
|
||||
class="q-mr-sm"
|
||||
v-close-popup
|
||||
/>
|
||||
<QBtn
|
||||
v-if="!isNew && eventType === 'event'"
|
||||
:label="t('globals.delete')"
|
||||
color="primary"
|
||||
flat
|
||||
class="q-mr-sm"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
t('eventsPanel.deleteTitle'),
|
||||
t('eventsPanel.deleteSubtitle'),
|
||||
() => deleteEvent()
|
||||
)
|
||||
"
|
||||
/>
|
||||
<QBtn
|
||||
:label="isNew ? t('globals.save') : t('globals.add')"
|
||||
type="submit"
|
||||
color="primary"
|
||||
/>
|
||||
</template>
|
||||
</FormPopup>
|
||||
</template>
|
|
@ -0,0 +1,111 @@
|
|||
<script setup>
|
||||
import { ref, onUnmounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import ZoneEventsPanel from './ZoneEventsPanel.vue';
|
||||
import ZoneCalendarGrid from '../ZoneCalendarGrid.vue';
|
||||
import ZoneEventInclusionForm from './ZoneEventInclusionForm.vue';
|
||||
import ZoneEventExclusionForm from './ZoneEventExclusionForm.vue';
|
||||
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import { reactive } from 'vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const stateStore = useStateStore();
|
||||
|
||||
const firstDay = ref(null);
|
||||
const lastDay = ref(null);
|
||||
|
||||
const events = ref([]);
|
||||
const formModeName = ref('include');
|
||||
const showZoneEventForm = ref(false);
|
||||
const zoneEventsFormProps = reactive({
|
||||
isNewMode: true,
|
||||
date: null,
|
||||
});
|
||||
|
||||
const openForm = (data) => {
|
||||
const { date = null, isNewMode, event, eventType, geoIds = [] } = data;
|
||||
zoneEventsFormProps.date = date;
|
||||
zoneEventsFormProps.isNewMode = isNewMode;
|
||||
zoneEventsFormProps.event = event;
|
||||
zoneEventsFormProps.eventType = eventType;
|
||||
if (geoIds.length) zoneEventsFormProps.geoIds = geoIds;
|
||||
|
||||
showZoneEventForm.value = true;
|
||||
};
|
||||
|
||||
const onZoneEventFormClose = () => {
|
||||
showZoneEventForm.value = false;
|
||||
zoneEventsFormProps.value = {};
|
||||
};
|
||||
|
||||
onUnmounted(() => (stateStore.rightDrawer = false));
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<template v-if="stateStore.isHeaderMounted()">
|
||||
<Teleport to="#actions-append">
|
||||
<div class="row q-gutter-x-sm">
|
||||
<QBtn
|
||||
flat
|
||||
@click="stateStore.toggleRightDrawer()"
|
||||
round
|
||||
dense
|
||||
icon="menu"
|
||||
>
|
||||
<QTooltip bottom anchor="bottom right">
|
||||
{{ t('globals.collapseMenu') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</div>
|
||||
</Teleport>
|
||||
</template>
|
||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||
<QScrollArea class="fit text-grey-8">
|
||||
<ZoneEventsPanel
|
||||
:first-day="firstDay"
|
||||
:last-day="lastDay"
|
||||
:events="events"
|
||||
v-model:formModeName="formModeName"
|
||||
@open-zone-form="openForm"
|
||||
/>
|
||||
</QScrollArea>
|
||||
</QDrawer>
|
||||
<QPage class="q-pa-md flex justify-center">
|
||||
<ZoneCalendarGrid
|
||||
v-model:events="events"
|
||||
v-model:firstDay="firstDay"
|
||||
v-model:lastDay="lastDay"
|
||||
data-key="ZoneEvents"
|
||||
@on-date-selected="openForm"
|
||||
/>
|
||||
<QDialog v-model="showZoneEventForm" @hide="onZoneEventFormClose()">
|
||||
<ZoneEventInclusionForm
|
||||
v-if="formModeName === 'include'"
|
||||
v-bind="zoneEventsFormProps"
|
||||
@close-form="onZoneEventFormClose()"
|
||||
/>
|
||||
<ZoneEventExclusionForm
|
||||
v-else
|
||||
v-bind="zoneEventsFormProps"
|
||||
@close-form="onZoneEventFormClose()"
|
||||
/>
|
||||
</QDialog>
|
||||
<QPageSticky :offset="[20, 20]">
|
||||
<QBtn
|
||||
@click="
|
||||
openForm({
|
||||
isNewMode: true,
|
||||
})
|
||||
"
|
||||
color="primary"
|
||||
fab
|
||||
icon="add"
|
||||
/>
|
||||
<QTooltip class="text-no-wrap">
|
||||
{{ t('eventsInclusionForm.addEvent') }}
|
||||
</QTooltip>
|
||||
</QPageSticky>
|
||||
</QPage>
|
||||
</template>
|
|
@ -0,0 +1,221 @@
|
|||
<script setup>
|
||||
import { onMounted, watch, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import axios from 'axios';
|
||||
import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
|
||||
import { dashOrCurrency } from 'filters/index';
|
||||
import { dashIfEmpty } from 'src/filters';
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
|
||||
const props = defineProps({
|
||||
firstDay: {
|
||||
type: Date,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
lastDay: {
|
||||
type: Date,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
events: {
|
||||
type: Array,
|
||||
required: true,
|
||||
default: () => [],
|
||||
},
|
||||
formModeName: {
|
||||
type: String,
|
||||
required: true,
|
||||
default: 'include',
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['openZoneForm', 'update:formModeName']);
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
||||
const formName = computed({
|
||||
get: () => props.formModeName,
|
||||
set: (value) => emit('update:formModeName', value),
|
||||
});
|
||||
|
||||
const params = computed(() => ({
|
||||
zoneFk: route.params.id,
|
||||
started: props.firstDay,
|
||||
ended: props.lastDay,
|
||||
}));
|
||||
const arrayData = useArrayData('ZoneEvents', {
|
||||
params: params,
|
||||
url: `Zones/getEventsFiltered`,
|
||||
});
|
||||
|
||||
const fetchData = async () => {
|
||||
try {
|
||||
if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
|
||||
|
||||
await arrayData.applyFilter({
|
||||
params: params.value,
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('Error fetching events: ', err);
|
||||
}
|
||||
};
|
||||
|
||||
watch(
|
||||
params,
|
||||
async () => {
|
||||
await fetchData();
|
||||
},
|
||||
{ immediate: true, deep: true }
|
||||
);
|
||||
|
||||
const formatWdays = (event) => {
|
||||
if (!event.weekDays) return;
|
||||
|
||||
let abrWdays = event.weekDays
|
||||
.split(',')
|
||||
.map((wday) => weekdayStore.getLocalesMap[wday].localeAbr);
|
||||
|
||||
return abrWdays.length < 7 ? abrWdays.join(', ') : t('eventsPanel.everyday');
|
||||
};
|
||||
|
||||
const deleteEvent = async (id) => {
|
||||
try {
|
||||
if (!id) return;
|
||||
await axios.delete(`Zones/${route.params.id}/events/${id}`);
|
||||
await fetchData();
|
||||
} catch (err) {
|
||||
console.error('Error deleting event: ', err);
|
||||
}
|
||||
};
|
||||
|
||||
const openInclusionForm = (event) => {
|
||||
formName.value = 'include';
|
||||
emit('openZoneForm', {
|
||||
date: event.dated,
|
||||
event,
|
||||
isNewMode: false,
|
||||
eventType: 'event',
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
weekdayStore.initStore();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QForm @submit="onSubmit()">
|
||||
<div class="column q-pa-md q-gutter-y-sm">
|
||||
<span class="color-vn-label text-subtitle1">{{
|
||||
t('eventsPanel.editMode')
|
||||
}}</span>
|
||||
<QRadio
|
||||
v-model="formName"
|
||||
dense
|
||||
val="include"
|
||||
:label="t('eventsPanel.include')"
|
||||
/>
|
||||
<QRadio
|
||||
v-model="formName"
|
||||
dense
|
||||
val="exclude"
|
||||
:label="t('eventsPanel.exclude')"
|
||||
class="q-mb-sm"
|
||||
/>
|
||||
</div>
|
||||
<span class="color-vn-label text-subtitle1 q-px-md">{{
|
||||
t('eventsPanel.events')
|
||||
}}</span>
|
||||
<QList>
|
||||
<QItem v-for="(event, index) in events" :key="index" class="event-card">
|
||||
<QItemSection left @click="openInclusionForm(event)">
|
||||
<div v-if="event.type == 'day'" class="q-mb-xs">
|
||||
{{ toDateFormat(event.dated) }}
|
||||
</div>
|
||||
<div v-if="event.type != 'day'" class="q-mb-xs">
|
||||
<span v-if="event.weekDays">
|
||||
{{ formatWdays(event) }}
|
||||
</span>
|
||||
<span v-if="event.type == 'range'">
|
||||
({{ toDateFormat(event.started) }} -
|
||||
{{ toDateFormat(event.ended) }})
|
||||
</span>
|
||||
</div>
|
||||
<span class="color-vn-label">
|
||||
{{ t('eventsPanel.closing') }}:
|
||||
<span class="color-vn-text q-ml-xs">
|
||||
{{ dashIfEmpty(toTimeFormat(event.hour)) }}
|
||||
</span>
|
||||
</span>
|
||||
<span class="color-vn-label">
|
||||
{{ t('eventsPanel.travelingDays') }}:
|
||||
<span class="color-vn-text">
|
||||
{{ dashIfEmpty(event.travelingDays) }}
|
||||
</span>
|
||||
</span>
|
||||
<span class="color-vn-label">
|
||||
{{ t('eventsPanel.price') }}:
|
||||
<span class="color-vn-text">
|
||||
{{ dashOrCurrency(event.price)() }}</span
|
||||
>
|
||||
</span>
|
||||
<span class="color-vn-label">
|
||||
{{ t('eventsPanel.bonus') }}:
|
||||
<span class="color-vn-text">
|
||||
{{ dashOrCurrency(event.bonus)() }}</span
|
||||
>
|
||||
</span>
|
||||
<span class="color-vn-label">
|
||||
{{ t('eventsPanel.m3Max') }}:
|
||||
<span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
|
||||
</span>
|
||||
</QItemSection>
|
||||
<QItemSection side @click="openInclusionForm(event)">
|
||||
<QBtn
|
||||
icon="delete"
|
||||
flat
|
||||
dense
|
||||
size="md"
|
||||
color="primary"
|
||||
@click.stop="
|
||||
openConfirmationModal(
|
||||
t('eventsPanel.deleteTitle'),
|
||||
t('eventsPanel.deleteSubtitle'),
|
||||
() => deleteEvent(event.id)
|
||||
)
|
||||
"
|
||||
>
|
||||
<QTooltip>{{ t('eventsPanel.delete') }}</QTooltip>
|
||||
</QBtn>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<span
|
||||
v-if="!events.length"
|
||||
class="flex justify-center text-h5 color-vn-label"
|
||||
>
|
||||
{{ t('globals.noResults') }}
|
||||
</span>
|
||||
</QList>
|
||||
</QForm>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.event-card {
|
||||
display: flex;
|
||||
border-bottom: $border-thin-light;
|
||||
margin: 0;
|
||||
|
||||
&:hover {
|
||||
background-color: var(--vn-accent-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
</style>
|
|
@ -24,7 +24,8 @@ const onSelected = async (val, node) => {
|
|||
<QPage class="column items-center q-pa-md">
|
||||
<QCard class="full-width q-pa-md" style="max-width: 800px">
|
||||
<ZoneLocationsTree :root-label="t('zoneLocations.locations')">
|
||||
<template #checkbox="{ node }">
|
||||
<template #content="{ node }">
|
||||
<span v-if="!node.id">{{ node.name }}</span>
|
||||
<QCheckbox
|
||||
v-if="node.id"
|
||||
v-model="node.selected"
|
||||
|
|
|
@ -1,12 +1,34 @@
|
|||
<script setup>
|
||||
import { onMounted, ref, computed, watch } from 'vue';
|
||||
import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import { useState } from 'src/composables/useState';
|
||||
import axios from 'axios';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import { onUnmounted } from 'vue';
|
||||
|
||||
const props = defineProps({
|
||||
rootLabel: {
|
||||
type: String,
|
||||
default: 'Locations',
|
||||
},
|
||||
tickedNodes: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
showSearchBar: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
showDefaultCheckboxes: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['update:tickedNodes']);
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
|
@ -22,9 +44,21 @@ const { store } = arrayData;
|
|||
const storeData = computed(() => store.data);
|
||||
|
||||
const nodes = ref([
|
||||
{ id: null, name: t('zoneLocations.locations'), sons: true, childs: [{}] },
|
||||
{
|
||||
id: null,
|
||||
name: props.rootLabel,
|
||||
sons: true,
|
||||
tickable: false,
|
||||
noTick: true,
|
||||
children: [{}],
|
||||
},
|
||||
]);
|
||||
|
||||
const _tickedNodes = computed({
|
||||
get: () => props.tickedNodes,
|
||||
set: (value) => emit('update:tickedNodes', value),
|
||||
});
|
||||
|
||||
const previousExpandedNodes = ref(new Set());
|
||||
|
||||
const onNodeExpanded = async (nodeKeysArray) => {
|
||||
|
@ -107,17 +141,19 @@ watch(storeData, async (val) => {
|
|||
formatNodeSelected(n);
|
||||
});
|
||||
} else {
|
||||
for (let n of state.get('Tree')) {
|
||||
await fetchNodeLeaves(n);
|
||||
}
|
||||
for (let n of state.get('Tree')) await fetchNodeLeaves(n);
|
||||
expanded.value = [null, ...fetchedNodeKeys];
|
||||
}
|
||||
previousExpandedNodes.value = new Set(expanded.value);
|
||||
});
|
||||
|
||||
onMounted(async () => {
|
||||
if (store.userParams?.search) {
|
||||
const reFetch = async () => {
|
||||
await arrayData.fetch({ append: false });
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
if (store.userParams?.search && !props.showSearchBar) {
|
||||
await reFetch();
|
||||
return;
|
||||
}
|
||||
const stateTree = state.get('Tree');
|
||||
|
@ -140,6 +176,7 @@ onMounted(async () => {
|
|||
}
|
||||
}, 1000);
|
||||
|
||||
expanded.value.unshift(null);
|
||||
previousExpandedNodes.value = new Set(expanded.value);
|
||||
});
|
||||
|
||||
|
@ -149,14 +186,26 @@ onUnmounted(() => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<VnInput
|
||||
v-if="showSearchBar"
|
||||
v-model="store.userParams.search"
|
||||
:placeholder="t('globals.search')"
|
||||
@keydown.enter.prevent="reFetch()"
|
||||
>
|
||||
<template #prepend>
|
||||
<QIcon class="cursor-pointer" name="search" />
|
||||
</template>
|
||||
</VnInput>
|
||||
<QTree
|
||||
ref="treeRef"
|
||||
:nodes="nodes"
|
||||
node-key="id"
|
||||
label-key="name"
|
||||
children-key="childs"
|
||||
:tick-strategy="props.showDefaultCheckboxes ? 'strict' : 'none'"
|
||||
v-model:expanded="expanded"
|
||||
@update:expanded="onNodeExpanded($event)"
|
||||
v-model:ticked="_tickedNodes"
|
||||
:default-expand-all="true"
|
||||
>
|
||||
<template #default-header="{ node }">
|
||||
|
@ -164,8 +213,7 @@ onUnmounted(() => {
|
|||
:id="node.id"
|
||||
class="qtr row justify-between full-width q-pr-md cursor-pointer"
|
||||
>
|
||||
<span v-if="!node.id">{{ node.name }}</span>
|
||||
<slot name="checkbox" :node="node" />
|
||||
<slot name="content" :node="node" />
|
||||
</div>
|
||||
</template>
|
||||
</QTree>
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
import { ref, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { date } from 'quasar';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import ZoneClosingTable from './ZoneClosingTable.vue';
|
||||
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
|
||||
|
@ -38,7 +39,10 @@ const props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onDateSelected']);
|
||||
|
||||
const { locale } = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
const calendarRef = ref(null);
|
||||
const weekdayStore = useWeekdayStore();
|
||||
|
@ -52,7 +56,11 @@ const todayTimestamp = computed(() => {
|
|||
});
|
||||
const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
|
||||
|
||||
const isZoneDeliveryView = computed(() => route.name === 'ZoneDeliveryDays');
|
||||
|
||||
const onEventSelection = async ({ year, month, day }) => {
|
||||
if (!isZoneDeliveryView.value) return;
|
||||
|
||||
const date = new Date(year, month - 1, day);
|
||||
const stamp = date.getTime();
|
||||
const events = props.daysMap[stamp];
|
||||
|
@ -81,6 +89,13 @@ const getEventByTimestamp = ({ year, month, day }) => {
|
|||
);
|
||||
};
|
||||
|
||||
const getEventType = ({ year, month, day }) => {
|
||||
const stamp = new Date(year, month - 1, day).getTime();
|
||||
if (props.exclusions[stamp]) return 'exclusion';
|
||||
if (props.geoExclusions[stamp]) return 'geoExclusion';
|
||||
return 'event';
|
||||
};
|
||||
|
||||
const getEventAttrs = ({ year, month, day }) => {
|
||||
const stamp = new Date(year, month - 1, day).getTime();
|
||||
|
||||
|
@ -104,6 +119,28 @@ const isToday = (timestamp) => {
|
|||
const calendarHeaderTitle = computed(() => {
|
||||
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
|
||||
});
|
||||
|
||||
const handleDateClick = (timestamp) => {
|
||||
if (isZoneDeliveryView.value) return;
|
||||
|
||||
const event = getEventByTimestamp(timestamp);
|
||||
const { year, month, day } = timestamp;
|
||||
const date = new Date(year, month - 1, day);
|
||||
const stamp = date.getTime();
|
||||
const eventType = getEventType(timestamp);
|
||||
|
||||
let geoIds = [];
|
||||
if (eventType === 'geoExclusion')
|
||||
geoIds = props.geoExclusions[stamp].map((geoExclusion) => geoExclusion.geoFk);
|
||||
|
||||
emit('onDateSelected', {
|
||||
date,
|
||||
isNewMode: !event,
|
||||
event: event && event.length > 0 ? event[0] : null,
|
||||
eventType,
|
||||
geoIds,
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -128,6 +165,7 @@ const calendarHeaderTitle = computed(() => {
|
|||
short-weekday-label
|
||||
:locale="locale"
|
||||
:now="today"
|
||||
@click-date="handleDateClick($event.scope.timestamp)"
|
||||
mini-mode
|
||||
>
|
||||
<template #day="{ scope: { timestamp } }">
|
||||
|
@ -135,7 +173,11 @@ const calendarHeaderTitle = computed(() => {
|
|||
<QBtn
|
||||
v-if="getEventByTimestamp(timestamp)"
|
||||
v-bind="{ ...getEventAttrs(timestamp) }"
|
||||
@click="onEventSelection(timestamp)"
|
||||
@click="
|
||||
isZoneDeliveryView
|
||||
? onEventSelection(timestamp)
|
||||
: handleDateClick(timestamp)
|
||||
"
|
||||
rounded
|
||||
dense
|
||||
flat
|
||||
|
@ -144,7 +186,7 @@ const calendarHeaderTitle = computed(() => {
|
|||
'--today': isToday(timestamp),
|
||||
}"
|
||||
>
|
||||
<QPopupProxy>
|
||||
<QPopupProxy v-if="isZoneDeliveryView">
|
||||
<ZoneClosingTable
|
||||
v-if="zoneClosingData && zoneClosingData.length"
|
||||
:rows="zoneClosingData"
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue