Merge branch 'dev' into 7949-TicketModifications
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
This commit is contained in:
commit
2907d8a9d9
|
@ -94,7 +94,7 @@ pipeline {
|
||||||
parallel {
|
parallel {
|
||||||
stage('Unit') {
|
stage('Unit') {
|
||||||
steps {
|
steps {
|
||||||
sh 'pnpm run test:unit:ci'
|
sh 'pnpm run test:front:ci'
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
|
|
|
@ -23,7 +23,7 @@ quasar dev
|
||||||
### Run unit tests
|
### Run unit tests
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pnpm run test:unit
|
pnpm run test:front
|
||||||
```
|
```
|
||||||
|
|
||||||
### Run e2e tests
|
### Run e2e tests
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
"test:e2e": "cypress open",
|
"test:e2e": "cypress open",
|
||||||
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
||||||
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
||||||
"test:unit": "vitest",
|
"test:front": "vitest",
|
||||||
"test:unit:ci": "vitest run",
|
"test:front:ci": "vitest run",
|
||||||
"commitlint": "commitlint --edit",
|
"commitlint": "commitlint --edit",
|
||||||
"prepare": "npx husky install",
|
"prepare": "npx husky install",
|
||||||
"addReferenceTag": "node .husky/addReferenceTag.js",
|
"addReferenceTag": "node .husky/addReferenceTag.js",
|
||||||
|
|
|
@ -681,6 +681,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
@selection="(details) => handleSelection(details, rows)"
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
:hide-selected-banner="true"
|
:hide-selected-banner="true"
|
||||||
|
:data-cy="$props.dataCy ?? 'vnTable'"
|
||||||
>
|
>
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
<slot name="top-left"> </slot>
|
<slot name="top-left"> </slot>
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeMount } from 'vue';
|
import { onBeforeMount } from 'vue';
|
||||||
import { useRouter, onBeforeRouteUpdate } from 'vue-router';
|
import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import useCardSize from 'src/composables/useCardSize';
|
import useCardSize from 'src/composables/useCardSize';
|
||||||
import LeftMenu from 'components/LeftMenu.vue';
|
|
||||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -27,7 +26,13 @@ const arrayData = useArrayData(props.dataKey, {
|
||||||
oneRecord: true,
|
oneRecord: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
onBeforeRouteLeave(() => {
|
||||||
|
stateStore.cardDescriptorChangeValue(null);
|
||||||
|
});
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
|
stateStore.cardDescriptorChangeValue(props.descriptor);
|
||||||
|
|
||||||
const route = router.currentRoute.value;
|
const route = router.currentRoute.value;
|
||||||
try {
|
try {
|
||||||
await fetch(route.params.id);
|
await fetch(route.params.id);
|
||||||
|
@ -62,11 +67,6 @@ function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
|
|
||||||
<component :is="descriptor" />
|
|
||||||
<QSeparator />
|
|
||||||
<LeftMenu source="card" />
|
|
||||||
</Teleport>
|
|
||||||
<VnSubToolbar />
|
<VnSubToolbar />
|
||||||
<div :class="[useCardSize(), $attrs.class]">
|
<div :class="[useCardSize(), $attrs.class]">
|
||||||
<RouterView :key="$route.path" />
|
<RouterView :key="$route.path" />
|
||||||
|
|
|
@ -641,15 +641,7 @@ watch(
|
||||||
>
|
>
|
||||||
{{ prop.nameI18n }}:
|
{{ prop.nameI18n }}:
|
||||||
</span>
|
</span>
|
||||||
<VnJsonValue :value="prop.val.val" />
|
|
||||||
<span
|
|
||||||
v-if="prop.val.id"
|
|
||||||
class="id-value"
|
|
||||||
>
|
|
||||||
#{{ prop.val.id }}
|
|
||||||
</span>
|
|
||||||
<span v-if="log.action == 'update'">
|
<span v-if="log.action == 'update'">
|
||||||
←
|
|
||||||
<VnJsonValue
|
<VnJsonValue
|
||||||
:value="prop.old.val"
|
:value="prop.old.val"
|
||||||
/>
|
/>
|
||||||
|
@ -659,6 +651,26 @@ watch(
|
||||||
>
|
>
|
||||||
#{{ prop.old.id }}
|
#{{ prop.old.id }}
|
||||||
</span>
|
</span>
|
||||||
|
→
|
||||||
|
<VnJsonValue
|
||||||
|
:value="prop.val.val"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
v-if="prop.val.id"
|
||||||
|
class="id-value"
|
||||||
|
>
|
||||||
|
#{{ prop.val.id }}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span v-else="prop.old.val">
|
||||||
|
<VnJsonValue
|
||||||
|
:value="prop.val.val"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
v-if="prop.old.id"
|
||||||
|
class="id-value"
|
||||||
|
>#{{ prop.old.id }}</span
|
||||||
|
>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -12,7 +12,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
onMounted(
|
onMounted(
|
||||||
() => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
|
() => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false),
|
||||||
);
|
);
|
||||||
|
|
||||||
const teleportRef = ref({});
|
const teleportRef = ref({});
|
||||||
|
@ -35,8 +35,14 @@ onMounted(() => {
|
||||||
<template>
|
<template>
|
||||||
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
|
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<div id="left-panel" ref="teleportRef"></div>
|
<div id="left-panel" ref="teleportRef">
|
||||||
<LeftMenu v-if="!hasContent" />
|
<template v-if="stateStore.cardDescriptor">
|
||||||
|
<component :is="stateStore.cardDescriptor" />
|
||||||
|
<QSeparator />
|
||||||
|
<LeftMenu source="card" />
|
||||||
|
</template>
|
||||||
|
<template v-else> <LeftMenu /></template>
|
||||||
|
</div>
|
||||||
</QScrollArea>
|
</QScrollArea>
|
||||||
</QDrawer>
|
</QDrawer>
|
||||||
<QPageContainer>
|
<QPageContainer>
|
||||||
|
|
|
@ -325,7 +325,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-max">
|
<QCard class="vn-max">
|
||||||
<VnTitle :text="t('Latest tickets')" />
|
<VnTitle :text="t('Latest tickets')" />
|
||||||
<CustomerSummaryTable />
|
<CustomerSummaryTable :id="entityId" />
|
||||||
</QCard>
|
</QCard>
|
||||||
</template>
|
</template>
|
||||||
</CardSummary>
|
</CardSummary>
|
||||||
|
|
|
@ -20,7 +20,12 @@ const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { viewSummary } = useSummaryDialog();
|
const { viewSummary } = useSummaryDialog();
|
||||||
|
const $props = defineProps({
|
||||||
|
id: {
|
||||||
|
type: Number,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
const filter = {
|
const filter = {
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
|
@ -43,7 +48,7 @@ const filter = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
where: { clientFk: route.params.id },
|
where: { clientFk: $props.id ?? route.params.id },
|
||||||
order: ['shipped DESC', 'id'],
|
order: ['shipped DESC', 'id'],
|
||||||
limit: 30,
|
limit: 30,
|
||||||
};
|
};
|
||||||
|
|
|
@ -62,9 +62,10 @@ const columns = [
|
||||||
name: 'workerFk',
|
name: 'workerFk',
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'Workers/search',
|
url: 'TicketRequests/getItemTypeWorker',
|
||||||
fields: ['id', 'nickname'],
|
fields: ['id', 'nickname'],
|
||||||
optionLabel: 'nickname',
|
optionLabel: 'nickname',
|
||||||
|
sortBy: 'nickname ASC',
|
||||||
optionValue: 'id',
|
optionValue: 'id',
|
||||||
},
|
},
|
||||||
visible: false,
|
visible: false,
|
||||||
|
@ -655,7 +656,6 @@ onMounted(() => {
|
||||||
:without-header="!editableMode"
|
:without-header="!editableMode"
|
||||||
:with-filters="editableMode"
|
:with-filters="editableMode"
|
||||||
:right-search="editableMode"
|
:right-search="editableMode"
|
||||||
:right-search-icon="true"
|
|
||||||
:row-click="false"
|
:row-click="false"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:beforeSaveFn="beforeSave"
|
:beforeSaveFn="beforeSave"
|
||||||
|
|
|
@ -248,7 +248,7 @@ const entryFilterPanel = ref();
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
params:
|
params:
|
||||||
isExcludedFromAvailable: Inventory
|
isExcludedFromAvailable: Is excluded
|
||||||
isOrdered: Ordered
|
isOrdered: Ordered
|
||||||
isReceived: Received
|
isReceived: Received
|
||||||
isConfirmed: Confirmed
|
isConfirmed: Confirmed
|
||||||
|
|
|
@ -19,6 +19,7 @@ const { t } = useI18n();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
const user = state.getUser();
|
const user = state.getUser();
|
||||||
|
const footer = ref({ bought: 0, reserve: 0 });
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -38,16 +39,14 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
create: true,
|
create: true,
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'Workers/activeWithInheritedRole',
|
url: 'TicketRequests/getItemTypeWorker',
|
||||||
fields: ['id', 'name', 'nickname'],
|
fields: ['id', 'nickname'],
|
||||||
where: { role: 'buyer' },
|
|
||||||
optionFilter: 'firstName',
|
|
||||||
optionLabel: 'nickname',
|
optionLabel: 'nickname',
|
||||||
|
sortBy: 'nickname ASC',
|
||||||
optionValue: 'id',
|
optionValue: 'id',
|
||||||
useLike: false,
|
|
||||||
},
|
},
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
width: '70px',
|
width: '50px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
@ -58,6 +57,7 @@ const columns = computed(() => [
|
||||||
component: 'number',
|
component: 'number',
|
||||||
summation: true,
|
summation: true,
|
||||||
width: '50px',
|
width: '50px',
|
||||||
|
format: ({ reserve }, dashIfEmpty) => dashIfEmpty(round(reserve)),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
@ -65,6 +65,7 @@ const columns = computed(() => [
|
||||||
name: 'bought',
|
name: 'bought',
|
||||||
summation: true,
|
summation: true,
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
|
style: ({ reserve, bought }) => boughtStyle(bought, reserve),
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -95,7 +96,6 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
dataCy: 'table-actions',
|
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -137,20 +137,20 @@ function openDialog() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function setFooter(data) {
|
function setFooter(data) {
|
||||||
const footer = {
|
footer.value = { bought: 0, reserve: 0 };
|
||||||
bought: 0,
|
|
||||||
reserve: 0,
|
|
||||||
};
|
|
||||||
data.forEach((row) => {
|
data.forEach((row) => {
|
||||||
footer.bought += row?.bought;
|
footer.value.bought += row?.bought;
|
||||||
footer.reserve += row?.reserve;
|
footer.value.reserve += row?.reserve;
|
||||||
});
|
});
|
||||||
tableRef.value.footer = footer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function round(value) {
|
function round(value) {
|
||||||
return Math.round(value * 100) / 100;
|
return Math.round(value * 100) / 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function boughtStyle(bought, reserve) {
|
||||||
|
return reserve < bought ? { color: 'var(--q-negative)' } : '';
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnSubToolbar>
|
<VnSubToolbar>
|
||||||
|
@ -253,24 +253,14 @@ function round(value) {
|
||||||
<WorkerDescriptorProxy :id="row?.workerFk" />
|
<WorkerDescriptorProxy :id="row?.workerFk" />
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-bought="{ row }">
|
|
||||||
<span :class="{ 'text-negative': row.reserve < row.bought }">
|
|
||||||
{{ row?.bought }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
<template #column-footer-reserve>
|
<template #column-footer-reserve>
|
||||||
<span>
|
<span>
|
||||||
{{ round(tableRef.footer.reserve) }}
|
{{ round(footer.reserve) }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-footer-bought>
|
<template #column-footer-bought>
|
||||||
<span
|
<span :style="boughtStyle(footer?.bought, footer?.reserve)">
|
||||||
:class="{
|
{{ round(footer.bought) }}
|
||||||
'text-negative':
|
|
||||||
tableRef.footer.reserve < tableRef.footer.bought,
|
|
||||||
}"
|
|
||||||
>
|
|
||||||
{{ round(tableRef.footer.bought) }}
|
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</VnTable>
|
</VnTable>
|
||||||
|
@ -286,7 +276,7 @@ function round(value) {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
.column {
|
.column {
|
||||||
min-width: 40%;
|
min-width: 35%;
|
||||||
margin-top: 5%;
|
margin-top: 5%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|
|
@ -14,7 +14,7 @@ const $props = defineProps({
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
dated: {
|
dated: {
|
||||||
type: Date,
|
type: [Date, String],
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -12,7 +12,7 @@ import FetchData from 'components/FetchData.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
|
|
||||||
import { toDateFormat } from 'src/filters/date.js';
|
import { toDateTimeFormat } from 'src/filters/date.js';
|
||||||
import { dashIfEmpty } from 'src/filters';
|
import { dashIfEmpty } from 'src/filters';
|
||||||
import { date } from 'quasar';
|
import { date } from 'quasar';
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
|
@ -143,7 +143,12 @@ onMounted(async () => {
|
||||||
const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
|
const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
|
||||||
|
|
||||||
const getBadgeAttrs = (_date) => {
|
const getBadgeAttrs = (_date) => {
|
||||||
const isSameDate = date.isSameDate(today, _date);
|
let today = Date.vnNew();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
let timeTicket = new Date(_date);
|
||||||
|
timeTicket.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
const isSameDate = date.isSameDate(today, timeTicket);
|
||||||
const attrs = {
|
const attrs = {
|
||||||
'text-color': isSameDate ? 'black' : 'white',
|
'text-color': isSameDate ? 'black' : 'white',
|
||||||
color: isSameDate ? 'warning' : 'transparent',
|
color: isSameDate ? 'warning' : 'transparent',
|
||||||
|
@ -244,7 +249,7 @@ async function updateWarehouse(warehouseFk) {
|
||||||
dense
|
dense
|
||||||
style="font-size: 14px"
|
style="font-size: 14px"
|
||||||
>
|
>
|
||||||
{{ toDateFormat(row.shipped) }}
|
{{ toDateTimeFormat(row.shipped) }}
|
||||||
</QBadge>
|
</QBadge>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -11,7 +11,6 @@ import { toCurrency } from 'filters/index';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
|
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const from = ref();
|
const from = ref();
|
||||||
|
@ -41,7 +40,7 @@ const itemLastEntries = ref([]);
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{
|
{
|
||||||
label: 'Nv',
|
label: 'NV',
|
||||||
name: 'ig',
|
name: 'ig',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
},
|
},
|
||||||
|
@ -70,6 +69,7 @@ const columns = computed(() => [
|
||||||
field: 'reference',
|
field: 'reference',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3),
|
format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3),
|
||||||
|
style: (row) => highlightedRow(row),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('lastEntries.printedStickers'),
|
label: t('lastEntries.printedStickers'),
|
||||||
|
@ -84,6 +84,7 @@ const columns = computed(() => [
|
||||||
field: 'stickers',
|
field: 'stickers',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
format: (val) => dashIfEmpty(val),
|
format: (val) => dashIfEmpty(val),
|
||||||
|
style: (row) => highlightedRow(row),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Packing',
|
label: 'Packing',
|
||||||
|
@ -102,12 +103,14 @@ const columns = computed(() => [
|
||||||
name: 'stems',
|
name: 'stems',
|
||||||
field: 'stems',
|
field: 'stems',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
style: (row) => highlightedRow(row),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('lastEntries.quantity'),
|
label: t('lastEntries.quantity'),
|
||||||
name: 'quantity',
|
name: 'quantity',
|
||||||
field: 'quantity',
|
field: 'quantity',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
style: (row) => highlightedRow(row),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('lastEntries.cost'),
|
label: t('lastEntries.cost'),
|
||||||
|
@ -120,12 +123,14 @@ const columns = computed(() => [
|
||||||
name: 'weight',
|
name: 'weight',
|
||||||
field: 'weight',
|
field: 'weight',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
style: (row) => highlightedRow(row),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('lastEntries.cube'),
|
label: t('lastEntries.cube'),
|
||||||
name: 'cube',
|
name: 'cube',
|
||||||
field: 'packagingFk',
|
field: 'packagingFk',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
style: (row) => highlightedRow(row),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('lastEntries.supplier'),
|
label: t('lastEntries.supplier'),
|
||||||
|
@ -208,6 +213,14 @@ onMounted(async () => {
|
||||||
function getBadgeClass(groupingMode, expectedGrouping) {
|
function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
return groupingMode === expectedGrouping ? 'accent-badge' : 'simple-badge';
|
return groupingMode === expectedGrouping ? 'accent-badge' : 'simple-badge';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function highlightedRow(row) {
|
||||||
|
return row?.isInventorySupplier
|
||||||
|
? {
|
||||||
|
'background-color': 'var(--vn-section-hover-color)',
|
||||||
|
}
|
||||||
|
: '';
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnSubToolbar>
|
<VnSubToolbar>
|
||||||
|
@ -236,7 +249,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
:no-data-label="t('globals.noResults')"
|
:no-data-label="t('globals.noResults')"
|
||||||
>
|
>
|
||||||
<template #body-cell-ig="{ row }">
|
<template #body-cell-ig="{ row }">
|
||||||
<QTd class="text-center">
|
<QTd class="text-center" :style="highlightedRow(row)">
|
||||||
<QIcon
|
<QIcon
|
||||||
:name="row.isIgnored ? 'check_box' : 'check_box_outline_blank'"
|
:name="row.isIgnored ? 'check_box' : 'check_box_outline_blank'"
|
||||||
style="color: var(--vn-label-color)"
|
style="color: var(--vn-label-color)"
|
||||||
|
@ -245,38 +258,38 @@ function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-warehouse="{ row }">
|
<template #body-cell-warehouse="{ row }">
|
||||||
<QTd>
|
<QTd :style="highlightedRow(row)">
|
||||||
<span>{{ row.warehouse }}</span>
|
<span>{{ row.warehouse }}</span>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-date="{ row }">
|
<template #body-cell-date="{ row }">
|
||||||
<QTd class="text-center">
|
<QTd class="text-center" :style="highlightedRow(row)">
|
||||||
<VnDateBadge :date="row.landed" />
|
<VnDateBadge :date="row.landed" />
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-entry="{ row }">
|
<template #body-cell-entry="{ row }">
|
||||||
<QTd @click.stop>
|
<QTd @click.stop :style="highlightedRow(row)">
|
||||||
<div class="full-width flex justify-center">
|
<div class="full-width flex justify-center">
|
||||||
<EntryDescriptorProxy :id="row.entryFk" class="q-ma-none" dense />
|
<EntryDescriptorProxy :id="row.entryFk" class="q-ma-none" dense />
|
||||||
<span class="link">{{ row.entryFk }}</span>
|
<span class="link">{{ row.entryFk }}</span>
|
||||||
</div>
|
</div>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-pvp="{ value }">
|
<template #body-cell-pvp="{ row, value }">
|
||||||
<QTd @click.stop class="text-center">
|
<QTd @click.stop class="text-center" :style="highlightedRow(row)">
|
||||||
<span> {{ value }}</span>
|
<span> {{ value }}</span>
|
||||||
<QTooltip> {{ t('lastEntries.grouping') }}/Packing </QTooltip></QTd
|
<QTooltip> {{ t('lastEntries.grouping') }}/Packing </QTooltip>
|
||||||
>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-printedStickers="{ row }">
|
<template #body-cell-printedStickers="{ row }">
|
||||||
<QTd @click.stop class="text-center">
|
<QTd @click.stop class="text-center" :style="highlightedRow(row)">
|
||||||
<span style="color: var(--vn-label-color)">
|
<span style="color: var(--vn-label-color)">
|
||||||
{{ row.printedStickers }}</span
|
{{ row.printedStickers }}</span
|
||||||
>
|
>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-packing="{ row }">
|
<template #body-cell-packing="{ row }">
|
||||||
<QTd @click.stop>
|
<QTd @click.stop :style="highlightedRow(row)">
|
||||||
<QBadge
|
<QBadge
|
||||||
class="center-content"
|
class="center-content"
|
||||||
:class="getBadgeClass(row.groupingMode, 'packing')"
|
:class="getBadgeClass(row.groupingMode, 'packing')"
|
||||||
|
@ -288,7 +301,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-grouping="{ row }">
|
<template #body-cell-grouping="{ row }">
|
||||||
<QTd @click.stop>
|
<QTd @click.stop :style="highlightedRow(row)">
|
||||||
<QBadge
|
<QBadge
|
||||||
class="center-content"
|
class="center-content"
|
||||||
:class="getBadgeClass(row.groupingMode, 'grouping')"
|
:class="getBadgeClass(row.groupingMode, 'grouping')"
|
||||||
|
@ -300,7 +313,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-cost="{ row }">
|
<template #body-cell-cost="{ row }">
|
||||||
<QTd @click.stop class="text-center">
|
<QTd @click.stop class="text-center" :style="highlightedRow(row)">
|
||||||
<span>
|
<span>
|
||||||
{{ toCurrency(row.cost, 'EUR', 3) }}
|
{{ toCurrency(row.cost, 'EUR', 3) }}
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
|
@ -319,7 +332,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-supplier="{ row }">
|
<template #body-cell-supplier="{ row }">
|
||||||
<QTd @click.stop>
|
<QTd @click.stop :style="highlightedRow(row)">
|
||||||
<div class="full-width flex justify-left">
|
<div class="full-width flex justify-left">
|
||||||
<QBadge
|
<QBadge
|
||||||
:class="
|
:class="
|
||||||
|
@ -354,7 +367,6 @@ function getBadgeClass(groupingMode, expectedGrouping) {
|
||||||
.th :first-child {
|
.th :first-child {
|
||||||
.td {
|
.td {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background-color: red;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.accent-badge {
|
.accent-badge {
|
||||||
|
|
|
@ -10,6 +10,7 @@ import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
|
||||||
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
|
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
|
import { onUnmounted } from 'vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
@ -23,16 +24,40 @@ const catalogParams = {
|
||||||
const arrayData = useArrayData(dataKey, {
|
const arrayData = useArrayData(dataKey, {
|
||||||
url: 'Orders/CatalogFilter',
|
url: 'Orders/CatalogFilter',
|
||||||
userParams: catalogParams,
|
userParams: catalogParams,
|
||||||
|
exprBuilder,
|
||||||
|
searchUrl: 'table',
|
||||||
});
|
});
|
||||||
const store = arrayData.store;
|
const store = arrayData.store;
|
||||||
const tags = ref([]);
|
const tags = ref([]);
|
||||||
const itemRefs = ref({});
|
const itemRefs = ref({});
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(async () => {
|
||||||
stateStore.rightDrawer = true;
|
stateStore.rightDrawer = true;
|
||||||
checkOrderConfirmation();
|
checkOrderConfirmation();
|
||||||
|
|
||||||
|
if (
|
||||||
|
arrayData.store.userParams &&
|
||||||
|
Object.keys(arrayData.store.userParams).some((key) => !key.startsWith('order'))
|
||||||
|
) {
|
||||||
|
await arrayData.fetch({});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
arrayData.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
function exprBuilder(param, value) {
|
||||||
|
switch (param) {
|
||||||
|
case 'categoryFk':
|
||||||
|
case 'typeFk':
|
||||||
|
return { [param]: value };
|
||||||
|
case 'search':
|
||||||
|
if (/^\d+$/.test(value)) return { 'i.id': value };
|
||||||
|
else return { 'i.name': { like: `%${value}%` } };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function checkOrderConfirmation() {
|
async function checkOrderConfirmation() {
|
||||||
const response = await axios.get(`Orders/${route.params.id}`);
|
const response = await axios.get(`Orders/${route.params.id}`);
|
||||||
if (response.data.isConfirmed === 1) {
|
if (response.data.isConfirmed === 1) {
|
||||||
|
@ -96,6 +121,7 @@ watch(
|
||||||
:tag-value="tagValue"
|
:tag-value="tagValue"
|
||||||
:tags="tags"
|
:tags="tags"
|
||||||
:initial-catalog-params="catalogParams"
|
:initial-catalog-params="catalogParams"
|
||||||
|
:arrayData
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</RightMenu>
|
</RightMenu>
|
||||||
|
|
|
@ -24,6 +24,10 @@ const props = defineProps({
|
||||||
type: Array,
|
type: Array,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
arrayData: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -74,17 +78,6 @@ const loadTypes = async (id) => {
|
||||||
typeList.value = data;
|
typeList.value = data;
|
||||||
};
|
};
|
||||||
|
|
||||||
function exprBuilder(param, value) {
|
|
||||||
switch (param) {
|
|
||||||
case 'categoryFk':
|
|
||||||
case 'typeFk':
|
|
||||||
return { [param]: value };
|
|
||||||
case 'search':
|
|
||||||
if (/^\d+$/.test(value)) return { 'i.id': value };
|
|
||||||
else return { 'i.name': { like: `%${value}%` } };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const applyTags = (tagInfo, params, search) => {
|
const applyTags = (tagInfo, params, search) => {
|
||||||
if (!tagInfo || !tagInfo.values.length) {
|
if (!tagInfo || !tagInfo.values.length) {
|
||||||
params.tagGroups = null;
|
params.tagGroups = null;
|
||||||
|
@ -152,9 +145,8 @@ function addOrder(value, field, params) {
|
||||||
:data-key="props.dataKey"
|
:data-key="props.dataKey"
|
||||||
:hidden-tags="['filter', 'orderFk', 'orderBy']"
|
:hidden-tags="['filter', 'orderFk', 'orderBy']"
|
||||||
:unremovable-params="['orderFk', 'orderBy']"
|
:unremovable-params="['orderFk', 'orderBy']"
|
||||||
:expr-builder="exprBuilder"
|
|
||||||
:custom-tags="['tagGroups', 'categoryFk']"
|
:custom-tags="['tagGroups', 'categoryFk']"
|
||||||
:redirect="false"
|
:arrayData
|
||||||
>
|
>
|
||||||
<template #tags="{ tag, formatFn }">
|
<template #tags="{ tag, formatFn }">
|
||||||
<strong v-if="tag.label === 'typeFk' && typeList">
|
<strong v-if="tag.label === 'typeFk' && typeList">
|
||||||
|
|
|
@ -22,7 +22,12 @@ const links = {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<CardSummary data-key="Vehicle" :url="`Vehicles/${entityId}`" :filter="VehicleFilter">
|
<CardSummary
|
||||||
|
data-key="Vehicle"
|
||||||
|
:url="`Vehicles/${entityId}`"
|
||||||
|
module-name="Vehicle"
|
||||||
|
:filter="VehicleFilter"
|
||||||
|
>
|
||||||
<template #header="{ entity }">
|
<template #header="{ entity }">
|
||||||
<div>{{ entity.id }} - {{ entity.numberPlate }}</div>
|
<div>{{ entity.id }} - {{ entity.numberPlate }}</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -456,6 +456,7 @@ watch(
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
:pagination="{ rowsPerPage: 0 }"
|
||||||
:no-data-label="t('globals.noResults')"
|
:no-data-label="t('globals.noResults')"
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
|
:order="['futureTotalWithVat ASC']"
|
||||||
auto-load
|
auto-load
|
||||||
:disable-option="{ card: true }"
|
:disable-option="{ card: true }"
|
||||||
>
|
>
|
||||||
|
|
|
@ -79,7 +79,7 @@ const editEvent = async (event) => {
|
||||||
};
|
};
|
||||||
const { data } = await axios.patch(
|
const { data } = await axios.patch(
|
||||||
`Workers/${route.params.id}/updateAbsence`,
|
`Workers/${route.params.id}/updateAbsence`,
|
||||||
params
|
params,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (data) emit('refresh');
|
if (data) emit('refresh');
|
||||||
|
@ -108,14 +108,14 @@ const handleDateSelected = (date) => {
|
||||||
if (!event) createEvent(_date);
|
if (!event) createEvent(_date);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleEventSelected = (event, { year, month, day }) => {
|
const handleEventSelected = async (event, { year, month, day }) => {
|
||||||
if (!props.absenceType) {
|
if (!props.absenceType) {
|
||||||
notify(t('Choose an absence type from the right menu'), 'warning');
|
notify(t('Choose an absence type from the right menu'), 'warning');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const date = new Date(year, month - 1, day);
|
const date = new Date(year, month - 1, day);
|
||||||
if (!event?.absenceId) createEvent(date);
|
if (!event?.absenceId) await createEvent(date);
|
||||||
else if (event.type == props.absenceType.code) deleteEvent(event, date);
|
else if (event.type == props.absenceType.code) deleteEvent(event, date);
|
||||||
else editEvent(event);
|
else editEvent(event);
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,7 +7,11 @@ export const useStateStore = defineStore('stateStore', () => {
|
||||||
const rightDrawer = ref(false);
|
const rightDrawer = ref(false);
|
||||||
const rightAdvancedDrawer = ref(false);
|
const rightAdvancedDrawer = ref(false);
|
||||||
const subToolbar = ref(false);
|
const subToolbar = ref(false);
|
||||||
|
const cardDescriptor = ref(null);
|
||||||
|
|
||||||
|
function cardDescriptorChangeValue(descriptor) {
|
||||||
|
cardDescriptor.value = descriptor;
|
||||||
|
}
|
||||||
function toggleLeftDrawer() {
|
function toggleLeftDrawer() {
|
||||||
leftDrawer.value = !leftDrawer.value;
|
leftDrawer.value = !leftDrawer.value;
|
||||||
}
|
}
|
||||||
|
@ -49,6 +53,8 @@ export const useStateStore = defineStore('stateStore', () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
cardDescriptor,
|
||||||
|
cardDescriptorChangeValue,
|
||||||
leftDrawer,
|
leftDrawer,
|
||||||
rightDrawer,
|
rightDrawer,
|
||||||
rightAdvancedDrawer,
|
rightAdvancedDrawer,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
describe.skip('Entry', () => {
|
describe('Entry', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.viewport(1920, 1080);
|
cy.viewport(1920, 1080);
|
||||||
cy.login('buyer');
|
cy.login('buyer');
|
||||||
|
|
|
@ -16,9 +16,9 @@ describe('EntryStockBought', () => {
|
||||||
cy.get('input[aria-label="Reserve"]').type('1');
|
cy.get('input[aria-label="Reserve"]').type('1');
|
||||||
cy.get('input[aria-label="Date"]').eq(1).clear();
|
cy.get('input[aria-label="Date"]').eq(1).clear();
|
||||||
cy.get('input[aria-label="Date"]').eq(1).type('01-01');
|
cy.get('input[aria-label="Date"]').eq(1).type('01-01');
|
||||||
cy.get('input[aria-label="Buyer"]').type('buyerBossNick');
|
cy.get('input[aria-label="Buyer"]').type('itNick');
|
||||||
cy.get('div[role="listbox"] > div > div[role="option"]')
|
cy.get('div[role="listbox"] > div > div[role="option"]')
|
||||||
.eq(0)
|
.eq(1)
|
||||||
.should('be.visible')
|
.should('be.visible')
|
||||||
.click();
|
.click();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
describe('Vehicle list', () => {
|
||||||
|
const selectors = {
|
||||||
|
saveFormBtn: 'FormModelPopup_save',
|
||||||
|
summaryPopupBtn: 'tr:last-child > .q-table--col-auto-width > .q-btn',
|
||||||
|
summaryGoToSummaryBtn: '.header > .q-icon',
|
||||||
|
summaryHeader: '.summaryHeader > div',
|
||||||
|
numberPlate: 'tr:last-child > [data-col-field="numberPlate"] > .no-padding',
|
||||||
|
};
|
||||||
|
|
||||||
|
const data = {
|
||||||
|
'Nº Plate': { val: '9465-LPA' },
|
||||||
|
'Trade Mark': { val: 'WAYNE INDUSTRIES' },
|
||||||
|
Model: { val: 'BATREMOLQUE' },
|
||||||
|
Type: { val: 'remolque', type: 'select' },
|
||||||
|
Warehouse: { val: 'Warehouse One', type: 'select' },
|
||||||
|
Country: { val: 'Portugal', type: 'select' },
|
||||||
|
Description: { val: 'Exclusive for batpod transport' },
|
||||||
|
};
|
||||||
|
|
||||||
|
const expected = data['Nº Plate'].val;
|
||||||
|
const summaryUrl = '/summary';
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
cy.viewport(1920, 1080);
|
||||||
|
cy.login('developer');
|
||||||
|
cy.visit(`/#/route/vehicle/list`);
|
||||||
|
cy.typeSearchbar('{enter}');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should list vehicles', () => {
|
||||||
|
cy.get('.q-table')
|
||||||
|
.children()
|
||||||
|
.should('be.visible')
|
||||||
|
.should('have.length.greaterThan', 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should add new vehicle', () => {
|
||||||
|
cy.addBtnClick();
|
||||||
|
cy.fillInForm(data);
|
||||||
|
cy.dataCy(selectors.saveFormBtn).should('be.visible').click();
|
||||||
|
|
||||||
|
cy.checkNotification('Data created');
|
||||||
|
cy.get(selectors.summaryHeader).should('contain', expected);
|
||||||
|
cy.url().should('include', summaryUrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should open summary by clicking a vehicle', () => {
|
||||||
|
cy.get(selectors.numberPlate).click();
|
||||||
|
cy.get(selectors.summaryHeader).should('contain', expected);
|
||||||
|
cy.url().should('include', summaryUrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should redirect to vehicle summary when click summary icon on summary pop-up', () => {
|
||||||
|
cy.get(selectors.summaryPopupBtn).click();
|
||||||
|
cy.get(selectors.summaryHeader).should('contain', expected);
|
||||||
|
cy.get(selectors.summaryGoToSummaryBtn).click();
|
||||||
|
cy.url().should('include', summaryUrl);
|
||||||
|
});
|
||||||
|
});
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe.skip('TicketList', () => {
|
describe('TicketList', () => {
|
||||||
const firstRow = 'tbody > :nth-child(1)';
|
const firstRow = 'tbody > :nth-child(1)';
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
|
Loading…
Reference in New Issue