fix: solve conflict after merge page-cleaning

app/composables/useRBAC.ts

@@ -17,12 +17,12 @@ export function useRBAC() {
 
   const checkRole = (roleAccess: RoleAccess, _userRoles?: string[]): boolean => {
     const roles = authStore.userRole
-    return roles.some((role: string) => (role in roleAccess) || role === 'system') // system by-passes this check
+    return roles.some((role: string) => role === 'system' || (role in roleAccess)) // system by-passes this check
   }
 
   const checkPermission = (roleAccess: RoleAccess, permission: Permission, _userRoles?: string[]): boolean => {
     const roles = authStore.userRole
-    return roles.some((role: string) => roleAccess[role]?.includes(permission) || role === 'system') // system by-passes this check
+    return roles.some((role: string) => role === 'system' || roleAccess[role]?.includes(permission)) // system by-passes this check
   }
 
   const getUserPermissions = (roleAccess: RoleAccess, _userRoles?: string[]): Permission[] => {

app/const/page-permission/chemo.ts

@@ -0,0 +1,32 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/chemo/verification': {
+    'emp|reg': ['R'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+  },
+  '/chemo/verification/[id]': {
+    'emp|reg': ['R'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+  },
+  '/chemo/verification/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+  },
+  '/chemo/action': {
+    'emp|reg': ['R', 'U', 'D'],
+  },
+  '/chemo/action/[id]': {
+    'emp|reg': ['R', 'U', 'D'],
+  },
+  '/chemo/action/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+  },
+}

app/const/page-permission/emergency.ts

@@ -0,0 +1,67 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/emergency/triage': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/triage/add': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/triage/[id]': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/triage/[id]/edit': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/encounter': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/emergency/encounter/add': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/encounter/[id]': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/emergency/encounter/[id]/edit': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/encounter/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+    'emp|miw': ['R', 'U'],
+    'emp|nut': ['R', 'U'],
+    'emp|pha': ['R', 'U'],
+    'emp|lab': ['R', 'U'],
+    'emp|rad': ['R', 'U'],
+  },
+  '/emergency/consulation': {
+    'emp|doc': ['R'],
+  },
+  '/emergency/consulation/[id]/process': {
+    'emp|doc': ['R', 'U'],
+  },
+}

app/const/page-permission/human-src.ts

@@ -0,0 +1,25 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/human-src/employee': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/employee/add': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/employee/[id]/edit': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern/add': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern/[id]/edit': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+}

app/const/page-permission/inpatient.ts

@@ -0,0 +1,57 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/inpatient/request': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/request/[id]/detail': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/encounter': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/inpatient/encounter/add': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/encounter/[id]': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/inpatient/encounter/[id]/edit': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/encounter/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+    'emp|miw': ['R', 'U'],
+    'emp|nut': ['R', 'U'],
+    'emp|pha': ['R', 'U'],
+    'emp|lab': ['R', 'U'],
+    'emp|rad': ['R', 'U'],
+  },
+  '/inpatient/consulation': {
+    'emp|doc': ['R'],
+  },
+  '/inpatient/consulation/[id]/process': {
+    'emp|doc': ['R', 'U'],
+  },
+}

app/const/page-permission/mcu-src.ts

@@ -0,0 +1,19 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/muc-src/checkup': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  },
+  '/muc-src/checkup-category': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  },
+  '/mcu-src/antibiotic-src': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  },
+  '/mcu-src/antibiotic-src-category': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  }
+}

app/const/page-permission/org-src.ts

@@ -0,0 +1,31 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/infra-src/bed': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/chamber': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/room': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/warehouse': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/building': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/floor': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/counter': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/public-screen': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+}

app/const/page-permission/outpatient.ts

@@ -0,0 +1,57 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/outpatient/registration-queue': {
+    'emp|reg': ['R', 'U', 'D'],
+  },
+  '/outpatient/encounter-queue': {
+    'emp|nur': ['R', 'U', 'D'],
+  },
+  '/outpatient/encounter': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/outpatient/encounter/add': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/outpatient/encounter/[id]/detail': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/outpatient/encounter/[id]/edit': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/outpatient/encounter/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+    'emp|miw': ['R', 'U'],
+    'emp|nut': ['R', 'U'],
+    'emp|pha': ['R', 'U'],
+    'emp|lab': ['R', 'U'],
+    'emp|rad': ['R', 'U'],
+  },
+  '/outpatient/consulation': {
+    'emp|doc': ['R'],
+  },
+  '/outpatient/consulation/[id]/process': {
+    'emp|doc': ['R', 'U'],
+  },
+}

