@@ -20,4 +20,4 @@ const props = defineProps(['width', 'height', 'skeleton', 'isSkeleton', 'skeleto
\ No newline at end of file
+
diff --git a/src/components/displays/statistics/StatisticsOptions.vue b/src/components/displays/statistics/StatisticsOptions.vue
index 6aa266c9..13a15a7e 100644
--- a/src/components/displays/statistics/StatisticsOptions.vue
+++ b/src/components/displays/statistics/StatisticsOptions.vue
@@ -1,5 +1,5 @@
diff --git a/src/components/displays/superuser/configuration/ConfigurationInputNumber.vue b/src/components/displays/superuser/configuration/ConfigurationInputNumber.vue
index 74c57935..daffaae4 100644
--- a/src/components/displays/superuser/configuration/ConfigurationInputNumber.vue
+++ b/src/components/displays/superuser/configuration/ConfigurationInputNumber.vue
@@ -1,6 +1,6 @@
diff --git a/src/components/displays/superuser/configuration/ConfigurationSecretKey.vue b/src/components/displays/superuser/configuration/ConfigurationSecretKey.vue
index a3a9a277..86dadd8c 100644
--- a/src/components/displays/superuser/configuration/ConfigurationSecretKey.vue
+++ b/src/components/displays/superuser/configuration/ConfigurationSecretKey.vue
@@ -4,7 +4,7 @@ import { parseError, getError } from "@/components/request/HandleGlobalError.vue
const props = defineProps({
onSave: Function, // Function to call when the secret key is changed
- value: String|Number, // The value of the secret key
+ value: [String, Number], // The value of the secret key
title: String, // The label of the select
disabled: Boolean, // If the select is disabled
description: String, // The description of the select
@@ -81,4 +81,4 @@ const parseErrorOnSave = (error) => {
\ No newline at end of file
+
diff --git a/src/components/displays/superuser/configuration/ConfigurationSelect.vue b/src/components/displays/superuser/configuration/ConfigurationSelect.vue
index ba635044..24714057 100644
--- a/src/components/displays/superuser/configuration/ConfigurationSelect.vue
+++ b/src/components/displays/superuser/configuration/ConfigurationSelect.vue
@@ -3,7 +3,7 @@
const props = defineProps({
onSelect: Function, // Function to call when the select is changed
- value: String|Number, // The value of the selected option
+ value: [String, Number], // The value of the selected option
label: String, // The label of the select
disabled: Boolean, // If the select is disabled
description: String, // The description of the select
@@ -34,7 +34,7 @@ const onSelect = (value) => {
@@ -68,4 +68,4 @@ const onSelect = (value) => {
\ No newline at end of file
+
diff --git a/src/components/displays/superuser/system/SystemStatusDashboard.vue b/src/components/displays/superuser/system/SystemStatusDashboard.vue
index 705a25ec..be9e8632 100644
--- a/src/components/displays/superuser/system/SystemStatusDashboard.vue
+++ b/src/components/displays/superuser/system/SystemStatusDashboard.vue
@@ -572,8 +572,8 @@ function visibleModuleUsageMetrics(module) {
metric.source === "provider_snapshot"
)
.sort((left, right) => {
- if ((left.primary || false) !== (right.primary || false)) {
- return (right.primary || false) - (left.primary || false);
+ if (left.primary !== right.primary) {
+ return Number(right.primary) - Number(left.primary);
}
return moduleUsageLabel(left).localeCompare(moduleUsageLabel(right));
});
diff --git a/src/components/displays/superuser/tables/CustomerInvoicesTable.vue b/src/components/displays/superuser/tables/CustomerInvoicesTable.vue
index 5d50d358..81bfd266 100644
--- a/src/components/displays/superuser/tables/CustomerInvoicesTable.vue
+++ b/src/components/displays/superuser/tables/CustomerInvoicesTable.vue
@@ -4,9 +4,11 @@ import { useI18n } from 'vue-i18n';
const { t } = useI18n();
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
-import {getCustomerName} from "@/components/shop/POSDepartmentProcess.vue";
+
import {getDepartmentName, getDepartments} from "@/components/pagination/departmentTabs.vue";
+const getDepartmentNameForRow = (order, row) => getDepartmentName(order[row.key]);
+
const props = defineProps({
objects: {
type: Object,
@@ -24,9 +26,8 @@ const { loadList } = usePaginatedListInstance();
import { SessionUser } from "@/components/session/token/SessionUser.vue";
import ActionSettingsWheelButton from "@/components/displays/buttons/ActionSettingsWheelButton.vue";
import ActionSettingsWheelItem from "@/components/displays/buttons/ActionSettingsWheelItem.vue";
-import OrdersTable from "@/components/displays/department/pos/orders/ordersTable.vue";
-import UserOtherSpecialArrangement
- from "@/views/dashboards/superUserDashboard/user/displays/other/UserOtherSpecialArrangement.vue";
+import "@/components/displays/department/pos/orders/ordersTable.vue";
+import "@/views/dashboards/superUserDashboard/user/displays/other/UserOtherSpecialArrangement.vue";
import InvoiceOrderTable from "@/components/displays/superuser/tables/InvoiceOrderTable.vue";
const activeDropdowns = ref([]);
@@ -296,8 +297,8 @@ const getCustomerUserId = (object) => {
department_id: {
label: 'Afdeling',
visible: true,
- getRowValueFormatted: (order, row) => {
- return getDepartmentName(order[row.key]);
+ getRowValueFormatted: (order) => {
+ return getDepartmentNameForRow(order, row);
}
},
reg_1: { visible: true },
@@ -342,7 +343,7 @@ const getCustomerUserId = (object) => {
show_content: {
label: 'Vis',
visible: true,
- getRowValueFormatted: (order, row) => {
+ getRowValueFormatted: (order) => {
// Check if the order is already shown (or hidden)
if (order.show_content !== undefined && order.show_content) {
// Hide the order
@@ -352,26 +353,20 @@ const getCustomerUserId = (object) => {
return SessionUser.objects.global.language.show_content;
}
},
- buttonOnClick: (order, row) => {
+ buttonOnClick: (order) => {
// Check if the order is already shown (or hidden)
- if (order.show_content !== undefined && order.show_content) {
- // Hide the order
- order.show_content = false;
- } else {
- // Show the order
- order.show_content = true;
- }
+ order.show_content = !order.show_content;
},
isButton: true
},
manage: {
label: SessionUser.objects.global.language.manage,
visible: true,
- getRowValueFormatted: (order, row) => {
+ getRowValueFormatted: () => {
// Open the order in a new tab
return SessionUser.objects.global.language.manage;
},
- buttonOnClick: (order, row) => {
+ buttonOnClick: (order) => {
// Open the order in a new tab
redirect('/admin/' + order.department_id + '/modules/pos/orders/' + order.id);
},
@@ -402,4 +397,4 @@ const getCustomerUserId = (object) => {
\ No newline at end of file
+
diff --git a/src/components/displays/superuser/tables/InvoiceOrderTable.vue b/src/components/displays/superuser/tables/InvoiceOrderTable.vue
index ff3ed956..665253af 100644
--- a/src/components/displays/superuser/tables/InvoiceOrderTable.vue
+++ b/src/components/displays/superuser/tables/InvoiceOrderTable.vue
@@ -1,7 +1,7 @@
diff --git a/src/components/displays/superuser/tables/OpenCustomerInvoiceTable.vue b/src/components/displays/superuser/tables/OpenCustomerInvoiceTable.vue
index 09a100a1..5fcb7035 100644
--- a/src/components/displays/superuser/tables/OpenCustomerInvoiceTable.vue
+++ b/src/components/displays/superuser/tables/OpenCustomerInvoiceTable.vue
@@ -4,28 +4,23 @@ import { useI18n } from 'vue-i18n';
const { t } = useI18n();
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
-import {getCustomerName} from "@/components/shop/POSDepartmentProcess.vue";
+
import {getDepartmentName, getDepartments} from "@/components/pagination/departmentTabs.vue";
-const props = defineProps({
- objects: {
- type: Object,
- required: true
- },
- loadList: {
- type: Function,
- required: true
- }
+const getDepartmentNameForRow = (order, row) => getDepartmentName(order[row.key]);
+
+defineProps({
+ objects: { type: Object, required: true },
});
+
import { ref } from 'vue';
import { usePaginatedListInstance } from "@/components/pagination/paginatedList.vue";
const { loadList } = usePaginatedListInstance();
import { SessionUser } from "@/components/session/token/SessionUser.vue";
import ActionSettingsWheelButton from "@/components/displays/buttons/ActionSettingsWheelButton.vue";
import ActionSettingsWheelItem from "@/components/displays/buttons/ActionSettingsWheelItem.vue";
-import OrdersTable from "@/components/displays/department/pos/orders/ordersTable.vue";
-import UserOtherSpecialArrangement
- from "@/views/dashboards/superUserDashboard/user/displays/other/UserOtherSpecialArrangement.vue";
+import "@/components/displays/department/pos/orders/ordersTable.vue";
+import "@/views/dashboards/superUserDashboard/user/displays/other/UserOtherSpecialArrangement.vue";
import InvoiceOrderTable from "@/components/displays/superuser/tables/InvoiceOrderTable.vue";
const activeDropdowns = ref([]);
@@ -145,8 +140,8 @@ getDepartments();
department_id: {
label: 'Afdeling',
visible: true,
- getRowValueFormatted: (order, row) => {
- return getDepartmentName(order[row.key]);
+ getRowValueFormatted: (order) => {
+ return getDepartmentNameForRow(order, row);
}
},
reg_1: { visible: true },
@@ -180,7 +175,7 @@ getDepartments();
show_content: {
label: 'Vis',
visible: true,
- getRowValueFormatted: (order, row) => {
+ getRowValueFormatted: (order) => {
// Check if the order is already shown (or hidden)
if (order.show_content !== undefined && order.show_content) {
// Hide the order
@@ -190,15 +185,9 @@ getDepartments();
return SessionUser.objects.global.language.show_content;
}
},
- buttonOnClick: (order, row) => {
+ buttonOnClick: (order) => {
// Check if the order is already shown (or hidden)
- if (order.show_content !== undefined && order.show_content) {
- // Hide the order
- order.show_content = false;
- } else {
- // Show the order
- order.show_content = true;
- }
+ order.show_content = !order.show_content;
},
isButton: true
}
@@ -224,4 +213,4 @@ getDepartments();
\ No newline at end of file
+
diff --git a/src/components/displays/superuser/tables/OrderContentTable.vue b/src/components/displays/superuser/tables/OrderContentTable.vue
index d42b0590..115c9e13 100644
--- a/src/components/displays/superuser/tables/OrderContentTable.vue
+++ b/src/components/displays/superuser/tables/OrderContentTable.vue
@@ -1,7 +1,7 @@
diff --git a/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue b/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue
index 6799063c..4750d22a 100644
--- a/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue
+++ b/src/components/displays/superuser/tables/collectedOrderInvoiceOrdersTable.vue
@@ -4,10 +4,10 @@ import { useI18n } from 'vue-i18n';
const { t } = useI18n();
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
-import {getCustomerName} from "@/components/shop/POSDepartmentProcess.vue";
+
defineProps(['objects']);
-import { ref } from 'vue';
+
import { usePaginatedListInstance } from "@/components/pagination/paginatedList.vue";
const { loadList } = usePaginatedListInstance();
import { SessionUser } from "@/components/session/token/SessionUser.vue";
diff --git a/src/components/displays/superuser/tables/customersTable.vue b/src/components/displays/superuser/tables/customersTable.vue
index c843ff73..eafc2d13 100644
--- a/src/components/displays/superuser/tables/customersTable.vue
+++ b/src/components/displays/superuser/tables/customersTable.vue
@@ -1,13 +1,13 @@
@@ -36,7 +34,7 @@ const redirect = (path) => {
:object="category"
:loadList="loadList"
column="id"
- :parse-function="(value) => category.category.name"
+ :parse-function="() => category.category.name"
/>
{
\ No newline at end of file
+
diff --git a/src/components/displays/superuser/tables/numberPlateScannersTable.vue b/src/components/displays/superuser/tables/numberPlateScannersTable.vue
index 4ce03d75..2a031c99 100644
--- a/src/components/displays/superuser/tables/numberPlateScannersTable.vue
+++ b/src/components/displays/superuser/tables/numberPlateScannersTable.vue
@@ -1,20 +1,20 @@
\ No newline at end of file
+
diff --git a/src/components/displays/user/bookings/bookingsTable.vue b/src/components/displays/user/bookings/bookingsTable.vue
index 7dcb2a30..9dacc9de 100644
--- a/src/components/displays/user/bookings/bookingsTable.vue
+++ b/src/components/displays/user/bookings/bookingsTable.vue
@@ -1,35 +1,29 @@
diff --git a/src/components/displays/user/vehicles/SelectVehicleField.vue b/src/components/displays/user/vehicles/SelectVehicleField.vue
index 2738f0d6..6bf28d15 100644
--- a/src/components/displays/user/vehicles/SelectVehicleField.vue
+++ b/src/components/displays/user/vehicles/SelectVehicleField.vue
@@ -1,7 +1,7 @@
diff --git a/src/components/forms/BuefyDateField.vue b/src/components/forms/BuefyDateField.vue
index 1677a66b..51811dd5 100644
--- a/src/components/forms/BuefyDateField.vue
+++ b/src/components/forms/BuefyDateField.vue
@@ -90,7 +90,7 @@ const selectedDate = computed({
get: () => normalizeDatepickerDate(props.modelValue),
set: (value) => {
const normalized = normalizeDatepickerDate(value);
- let nextValue = "";
+ let nextValue;
if (props.valueType === "date") {
nextValue = normalized;
diff --git a/src/components/forms/BuefyMonthField.vue b/src/components/forms/BuefyMonthField.vue
index 2d5d66d7..dc99d668 100644
--- a/src/components/forms/BuefyMonthField.vue
+++ b/src/components/forms/BuefyMonthField.vue
@@ -86,7 +86,7 @@ const selectedMonth = computed({
get: () => normalizeDatepickerMonth(props.modelValue),
set: (value) => {
const normalized = normalizeDatepickerMonth(value);
- let nextValue = "";
+ let nextValue;
if (props.valueType === "date") {
nextValue = normalized;
diff --git a/src/components/forms/auth/LoginEmployeeForm.vue b/src/components/forms/auth/LoginEmployeeForm.vue
index 68760221..528a7ba3 100644
--- a/src/components/forms/auth/LoginEmployeeForm.vue
+++ b/src/components/forms/auth/LoginEmployeeForm.vue
@@ -1,11 +1,11 @@
\ No newline at end of file
+
diff --git a/src/components/forms/other/functions/selectParseFile.vue b/src/components/forms/other/functions/selectParseFile.vue
index a54a8512..8600e38f 100644
--- a/src/components/forms/other/functions/selectParseFile.vue
+++ b/src/components/forms/other/functions/selectParseFile.vue
@@ -180,11 +180,10 @@ const parseDelimitedFileContent = (content) => {
.filter((row) => row.trim() !== '');
const delimiter = detectDelimiter(rows);
- const parsedData = rows
+ parsedFileContent.value = rows
.map((row) => parseDelimitedRow(row, delimiter))
.filter((row) => row.some((column) => column !== ''));
- parsedFileContent.value = parsedData;
onParsed(onParsedFunctionCache.value);
};
@@ -201,7 +200,7 @@ const parseSpreadsheetContent = (content) => {
}
const worksheet = workbook.Sheets[firstSheetName];
- const parsedData = XLSX.utils.sheet_to_json(worksheet, {
+ parsedFileContent.value = XLSX.utils.sheet_to_json(worksheet, {
header: 1,
blankrows: false,
defval: '',
@@ -210,7 +209,6 @@ const parseSpreadsheetContent = (content) => {
.map((row) => (Array.isArray(row) ? row.map((column) => String(column ?? '').trim()) : []))
.filter((row) => row.some((column) => column !== ''));
- parsedFileContent.value = parsedData;
onParsed(onParsedFunctionCache.value);
};
diff --git a/src/components/forms/other/structures/VehicleDataStructure.vue b/src/components/forms/other/structures/VehicleDataStructure.vue
index 15d04f75..3ebf5f0a 100644
--- a/src/components/forms/other/structures/VehicleDataStructure.vue
+++ b/src/components/forms/other/structures/VehicleDataStructure.vue
@@ -4,8 +4,8 @@ import { generateNewColumn} from "@/components/forms/other/functions/manageDataC
import { columnTypes } from "@/components/forms/other/types/dataColumnsType.vue";
import { applyColumnProperties } from "@/components/forms/other/types/dataColumn.vue";
import { SessionUser } from "@/components/session/token/SessionUser.vue";
-import {getCustomerName} from "@/components/shop/POSDepartmentProcess.vue";
-import {watch} from "vue";
+
+
export const exampleRows = [
{
diff --git a/src/components/forms/other/types/dataColumn.vue b/src/components/forms/other/types/dataColumn.vue
index 0a5a7299..6061b7fe 100644
--- a/src/components/forms/other/types/dataColumn.vue
+++ b/src/components/forms/other/types/dataColumn.vue
@@ -1,5 +1,4 @@
\ No newline at end of file
+
diff --git a/src/components/forms/other/types/dataColumnsType.vue b/src/components/forms/other/types/dataColumnsType.vue
index 402ae86c..0c900f04 100644
--- a/src/components/forms/other/types/dataColumnsType.vue
+++ b/src/components/forms/other/types/dataColumnsType.vue
@@ -1,5 +1,4 @@
\ No newline at end of file
+
diff --git a/src/components/forms/superUser/createDepartmentForm.vue b/src/components/forms/superUser/createDepartmentForm.vue
index aae7f206..ba521917 100644
--- a/src/components/forms/superUser/createDepartmentForm.vue
+++ b/src/components/forms/superUser/createDepartmentForm.vue
@@ -1,5 +1,5 @@
diff --git a/src/components/global/ShowErrorField.vue b/src/components/global/ShowErrorField.vue
index 9e0a94e1..94e54141 100644
--- a/src/components/global/ShowErrorField.vue
+++ b/src/components/global/ShowErrorField.vue
@@ -1,23 +1,12 @@
@@ -42,4 +31,4 @@ const props = defineProps({
\ No newline at end of file
+
diff --git a/src/components/global/VersionCheck.vue b/src/components/global/VersionCheck.vue
index 8865aaf0..a4d0c5c2 100644
--- a/src/components/global/VersionCheck.vue
+++ b/src/components/global/VersionCheck.vue
@@ -91,9 +91,6 @@ onMounted(() => {
});
-
-
-
\ No newline at end of file
+
diff --git a/src/components/menus/MenuDefault.vue b/src/components/menus/MenuDefault.vue
index 712deb88..35b82d59 100644
--- a/src/components/menus/MenuDefault.vue
+++ b/src/components/menus/MenuDefault.vue
@@ -18,7 +18,7 @@ const props = defineProps({
const route = useRoute()
-const menu_items = ref([
+const menuItems = ref([
{
name: 'Overblik',
route: '/admin',
@@ -108,7 +108,7 @@ const menu_items = ref([
children: []
}
],
- hidden: 1 === null
+ hidden: false
},
{
name: 'Transactions',
@@ -146,12 +146,12 @@ const isItemVisible = (item = null) => {
// Check if the "Hidden" property is a function
if (typeof item.hidden === 'function') {
console.log('Hidden is a function');
- result = !item.hidden() ?? true;
+ result = !item.hidden();
} else {
- result = !item.hidden ?? true;
+ result = !item.hidden;
}
}
- } catch (e) {}
+ } catch {}
// Check if the user has the required permissions
if (result && item.permissions !== undefined) {
result = item.permissions.some(permission => SessionUser.hasPermission(permission));
@@ -176,7 +176,7 @@ const getSelectedOptionLabel = (item) => {
// If the menu items are passed as props, use them instead
if (props.menu_items.length > 0) {
- menu_items.value = props.menu_items
+ menuItems.value = props.menu_items
}
// Check if the domain starts with jp-demo.truckwash.dk
@@ -202,7 +202,7 @@ const isDemo = false;