Merge pull request #355 from vselvarajijay/go-live-version

bug fix on cocm-registry, rolling back changes
akello-io · Mar 8, 2024 · f988d6d · f988d6d
2 parents 0fd563d + ed87b45
commit f988d6d
Show file tree

Hide file tree

Showing 8 changed files with 1,518 additions and 1,492 deletions.
diff --git a/apps/cocm-registry/pnpm-lock.yaml b/apps/cocm-registry/pnpm-lock.yaml
diff --git a/apps/cocm-registry/src/App.tsx b/apps/cocm-registry/src/App.tsx
@@ -55,14 +55,10 @@ export default function App() {
         </Route>        
         <Route path="/registry" element={<RegistryShell />}>
           <Route path={":registry_id"} element={<RegistryPage drawerHandlers={drawerHandlers} />} />
-          <Route path={":registry_id/dashboard"} element={<DashboardPage />} />
-          {/* 
-          <Route path={":registry_id/team"} element={<TeamPage />} />
-          */}
-          <Route path={":registry_id/reports"} element={<ReportsPage />} />
-          {/*
-          <Route path={":registry_id/apps"} element={<AkelloApps />} />
-          */}          
+          <Route path={":registry_id/dashboard"} element={<DashboardPage />} />          
+          <Route path={":registry_id/team"} element={<TeamPage />} />          
+          <Route path={":registry_id/reports"} element={<ReportsPage />} />          
+          <Route path={":registry_id/apps"} element={<AkelloApps />} />          
           <Route path={":registry_id/apps/:app_id"} element={<AkelloAppSettingsPage />} />
           <Route path={":registry_id/patient-referral"} element={<PatientReferralPage />} />
           <Route path={":registry_id/patient/:patient_id/treatment-session"} element={<PatientSession />} />

diff --git a/apps/cocm-registry/src/components/RegistryCard.tsx b/apps/cocm-registry/src/components/RegistryCard.tsx
@@ -18,13 +18,15 @@ const RegistryCard: React.FC<RegistryCardProps> = (props) => {
       navigate('/registry/' + props.registry.id);
       akello.selectRegistry(props.registry);
     }}>
+      {/*
       <Group justify="space-between">
         <Avatar  radius="xl" />
         <div></div>           
         {
             props.registry.stats['safety_risk'] && <Badge color='red'>Safety Risk</Badge>      
         }           
       </Group>
+      */}
 
       <Text fz="lg" fw={500} mt="md">
         {props.registry.name}
@@ -35,12 +37,14 @@ const RegistryCard: React.FC<RegistryCardProps> = (props) => {
       </Text>      
 
 
+      {/* 
       <Text c="dimmed" fz="sm" mt="md">
         Minutes completed this month:{' '}
         <Text span fw={500} c="bright">
           {props.registry.stats.completed_minutes.toFixed(2)}
         </Text>      
       </Text>
+      */}
       <Text c="dimmed" fz="sm">
         Patients:{' '}
         <Text span fw={500} c="bright">

diff --git a/apps/cocm-registry/src/components/RegistryShell.tsx b/apps/cocm-registry/src/components/RegistryShell.tsx
@@ -62,8 +62,7 @@ const RegistryShell = () => {
                     label="Registry"
                     leftSection={<IconTable size="1rem" stroke={1.5} />}
                     active={window.location.pathname === '/registry/' + akello.getSelectedRegistry()?.id}
-                />
-                {/* 
+                />                
                 <NavLink
                     onClick={() => {
                         navigate('/registry/' + (akello.getSelectedRegistry()?.id ?? '') + '/team');
@@ -72,8 +71,7 @@ const RegistryShell = () => {
                     label="Team"
                     leftSection={<IconUserCircle size="1rem" stroke={1.5} />}
                     active={window.location.pathname === '/registry/' + (akello.getSelectedRegistry()?.id ?? '') + '/team'}
-                />
-                */}
+                />                
                 <NavLink
                     onClick={() => {
                         const selectedRegistry = akello.getSelectedRegistry();
@@ -85,8 +83,7 @@ const RegistryShell = () => {
                     label="Billing Report"
                     leftSection={<IconReportAnalytics size="1rem" stroke={1.5} />}
                     active={window.location.pathname === '/registry/' + akello.getSelectedRegistry()?.id + '/reports'}
-                />
-                {/*
+                />                
                 <NavLink
                     onClick={() => {
                         const selectedRegistry = akello.getSelectedRegistry();
@@ -98,7 +95,7 @@ const RegistryShell = () => {
                     label="Akello Apps"
                     leftSection={<IconRobot size="1rem" stroke={1.5} />}
                     active={window.location.pathname.includes('/registry/' + akello.getSelectedRegistry()?.id + '/apps')}
-                /> */}
+                /> 
             </AppShell.Navbar>
             <AppShell.Main>
                 <Outlet />                

diff --git a/packages/core/pnpm-lock.yaml b/packages/core/pnpm-lock.yaml