Merge branch 'dev' of github.com:dikstub-rssa/simrs-fe into feat/satusehat

app/components/app/doctor/entry-form.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import Block from '~/components/pub/form/block.vue'
-import FieldGroup from '~/components/pub/form/field-group.vue'
-import Field from '~/components/pub/form/field.vue'
-import Label from '~/components/pub/form/label.vue'
+import Block from '~/components/pub/custom-ui/form/block.vue'
+import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
+import Field from '~/components/pub/custom-ui/form/field.vue'
+import Label from '~/components/pub/custom-ui/form/label.vue'
+import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
 
 const props = defineProps<{ modelValue: any }>()
 const emit = defineEmits(['update:modelValue', 'event'])
@@ -110,7 +111,7 @@ function onClick(type: string) {
       </div>
     </div>
     <div class="my-2 flex justify-end py-2">
-      <PubNavFooterCsd @click="onClick" />
+      <Action @click="onClick" />
     </div>
   </form>
 </template>

app/components/app/doctor/list-cfg.ts

@@ -1,11 +1,23 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '../../pub/nav/types'
+import type {
+  Col,
+  KeyLabel,
+  RecComponent,
+  RecStrFuncComponent,
+  RecStrFuncUnknown,
+  Th,
+} from '~/components/pub/custom-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/nav/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
+const doctorStatus = {
+  0: 'Tidak Aktif',
+  1: 'Aktif',
+}
+
 export const cols: Col[] = [
   { width: 100 },
   { width: 250 },
@@ -32,6 +44,7 @@ export const header: Th[][] = [
     { label: 'Fee Ranap' },
     { label: 'Fee Rajal' },
     { label: 'Status' },
+    { label: '' },
   ],
 ]
 

app/components/app/patient/entry-form.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import Block from '~/components/pub/form/block.vue'
-import FieldGroup from '~/components/pub/form/field-group.vue'
-import Field from '~/components/pub/form/field.vue'
-import Label from '~/components/pub/form/label.vue'
+import Block from '~/components/pub/custom-ui/form/block.vue'
+import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
+import Field from '~/components/pub/custom-ui/form/field.vue'
+import Label from '~/components/pub/custom-ui/form/label.vue'
+import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
 </script>
 
 <template>
@@ -41,7 +42,7 @@ import Label from '~/components/pub/form/label.vue'
       </Block>
     </div>
     <div class="my-2 flex justify-end py-2">
-      <PubNavFooterCsd />
+      <Action />
     </div>
   </form>
 </template>

app/components/app/patient/list-cfg.ts

@@ -1,9 +1,16 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '../../pub/nav/types'
+import type {
+  Col,
+  KeyLabel,
+  RecComponent,
+  RecStrFuncComponent,
+  RecStrFuncUnknown,
+  Th,
+} from '~/components/pub/custom-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/nav/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 export const cols: Col[] = [

app/components/app/rehab/registration/sep-prosedur/list-cfg.ts

@@ -1,9 +1,9 @@
-import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '../../pub/nav/types'
+import type { Col, KeyLabel, RecComponent, RecStrFuncComponent, RecStrFuncUnknown, Th } from '~/components/pub/custom-ui/data/types'
 import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/nav/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 
 export const cols: Col[] = [
   {},

app/components/app/satusehat/card-summary.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Summary } from '~/components/pub/base/summary-card.type';
+import type { Summary } from '~/components/pub/base/summary-card/type';
 
 const props = defineProps<{
   isLoading: boolean

app/components/app/satusehat/list-cfg.ts

@@ -15,7 +15,6 @@ export const rowStatus = {
   2: 'Terkirim',
 }
 
-const action = defineAsyncComponent(() => import('~/components/pub/nav/dropdown-action-dud.vue'))
 const patientBadge = defineAsyncComponent(() => import('./badge-patient.vue'))
 const statusBadge = defineAsyncComponent(() => import('./badge-status.vue'))