diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue index 81058a6cb..bf6e0695e 100644 --- a/src/components/ui/VnSms.vue +++ b/src/components/ui/VnSms.vue @@ -1,5 +1,5 @@ <script setup> -import { watch, computed } from 'vue'; +import { computed } from 'vue'; import { date } from 'quasar'; import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnAvatar from '../ui/VnAvatar.vue'; diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue index fdb0ecee1..110358e7f 100644 --- a/src/pages/Account/AccountAcls.vue +++ b/src/pages/Account/AccountAcls.vue @@ -6,7 +6,6 @@ import axios from 'axios'; import useNotify from 'src/composables/useNotify.js'; import { useQuasar } from 'quasar'; -import FetchData from 'components/FetchData.vue'; import VnTable from 'components/VnTable/VnTable.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; import VnConfirm from 'components/ui/VnConfirm.vue'; @@ -24,7 +23,6 @@ const stateStore = useStateStore(); const quasar = useQuasar(); const tableRef = ref(); -const rolesOptions = ref([]); const exprBuilder = (param, value) => { switch (param) { diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue index f67cc0c6b..0e35d25f3 100644 --- a/src/pages/Account/Card/AccountDescriptorMenu.vue +++ b/src/pages/Account/Card/AccountDescriptorMenu.vue @@ -1,15 +1,12 @@ <script setup> import axios from 'axios'; import { computed, ref, toRefs } from 'vue'; -import { useQuasar } from 'quasar'; import { useI18n } from 'vue-i18n'; import { useVnConfirm } from 'composables/useVnConfirm'; import { useRoute } from 'vue-router'; import { useArrayData } from 'src/composables/useArrayData'; -import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue'; import VnConfirm from 'src/components/ui/VnConfirm.vue'; import useNotify from 'src/composables/useNotify.js'; -const quasar = useQuasar(); const $props = defineProps({ hasAccount: { type: Boolean, @@ -35,7 +32,7 @@ async function updateStatusAccount(active) { account.value.hasAccount = active; const status = active ? 'enable' : 'disable'; - quasar.notify({ + notify({ message: t(`account.card.${status}Account.success`), type: 'positive', }); @@ -44,19 +41,11 @@ async function updateStatusUser(active) { await axios.patch(`VnUsers/${entityId.value}`, { active }); account.value.active = active; const status = active ? 'activate' : 'deactivate'; - quasar.notify({ + notify({ message: t(`account.card.actions.${status}User.success`), type: 'positive', }); } -function setPassword() { - quasar.dialog({ - component: CustomerChangePassword, - componentProps: { - id: entityId.value, - }, - }); -} const showSyncDialog = ref(false); const syncPassword = ref(null); const shouldSyncPassword = ref(false); @@ -66,20 +55,11 @@ async function sync() { await axios.patch(`Accounts/${account.value.name}/sync`, { params, }); - quasar.notify({ + notify({ message: t('account.card.actions.sync.success'), type: 'positive', }); } - -const removeAccount = async () => { - try { - await axios.delete(`VnUsers/${account.value.id}`); - notify(t('Account removed'), 'positive'); - } catch (error) { - console.error('Error deleting user', error); - } -}; </script> <template> <VnConfirm @@ -112,24 +92,6 @@ const removeAccount = async () => { /> </template> </VnConfirm> - <!-- <QItem v-ripple clickable @click="setPassword"> - <QItemSection>{{ t('account.card.actions.setPassword') }}</QItemSection> - </QItem> - <QItem - v-if="!account.hasAccount" - v-ripple - clickable - @click=" - openConfirmationModal( - t('account.card.actions.enableAccount.title'), - t('account.card.actions.enableAccount.subtitle'), - () => updateStatusAccount(true) - ) - " - > - <QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection> - </QItem> --> - <QItem v-if="account.hasAccount" v-ripple @@ -178,10 +140,4 @@ const removeAccount = async () => { </QItem> <QSeparator /> - <!-- <QItem @click="removeAccount(id)" v-ripple clickable> - <QItemSection avatar> - <QIcon name="delete" /> - </QItemSection> - <QItemSection>{{ t('account.card.actions.delete.name') }}</QItemSection> - </QItem> --> </template> diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue index 2f80606b4..8f3372a6d 100644 --- a/src/pages/Account/Role/AccountRoles.vue +++ b/src/pages/Account/Role/AccountRoles.vue @@ -4,11 +4,9 @@ import { computed, ref } from 'vue'; import VnTable from 'components/VnTable/VnTable.vue'; import { useRoute } from 'vue-router'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; -import { useStateStore } from 'stores/useStateStore'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import RoleSummary from './Card/RoleSummary.vue'; const route = useRoute(); -const stateStore = useStateStore(); const { t } = useI18n(); const $props = defineProps({ id: { diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index d1a08b9c6..b03dfb226 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -78,6 +78,9 @@ const columns = computed(() => [ { align: 'left', label: t('claim.state'), + format: ({ stateCode }) => + claimFilterRef.value?.states.find(({code}) => code === stateCode) + ?.description, name: 'stateCode', chip: { condition: () => true, diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue index 98a3115da..4d3da1116 100644 --- a/src/pages/Customer/Card/CustomerConsumption.vue +++ b/src/pages/Customer/Card/CustomerConsumption.vue @@ -1,8 +1,6 @@ <script setup> -import { useI18n } from 'vue-i18n'; import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue'; import { useStateStore } from 'src/stores/useStateStore'; -const { t } = useI18n(); </script> <template> diff --git a/src/pages/Item/Card/ItemBasicData.vue b/src/pages/Item/Card/ItemBasicData.vue index 89c883295..ae9e45983 100644 --- a/src/pages/Item/Card/ItemBasicData.vue +++ b/src/pages/Item/Card/ItemBasicData.vue @@ -16,7 +16,6 @@ const route = useRoute(); const { t } = useI18n(); const itemTypesOptions = ref([]); -const itemsWithNameOptions = ref([]); const intrastatsOptions = ref([]); const expensesOptions = ref([]); diff --git a/src/pages/Monitor/SalesTicketsTable.vue b/src/pages/Monitor/SalesTicketsTable.vue index 1ca68240b..b301c1145 100644 --- a/src/pages/Monitor/SalesTicketsTable.vue +++ b/src/pages/Monitor/SalesTicketsTable.vue @@ -1,8 +1,6 @@ <script setup> -import { ref, computed, onMounted, reactive } from 'vue'; +import { ref, computed, reactive } from 'vue'; import { useI18n } from 'vue-i18n'; -import { useRouter } from 'vue-router'; - import FetchData from 'components/FetchData.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; @@ -11,18 +9,14 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue'; import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue'; import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue'; -import VnInput from 'src/components/common/VnInput.vue'; -import VnSelect from 'src/components/common/VnSelect.vue'; -import VnInputDate from 'src/components/common/VnInputDate.vue'; import VnTable from 'components/VnTable/VnTable.vue'; - import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { toDateFormat, toTimeFormat } from 'src/filters/date.js'; import { toCurrency, dateRange } from 'src/filters'; + const DEFAULT_AUTO_REFRESH = 1000; const { t } = useI18n(); const autoRefresh = ref(false); -const router = useRouter(); const paginateRef = ref(null); const workersActiveOptions = ref([]); const provincesOptions = ref([]); @@ -57,46 +51,6 @@ function exprBuilder(param, value) { const filter = { order: ['totalProblems DESC'] }; let params = reactive({}); -const applyColumnFilter = async (col) => { - try { - const paramKey = col.columnFilter?.filterParamKey || col.field; - params[paramKey] = col.columnFilter.filterValue; - await paginateRef.value.addFilter(null, params); - } catch (err) { - console.error('Error applying column filter', err); - } -}; - -const getInputEvents = (col) => { - return col.columnFilter.type === 'select' || col.columnFilter.type === 'date' - ? { 'update:modelValue': () => applyColumnFilter(col) } - : { - 'keyup.enter': () => applyColumnFilter(col), - }; -}; - -const fetchParams = ($params = {}) => { - const excludedParams = ['search', 'clientFk', 'orderFk', 'refFk', 'scopeDays']; - - const hasExcludedParams = excludedParams.some((param) => { - return $params && $params[param] != undefined; - }); - const hasParams = Object.entries($params).length; - if (!hasParams || !hasExcludedParams) $params.scopeDays = 1; - - if (typeof $params.scopeDays === 'number') { - const from = Date.vnNew(); - from.setHours(0, 0, 0, 0); - - const to = new Date(from.getTime()); - to.setDate(to.getDate() + $params.scopeDays); - to.setHours(23, 59, 59, 999); - - Object.assign($params, { from, to }); - } - return { tableOrder: 'totalProblems DESC', ...$params }; -}; - const columns = computed(() => [ { label: t('salesTicketsTable.problems'), @@ -379,13 +333,6 @@ const redirectToSales = (id) => { const url = `#/ticket/${id}/sale`; window.open(url, '_blank'); }; - -// onMounted(async () => { -// const filteredColumns = columns.value.filter((col) => col.name !== 'rowActions'); -// allColumnNames.value = filteredColumns.map((col) => col.name); -// params = fetchParams(); -// await paginateRef.value.addFilter(null, params); -// }); </script> <template> diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index cbc94b388..5978dbf09 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -11,7 +11,6 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import TicketEditManaProxy from './TicketEditMana.vue'; import VnImg from 'src/components/ui/VnImg.vue'; -import RightMenu from 'src/components/common/RightMenu.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import TicketSaleMoreActions from './TicketSaleMoreActions.vue'; import TicketTransfer from './TicketTransfer.vue'; diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue index 02ec12fe7..b81ee9039 100644 --- a/src/pages/Zone/Card/ZoneCard.vue +++ b/src/pages/Zone/Card/ZoneCard.vue @@ -10,11 +10,6 @@ const { t } = useI18n(); const route = useRoute(); const routeName = computed(() => route.name); -const customRouteRedirectName = computed(() => { - if (routeName.value === 'ZoneLocations') return null; - return routeName.value; -}); -const searchbarMakeFetch = computed(() => routeName.value !== 'ZoneEvents'); const searchBarDataKeys = { ZoneWarehouses: 'ZoneWarehouses', ZoneSummary: 'ZoneSummary',