app/const/page-permission/tools-equipment.ts

@@ -0,0 +1,27 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/tools-equipment-src/medicine': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/medicine-method': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/medicine-type': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/medicine-form': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/device-src': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+}

app/lib/page-permission.ts

@@ -1,7 +1,7 @@
 import type { RoleAccess } from '~/models/role'
 
 export const PAGE_PERMISSIONS = {
-  '/patient': {
+  '/client/patient': {
     'emp|doc': ['R'],
     'emp|nur': ['R'],
     'emp|reg': ['C', 'R', 'U', 'D'],
@@ -9,13 +9,11 @@ export const PAGE_PERMISSIONS = {
     'emp|pay': ['R'],
     'emp|mng': ['R'],
   },
-  '/doctor': {
+  '/human-src/employee': {
-    'emp|doc': ['C', 'R', 'U', 'D'],
+    'div|hrd': ['C', 'R', 'U', 'D'],
-    'emp|nur': ['R'],
+  },
-    'emp|reg': ['R'],
+  '/human-src/intern': {
-    'emp|pha': ['R'],
+    'div|hrd': ['C', 'R', 'U', 'D'],
-    'emp|pay': ['R'],
-    'emp|mng': ['R'],
   },
   '/satusehat': {
     'emp|doc': ['R'],

app/models/unit-position.ts

@@ -2,7 +2,7 @@ import { type Base, genBase } from './_base'
 import type { Employee } from './employee'
 
 export interface UnitPosition extends Base {
-  unit_code: string
+  unit_id: string
   code: string
   name: string
   headStatus?: boolean
@@ -14,7 +14,7 @@ export interface UnitPosition extends Base {
 export function genUnitPosition(): UnitPosition {
   return {
     ...genBase(),
-    unit_code: '',
+    unit_id: '',
     code: '',
     name: '',
     headStatus: false,

app/pages/(features)/children-action/spirometry/index.vue

@@ -1,10 +0,0 @@
-<script setup lang="ts">
-  const route = useRoute();
-</script>
-
-<template>
-  <div class="p-10 text-center">
-    <div class="mb-5 text-base font-semibold">Hello world!!</div>
-    <div>You are accessing "{{ route.fullPath }}"</div>
-  </div>
-</template>

app/pages/(features)/children-action/thalasemia/index.vue

@@ -1,10 +0,0 @@
-<script setup lang="ts">
-  const route = useRoute();
-</script>
-
-<template>
-  <div class="p-10 text-center">
-    <div class="mb-5 text-base font-semibold">Hello world!!</div>
-    <div>You are accessing "{{ route.fullPath }}"</div>
-  </div>
-</template>

app/pages/(features)/doctor/add.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Dokter',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentDoctorAdd />
-  </div>
-  <Error v-else :status-code="403" />
-</template>

app/pages/(features)/doctor/index.vue

@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar Dokter',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentDoctorList />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/emergency/encounter/add.vue

@@ -1,44 +1,46 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Tambah Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
+const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/emergency/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
+  navigateTo('/403')
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
 }
 
+// Define permission-based computed properties
+const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
 // Define permission-based computed properties
 const canCreate = hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry
+    <Content
       :id="0"
       class-code="emergency"
-      sub-class-code="emg"
+      sub-class-code="reg"
       form-type="Tambah"
     />
   </div>

app/pages/(features)/emergency/encounter/index.vue

@@ -1,23 +1,19 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/list.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/emergency/encounter']
-
 const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
@@ -28,14 +24,28 @@ if (!hasAccess) {
 
 // Define permission-based computed properties
 const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const { user, getActiveRole } = useUserStore()
+// const activeRole = getActiveRole()
+// const activeRoleParts = activeRole ? activeRole.split('|') : ['', '']
+// const activeRolePos = activeRoleParts[0] // reaching this page means it is already set
+// const activeRoleType = activeRoleParts[1] == 'rehab' ? activeRoleParts[1] : ''
+const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentEncounterList
+      <Content
         class-code="emergency"
-        sub-class-code="emg"
+        sub-class-code="reg"
         type="encounter"
       />
     </div>

app/pages/(features)/human-src/employee/[id]/edit.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

app/pages/(features)/human-src/employee/[id]/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

app/pages/(features)/inpatient/encounter/[id]/process.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
+import { permissions } from '~/const/page-permission/inpatient'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import Error from '~/components/pub/my-ui/error/error.vue'
 import EncounterProcess from '~/components/content/encounter/process-next.vue'
 
 definePageMeta({
@@ -11,35 +12,29 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
+const { checkRole, hasReadAccess } = useRBAC()
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/inpatient/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
+  navigateTo('/403')
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
 }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => `${route.meta.title}`,
+})
 </script>
 
 <template>
-  <div v-if="canCreate">
+  <div v-if="canRead">
     <EncounterProcess class-code="inpatient" sub-class-code="vk" />
   </div>
-  <Error
+  <Error v-else :status-code="403" />
-    v-else
-    :status-code="403"
-  />
 </template>

app/pages/(features)/inpatient/encounter/add.vue

@@ -1,44 +1,46 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Tambah Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
+const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/inpatient/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
+  navigateTo('/403')
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
 }
 
+// Define permission-based computed properties
+const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
 // Define permission-based computed properties
 const canCreate = hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry
+    <Content
       :id="0"
-      class-code="inpatient"
+      class-code="ambulatory"
-      sub-class-code="icu"
+      sub-class-code="reg"
       form-type="Tambah"
     />
   </div>

app/pages/(features)/inpatient/encounter/index.vue

@@ -1,23 +1,19 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/list.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/inpatient/encounter']
-
 const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
@@ -28,14 +24,28 @@ if (!hasAccess) {
 
 // Define permission-based computed properties
 const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const { user, getActiveRole } = useUserStore()
+// const activeRole = getActiveRole()
+// const activeRoleParts = activeRole ? activeRole.split('|') : ['', '']
+// const activeRolePos = activeRoleParts[0] // reaching this page means it is already set
+// const activeRoleType = activeRoleParts[1] == 'rehab' ? activeRoleParts[1] : ''
+const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentEncounterList
+      <Content
         class-code="inpatient"
-        sub-class-code="vk"
+        sub-class-code="reg"
         type="encounter"
       />
     </div>

app/pages/(features)/outpatient/encounter/[id]/process.vue

@@ -1,45 +1,39 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 import EncounterProcess from '~/components/content/encounter/process-next.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|doc', 'emp|nur', 'emp|reg', 'emp|pha', 'emp|pay', 'emp|mng'],
-  title: 'Kunjungan',
+  title: 'Tambah Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
+const { checkRole, hasReadAccess } = useRBAC()
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
+  navigateTo('/403')
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
 }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => `${route.meta.title}`,
+})
 </script>
 
 <template>
-  <div v-if="canCreate">
+  <div v-if="canRead">
     <EncounterProcess class-code="ambulatory" sub-class-code="reg" />
   </div>
-  <Error
+  <Error v-else :status-code="403" />
-    v-else
-    :status-code="403"
-  />
 </template>

app/pages/(features)/outpatient/encounter/add.vue

@@ -1,41 +1,43 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Tambah Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
+const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
 if (!hasAccess) {
-  throw createError({
+  navigateTo('/403')
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
 }
 
+// Define permission-based computed properties
+const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
 // Define permission-based computed properties
 const canCreate = hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry
+    <Content
       :id="0"
       class-code="ambulatory"
       sub-class-code="reg"

app/pages/(features)/outpatient/encounter/index.vue

@@ -1,23 +1,19 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/outpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/list.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
+// Preps role checking
-
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/encounter']
-
 const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
@@ -28,15 +24,28 @@ if (!hasAccess) {
 
 // Define permission-based computed properties
 const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const { user, getActiveRole } = useUserStore()
+// const activeRole = getActiveRole()
+// const activeRoleParts = activeRole ? activeRole.split('|') : ['', '']
+// const activeRolePos = activeRoleParts[0] // reaching this page means it is already set
+// const activeRoleType = activeRoleParts[1] == 'rehab' ? activeRoleParts[1] : ''
+const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentEncounterList
+      <Content
         class-code="ambulatory"
-        sub-class-code="reg"
+        :sub-class-code="subClassCode"
-        type="encounter"
       />
     </div>
     <Error

app/pages/(features)/outpatient/polyclinic-queue/index.vue

@@ -1,10 +0,0 @@
-<script setup lang="ts">
-  const route = useRoute();
-</script>
-
-<template>
-  <div class="p-10 text-center">
-    <div class="mb-5 text-base font-semibold">Hello world!!</div>
-    <div>You are accessing "{{ route.fullPath }}"</div>
-  </div>
-</template>

app/pages/(features)/outpation-action/chemotherapy/[mode]/[id]/verification.vue

@@ -1,47 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-import ContentChemotherapyAdminList from '~/components/content/chemotherapy/admin-list.vue'
-import ContentChemotherapyVerification from '~/components/content/chemotherapy/verification.vue'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Kemoterapi Admin',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => 'Verifikasi Jadwal Pasien',
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor'] || {}
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
-
-const mode = computed(() => route.params.mode as string)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentChemotherapyVerification />
-    </div>
-    <Error
-      v-else
-      :status-code="403"
-    />
-  </div>
-</template>

app/pages/(features)/outpation-action/chemotherapy/[mode]/index.vue

@@ -1,55 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-import ContentChemotherapyAdminList from '~/components/content/chemotherapy/admin-list.vue'
-import ContentChemotherapyVerification from '~/components/content/chemotherapy/verification.vue'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Kemoterapi Admin',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => {
-    const mode = route.params.mode as string
-    if (mode === 'admin') {
-      return 'Administrasi Pasien Rawat Jalan Kemoterapi'
-    } else if (mode === 'series') {
-      return 'Proses Jadwal Pasien'
-    }
-    return route.meta.title as string
-  },
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor'] || {}
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-// const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
-
-const mode = computed(() => route.params.mode as string)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentChemotherapyAdminList v-if="mode === 'admin'" />
-      <ContentChemotherapyProcess v-else-if="mode === 'series'" />
-      <Error v-else :status-code="404" status-message="Mode tidak ditemukan" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
-

app/pages/(features)/outpation-action/chemotherapy/index.vue

@@ -1,9 +0,0 @@
-<script setup lang="ts">
-// Redirect to list page - the process page is now at [id]/index.vue
-const route = useRoute()
-navigateTo('/outpation-action/chemotherapy/list')
-</script>
-
-<template>
-  <div />
-</template>

app/pages/(features)/outpation-action/chemotherapy/list.vue

@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar Kempterapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentChemotherapyList />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/outpation-action/hemophilia/index.vue

@@ -1,10 +0,0 @@
-<script setup lang="ts">
-  const route = useRoute();
-</script>
-
-<template>
-  <div class="p-10 text-center">
-    <div class="mb-5 text-base font-semibold">Hello world!!</div>
-    <div>You are accessing "{{ route.fullPath }}"</div>
-  </div>
-</template>

app/pages/(features)/patient/[id]/detail.vue

@@ -1,9 +0,0 @@
-<script setup lang="ts">
-definePageMeta({
-  roles: ['sys', 'doc'],
-})
-</script>
-
-<template>
-  <div>detail pasien</div>
-</template>

app/pages/(features)/patient/[id]/edit.vue

@@ -1,9 +0,0 @@
-<script setup lang="ts">
-definePageMeta({
-  roles: ['sys', 'doc'],
-})
-</script>
-
-<template>
-  <div>edit pasien</div>
-</template>

app/pages/(features)/patient/add.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Pasien',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentPatientAdd />
-  </div>
-  <Error v-else :status-code="403" />
-</template>

app/pages/(features)/patient/index.vue

@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar Pasien',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentPatientList />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/rehab/encounter-queue/index.vue

@@ -1,3 +0,0 @@
-<template>
-  <div>Examination Queue</div>
-</template>

app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Update Surat Kontrol',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentControlLetterEdit />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Detail Surat Kontrol',
-  contentFrame: 'cf-container-md',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentControlLetterDetail :patient-id="Number(route.params.id)" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Surat Kontrol',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, getPagePermissions } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const pagePermission = getPagePermissions(roleAccess)
-const callbackUrl = route.query['return-path'] as string | undefined
-</script>
-
-<template>
-  <div>
-    <div v-if="pagePermission.canRead">
-      <ContentControlLetterAdd :callback-url="callbackUrl" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/rehab/encounter/[id]/detail.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentEncounterEntry :id="1" form-type="Detail" />
-  </div>
-  <Error v-else :status-code="403" />
-</template>

app/pages/(features)/rehab/encounter/[id]/document-upload/[document_id]/edit.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Update Dokumen Pendukung',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentDocumentUploadEdit/>
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/rehab/encounter/[id]/document-upload/add.vue

@@ -1,42 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Dokumen Pendukung',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-const callbackUrl = route.query['return-path'] as string | undefined
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentDocumentUploadAdd :callback-url="callbackUrl" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

app/pages/(features)/rehab/encounter/[id]/edit.vue

@@ -1,55 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Edit Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasUpdateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
-
-// Get encounter ID from route params
-const encounterId = computed(() => {
-  const id = route.params.id
-  return typeof id === 'string' ? parseInt(id) : 0
-})
-</script>
-
-<template>
-  <div v-if="canUpdate">
-    <ContentEncounterEntry
-      :id="encounterId"
-      class-code="ambulatory"
-      sub-class-code="rehab"
-      form-type="Edit"
-    />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>

app/pages/(features)/rehab/encounter/add.vue

@@ -1,49 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentEncounterEntry
-      :id="0"
-      class-code="ambulatory"
-      sub-class-code="rehab"
-      form-type="Tambah"
-    />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>

app/pages/(features)/rehab/encounter/index.vue

@@ -1,47 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['system', 'emp-doc', 'emp-nur', 'emp-reg', 'emp-pha', 'emp-pay', 'emp-mng'],
-  title: 'Daftar Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentEncounterList
-        class-code="ambulatory"
-        sub-class-code="rehab"
-        type="encounter"
-      />
-    </div>
-    <Error
-      v-else
-      :status-code="403"
-    />
-  </div>
-</template>

app/pages/(features)/rehab/registration/[id]/detail.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentEncounterEntry :id="1" form-type="Detail" />
-  </div>
-  <Error v-else :status-code="403" />
-</template>

app/pages/(features)/rehab/registration/[id]/edit.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentEncounterEntry :id="1" form-type="Edit" />
-  </div>
-  <Error v-else :status-code="403" />
-</template>

app/pages/(features)/rehab/registration/add.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <template v-if="canCreate">
-    <ContentEncounterEntry form-type="Tambah" />
-  </template>
-  <Error v-else :status-code="403" />
-</template>

app/pages/(features)/rehab/registration/index.vue

@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Pendaftaran',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentEncounterList type="registration" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>

public/side-menu-items/emp-doc.json

@@ -12,7 +12,7 @@
         "icon": "i-lucide-stethoscope",
         "children": [
           {
-            "title": "Triase",
+            "title": "Kunjungan",
             "icon": "i-lucide-stethoscope",
             "link": "/outpatient/encounter"
           },
@@ -44,22 +44,6 @@
           }
         ]
       },
-      {
-        "title": "Rehabilitasi Medik",
-        "icon": "i-lucide-bike",
-        "children": [
-          {
-            "title": "Kunjungan",
-            "icon": "i-lucide-building-2",
-            "link": "/rehab/encounter"
-          },
-          {
-            "title": "Konsultasi",
-            "icon": "i-lucide-building-2",
-            "link": "/rehab/consultation"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",

public/side-menu-items/emp-nur.json

@@ -35,21 +35,6 @@
           }
         ]
       },
-      {
-        "title": "Rehabilitasi Medik",
-        "icon": "i-lucide-bike",
-        "link": "/rehab",
-        "children": [
-          {
-            "title": "Antrean Poliklinik",
-            "link": "/rehab/encounter-queue"
-          },
-          {
-            "title": "Kunjungan",
-            "link": "/rehab/encounter"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",
@@ -63,12 +48,12 @@
       {
         "title": "Kemoterapi",
         "icon": "i-lucide-droplets",
-        "link": "/outpation-action/chemotherapy"
+        "link": "/chemotherapy"
       },
       {
         "title": "Hemofilia",
         "icon": "i-lucide-droplet-off",
-        "link": "/outpation-action/hemophilia"
+        "link": "/hemophilia"
       }
     ]
   },
@@ -78,17 +63,17 @@
       {
         "title": "Thalasemi",
         "icon": "i-lucide-baby",
-        "link": "/children-action/thalasemia"
+        "link": "/thalasemia"
       },
       {
         "title": "Echocardiography",
         "icon": "i-lucide-baby",
-        "link": "/children-action/echocardiography"
+        "link": "/echocardiography"
       },
       {
         "title": "Spirometri",
         "icon": "i-lucide-baby",
-        "link": "/children-action/spirometry"
+        "link": "/spirometry"
       }
     ]
   }

public/side-menu-items/emp-reg.json

@@ -26,21 +26,6 @@
         "icon": "i-lucide-zap",
         "link": "/emergency/encounter"
       },
-      {
-        "title": "Rehabilitasi Medik",
-        "icon": "i-lucide-bike",
-        "link": "/rehab",
-        "children": [
-          {
-            "title": "Antrean Pendaftaran",
-            "link": "/rehab/registration-queue"
-          },
-          {
-            "title": "Kunjungan",
-            "link": "/rehab/encounter"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",

public/side-menu-items/sys.json

@@ -17,7 +17,7 @@
           },
           {
             "title": "Antrian Poliklinik",
-            "link": "/outpatient/polyclinic-queue"
+            "link": "/outpatient/encounter-queue"
           },
           {
             "title": "Kunjungan",
@@ -47,28 +47,6 @@
           }
         ]
       },
-      {
-        "title": "Rehab Medik",
-        "icon": "i-lucide-bike",
-        "children": [
-          {
-            "title": "Antrean Pendaftaran",
-            "link": "/rehab/registration-queue"
-          },
-          {
-            "title": "Antrean Poliklinik",
-            "link": "/rehab/polyclinic-queue"
-          },
-          {
-            "title": "Kunjungan",
-            "link": "/rehab/encounter"
-          },
-          {
-            "title": "Konsultasi",
-            "link": "/rehab/consultation"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",
@@ -101,10 +79,15 @@
           }
         ]
       },
+      {
+        "title": "Radiologi - Order",
+        "icon": "i-lucide-radio",
+        "link": "/radiology-order"
+      },
       {
         "title": "Lab - Order",
         "icon": "i-lucide-microscope",
-        "link": "/pc-lab-order"
+        "link": "/cp-lab-order"
       },
       {
         "title": "Lab Mikro - Order",
@@ -114,12 +97,7 @@
       {
         "title": "Lab PA - Order",
         "icon": "i-lucide-microscope",
-        "link": "/pa-lab-order"
+        "link": "/ap-lab-order"
-      },
-      {
-        "title": "Radiologi - Order",
-        "icon": "i-lucide-radio",
-        "link": "/radiology-order"
       },
       {
         "title": "Gizi",
@@ -284,40 +262,40 @@
         ]
       },
       {
-        "title": "Layanan",
+        "title": "Infrastruktur",
         "icon": "i-lucide-layout-list",
         "children": [
-          {
-            "title": "Counter",
-            "link": "/service-src/counter"
-          },
-          {
-            "title": "Public Screen (Big Screen)",
-            "link": "/service-src/public-screen"
-          },
           {
             "title": "Kasur",
-            "link": "/service-src/bed"
+            "link": "/infra-src/bed"
           },
           {
             "title": "Kamar",
-            "link": "/service-src/chamber"
+            "link": "/infra-src/chamber"
           },
           {
             "title": "Ruang",
-            "link": "/service-src/room"
+            "link": "/infra-src/room"
           },
           {
             "title": "Depo",
-            "link": "/service-src/warehouse"
+            "link": "/infra-src/warehouse"
           },
           {
             "title": "Lantai",
-            "link": "/service-src/floor"
+            "link": "/infra-src/floor"
           },
           {
             "title": "Gedung",
-            "link": "/service-src/building"
+            "link": "/infra-src/building"
+          },
+          {
+            "title": "Counter",
+            "link": "/infra-src/counter"
+          },
+          {
+            "title": "Public Screen (Big Screen)",
+            "link": "/infra-src/public-screen"
           }
         ]
       },
@@ -369,4 +347,4 @@
       }
     ]
   }
-]
+]