diff --git a/src/components/displays/boxes/ElementTabsBox.vue b/src/components/displays/boxes/ElementTabsBox.vue new file mode 100644 index 00000000..58fe5755 --- /dev/null +++ b/src/components/displays/boxes/ElementTabsBox.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/src/components/displays/department/pos/steps/PosDepartmentStep2.vue b/src/components/displays/department/pos/steps/PosDepartmentStep2.vue index bf70a1b8..25d2fd49 100644 --- a/src/components/displays/department/pos/steps/PosDepartmentStep2.vue +++ b/src/components/displays/department/pos/steps/PosDepartmentStep2.vue @@ -36,7 +36,7 @@ setProductsCategory(null);
diff --git a/src/components/displays/department/pos/steps/PosDepartmentStep3.vue b/src/components/displays/department/pos/steps/PosDepartmentStep3.vue index 6ed3ed2d..6fcb8ddf 100644 --- a/src/components/displays/department/pos/steps/PosDepartmentStep3.vue +++ b/src/components/displays/department/pos/steps/PosDepartmentStep3.vue @@ -36,7 +36,7 @@ import ButtonsBox from "@/components/displays/boxes/ButtonsBox.vue"; diff --git a/src/components/menus/MenuDefault.vue b/src/components/menus/MenuDefault.vue index cfa5f6c2..6d4ea05b 100644 --- a/src/components/menus/MenuDefault.vue +++ b/src/components/menus/MenuDefault.vue @@ -106,7 +106,8 @@ const menu_items = ref([ icon: 'fas fa-key', children: [] } - ] + ], + hidden: 1 === null }, { name: 'Transactions', @@ -123,7 +124,8 @@ const menu_items = ref([ name: 'Transfers', route: '/transfers', icon: 'fas fa-exchange-alt', - children: [] + children: [], + hidden: true }, { name: 'Balance', @@ -135,6 +137,20 @@ const menu_items = ref([ } ]); +const isItemVisible = (item = null) => { + // If the hidden property is not set, the item is visible + try { + if (item.hidden === undefined) { + return true; + } + } catch (e) { + return true; + } + // If the hidden property is set to true, the item is not visible + return !item.hidden; + +} + // If the menu items are passed as props, use them instead if (props.menu_items.length > 0) { menu_items.value = props.menu_items @@ -170,6 +186,7 @@ if (props.menu_items.length > 0) { ? Colors.menus.activeBackgroundColor : Colors.menus.backgroundColor } " + v-if="isItemVisible(item)" @click="(item.options) ? item.isExpanded = !item.isExpanded : null" > @@ -210,7 +227,9 @@ if (props.menu_items.length > 0) {
  • + :style="{ 'color': Colors.menus.childTextColor, 'background-color': Colors.menus.childBackgroundColor }" + v-if="isItemVisible(child)" + > {{ child.name }} diff --git a/src/components/menus/admin/AdminLeftMenu.vue b/src/components/menus/admin/AdminLeftMenu.vue index b609db36..14129929 100644 --- a/src/components/menus/admin/AdminLeftMenu.vue +++ b/src/components/menus/admin/AdminLeftMenu.vue @@ -73,21 +73,25 @@ const menu_items = ref([ name: 'Opret ny', route: '/admin/' + SessionUser.functions.getDepartmentIdFromUrl() + '/modules/pos', icon: 'fas fa-plus', - children: [] + children: [], + hidden: (SessionUser.functions.getDepartmentIdFromUrl() === undefined) }, { name: 'Transaktioner', route: '/admin/' + SessionUser.functions.getDepartmentIdFromUrl() + '/modules/pos/orders', icon: 'fas fa-exchange-alt', - children: [] + children: [], + hidden: (SessionUser.functions.getDepartmentIdFromUrl() === undefined) }, - ] + ], + hidden: (SessionUser.functions.getDepartmentIdFromUrl() === undefined) }, { name: 'Bookinger', route: '/admin/' + SessionUser.functions.getDepartmentIdFromUrl() + '/modules/bookings', icon: 'fas fa-exchange-alt', - children: [] + children: [], + hidden: (SessionUser.functions.getDepartmentIdFromUrl() === undefined) } ]); diff --git a/src/views/dashboards/DepartmentDashboard.vue b/src/views/dashboards/DepartmentDashboard.vue index 16f716ad..e86d75c0 100644 --- a/src/views/dashboards/DepartmentDashboard.vue +++ b/src/views/dashboards/DepartmentDashboard.vue @@ -6,6 +6,11 @@ import DepartmentDashboardHero from "@/views/dashboards/departmentDashboard/Depa import DepartmentModulesDisplay from "@/components/displays/department/moduleNavigation/DepartmentModulesDisplay.vue"; import RestrictedPageWrapper from "@/components/page/wrappers/RestrictedPageWrapper.vue"; import { SessionUser } from "@/components/session/token/SessionUser.vue"; +import DepartmentDashboardMyDepartmentsOverview + from "@/views/dashboards/departmentDashboard/other/DepartmentDashboardMyDepartmentsOverview.vue"; +import DepartmentDashboardPageWrapper from "@/views/dashboards/departmentDashboard/DepartmentDashboardPageWrapper.vue"; +import DepartmentDashboardOverview + from "@/views/dashboards/departmentDashboard/modules/overview/DepartmentDashboardOverview.vue"; const router = useRouter(); @@ -24,12 +29,8 @@ watch(() => router.currentRoute.value.params.departmentId, (newVal) => { diff --git a/src/views/dashboards/departmentDashboard/DepartmentDashboardPageWrapper.vue b/src/views/dashboards/departmentDashboard/DepartmentDashboardPageWrapper.vue index 1308b3de..33fe430c 100644 --- a/src/views/dashboards/departmentDashboard/DepartmentDashboardPageWrapper.vue +++ b/src/views/dashboards/departmentDashboard/DepartmentDashboardPageWrapper.vue @@ -12,7 +12,7 @@ defineProps({ subtitle: String }) -defineSlots() +const slots = defineSlots() diff --git a/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPos.vue b/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPos.vue index 57f307d6..b21238e9 100644 --- a/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPos.vue +++ b/src/views/dashboards/departmentDashboard/modules/Pos/DepartmentPos.vue @@ -12,8 +12,6 @@ import PageTitle from "@/components/global/PageTitle.vue";