Merge branch 'dev' of ssh://git.codelfi.com:2202/TelemedPro/hgh_admin into dev

resources/js/pages/labs/labs-kit.vue

@@ -64,10 +64,10 @@ const headers = [
   },
 
  
-  {
+  // {
-    title: 'ACTIONS',
+  //   title: 'ACTIONS',
-    key: 'actions',
+  //   key: 'actions',
-  },
+  // },
 ]
 
 const resolveStatusVariant = status => {
@@ -188,7 +188,7 @@ onMounted(() => {
           <VRow>
        
           <VCol cols="12" md="8" class="d-flex align-center" >
-          <VBtn color="primary" prepend-icon="ri-add-line" @click="addDialog = true">
+          <VBtn color="primary" prepend-icon="ri-add-line" @click="addDialog = true" style="display: none;">
             New Lab Kit
           </VBtn>
           </VCol>

resources/js/pages/patients/NotesPanel.vue

@@ -61,10 +61,12 @@ const downloadFile = (fileUrl) => {
         >
           <!-- 👉 Header -->
           <div class="d-flex justify-space-between align-center gap-2 flex-wrap">
-            <span class="app-timeline-title">
+            <span class="app-timeline-title" v-if="p_note.note_type=='Notes'">
               {{p_note.note}}
             </span>
-          
+           <span class="app-timeline-title" v-if="p_note.note_type=='file'">
+             <img :src="p_note.note"/>
+            </span>
             <span class="app-timeline-meta">{{ formatDateDate(p_note.created_at) }}</span>
             <!-- <span></span> -->
           </div>

resources/js/pages/patients/PatienTabOverview.vue

@@ -42,12 +42,12 @@ const refVForm = ref(null);
 // Headers
 const headers = [
   // { title: 'Appointment Id', key: 'id' },
-  { title: 'Patient', key: 'patient_name' },
+  { title: 'Provider', key: 'provider_name' },
-  // { key: 'appointment_date', sortable: false, title: 'Date' },
+  { key: 'appointment_date', sortable: false, title: 'Date' },
-  { key: 'start_time', title: 'Start Time' },
+  //{ key: 'start_time', title: 'Start Time' },
-  { key: 'end_time', title: 'End Time' },
+ // { key: 'end_time', title: 'End Time' },
-  { key: 'duration', title: 'Duration' },
+  //{ key: 'duration', title: 'Duration' },
-  { title: 'ACTIONS', key: 'actions' },
+  //{ title: 'ACTIONS', key: 'actions' },
 ];
 
 
@@ -93,7 +93,7 @@ const getPatientMeetingList = async () => {
  
   patientMeetingList.value = list.map(history => ({
     ...history,
-    appointment_date: formatDate(history.appointment_date),
+      appointment_date: formatDate(history.appointment_date+' '+history.appointment_time),
     start_time: formatDate(history.start_time),
     end_time: formatDate(history.end_time),
     duration: totalCallDuration(history.start_time, history.end_time),

resources/js/pages/patients/PatientBioPanel.vue

@@ -62,6 +62,11 @@ const resolveUserRoleVariant = role => {
     icon: 'ri-user-line',
   }
 }
+ const firstThreeLines = computed(() => {
+      const lines = props.userData.plans.list_two_title.split(',')
+      return lines.slice(0, 3)
+    })
+
 </script>
 
 <template>
@@ -137,31 +142,8 @@ const resolveUserRoleVariant = role => {
                 <span class="font-weight-medium">
                   Address:
                 </span>
-                <span class="text-body-1">{{ props.userData.patient.address }}</span>
+                <span class="text-body-1">{{ props.userData.patient.address }} 
-              </VListItemTitle>
+                <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ props.userData.patient.city }},{{ props.userData.patient.state }} {{ props.userData.patient.zip_code }}</span>
-            </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  City:
-                </span>
-                <span class="text-body-1">{{ props.userData.patient.city }}</span>
-              </VListItemTitle>
-            </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  State:
-                </span>
-                <span class="text-body-1">{{ props.userData.patient.state }}</span>
-              </VListItemTitle>
-            </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  Zip:
-                </span>
-                <span class="text-body-1">{{ props.userData.patient.zip_code }}</span>
               </VListItemTitle>
             </VListItem>
             
@@ -170,6 +152,8 @@ const resolveUserRoleVariant = role => {
 
             
 
+           
+
             <VListItem>
               <VListItemTitle class="text-sm">
                 <span class="font-weight-medium">
@@ -275,7 +259,10 @@ const resolveUserRoleVariant = role => {
                   icon="ri-circle-fill"
                 />
                 <div class="text-medium-emphasis">
-                  {{ props.userData.plans.list_two_title }}
+                <span v-for="(line, index) in firstThreeLines" :key="index">
+                  {{ line }}
+                  <br v-if="index !== firstThreeLines.length - 1" />
+                </span>
               </div>
               </div>
             </VListItem>

resources/js/pages/providers/NotesPanel.vue

@@ -61,9 +61,12 @@ const downloadFile = (fileUrl) => {
         >
           <!-- 👉 Header -->
           <div class="d-flex justify-space-between align-center gap-2 flex-wrap">
-            <span class="app-timeline-title">
+           <span class="app-timeline-title" v-if="p_note.note_type=='Notes'">
               {{p_note.note}}
             </span>
+           <span class="app-timeline-title" v-if="p_note.note_type=='file'">
+             <img :src="p_note.note"/>
+            </span>
           
             <span class="app-timeline-meta">{{ formatDateDate(p_note.created_at) }}</span>
             <!-- <span></span> -->

resources/js/pages/providers/ProviderBioPanel.vue

@@ -102,7 +102,13 @@ const resolveUserRoleVariant = role => {
           >
             Provider
           </VChip>
-           
+              <VChip
+            :color="resolveUserStatusVariant(props.userData.telemed.status==1?'Active':'InActive')"
+            size="small"
+            class="text-capitalize mt-4"
+          >
+            {{ props.userData.telemed.status==1?"Active":'InActive' }}
+          </VChip>
         </VCardText>
 
       
@@ -131,36 +137,16 @@ const resolveUserRoleVariant = role => {
                 <span class="font-weight-medium">
                   Address:
                 </span>
-                <span class="text-body-1">{{ props.userData.telemed.home_address }}</span>
+                <span class="text-body-1">{{ props.userData.telemed.home_address }} 
-              </VListItemTitle>
+                <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ props.userData.telemed.city }},{{ props.userData.telemed.state }} {{ props.userData.telemed.zip_code }}</span>
-            </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  City:
-                </span>
-                <span class="text-body-1">{{ props.userData.telemed.city }}</span>
-              </VListItemTitle>
-            </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  State:
-                </span>
-                <span class="text-body-1">{{ props.userData.telemed.state }}</span>
-              </VListItemTitle>
-            </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  Zip:
-                </span>
-                <span class="text-body-1">{{ props.userData.telemed.zip_code }}</span>
               </VListItemTitle>
             </VListItem>
             
            
            
+            
+
+            
             <VListItem>
               <VListItemTitle class="text-sm">
                 <span class="font-weight-medium">
@@ -172,33 +158,13 @@ const resolveUserRoleVariant = role => {
             <VListItem>
               <VListItemTitle class="text-sm">
                 <span class="font-weight-medium">
-                  Availability From:
+                  Availability:
                 </span>
-                <span class="text-body-1">{{ props.userData.telemed.availability_from }}</span>
+                <span class="text-body-1">{{ props.userData.telemed.availability_from }}</span> <span class="text-body-1">{{ props.userData.telemed.availability_to }}</span>
               </VListItemTitle>
             </VListItem>
-            <VListItem>
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  Availability To:
-                </span>
-                <span class="text-body-1">{{ props.userData.telemed.availability_to }}</span>
-              </VListItemTitle>
-            </VListItem>
-            <VListItem >
-              <VListItemTitle class="text-sm">
-                <span class="font-weight-medium">
-                  Status:
-                </span><VChip
-            :color="resolveUserStatusVariant(props.userData.telemed.status==1?'Active':'InActive')"
-            size="small"
-            class="text-capitalize"
-          >
-            {{ props.userData.telemed.status==1?"Active":'InActive' }}
-          </VChip>
             
-              </VListItemTitle>
+            
-            </VListItem>
 
           </VList>
         </VCardText>

resources/js/plugins/1.router/additional-routes.js

@@ -4,9 +4,24 @@ const emailRouteComponent = () => import('@/pages/apps/email/index.vue')
 export const redirects = [
   // ℹ️ We are redirecting to different pages based on role.
   // NOTE: Role is just for UI purposes. ACL is based on abilities.
+  {
+    path: '/admin',
+    // name: 'index',
+    redirect: to => {
+      // TODO: Get type from backend
+      const userData = useCookie('userData')
+      const userRole = userData.value?.role
+      if (userRole === 'admin')
+        return { name: 'admin-dashboard' }
+      if (userRole === 'client')
+        return { name: 'access-control' }
+      
+      return { name: 'login', query: to.query }
+    },
+  },
   {
     path: '/',
-    name: 'index',
+    // name: 'index',
     redirect: to => {
       // TODO: Get type from backend
       const userData = useCookie('userData')