Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into fe-sep-38

app/pages/(features)/doctor/[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)/doctor/[id]/edit.vue

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

app/pages/(features)/tools-equipment-src/equipment/index.vue

@@ -27,13 +27,17 @@ if (!hasAccess) {
 }
 
 // Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
+const canRead = true // hasReadAccess(roleAccess)
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
+<<<<<<< HEAD
+      <ContentEquipmentList />
+=======
       <ContentMaterialList />
+>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2
     </div>
     <Error v-else :status-code="403" />
   </div>

app/pages/(features)/tools-equipment-src/tools/index.vue

@@ -27,13 +27,17 @@ if (!hasAccess) {
 }
 
 // Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
+const canRead = true // hasReadAccess(roleAccess)
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
+<<<<<<< HEAD:app/pages/(features)/tools-equipment-src/tools/index.vue
+      <ContentToolsList />
+=======
       <ContentDeviceList />
+>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/pages/(features)/tools-equipment-src/device/index.vue
     </div>
     <Error v-else :status-code="403" />
   </div>