Merge pull request #30 from ElemarJR/main

Fixing filters on the performance analysis and improving the search
eximiaco-labs · Nov 6, 2024 · bde1eb0 · bde1eb0
2 parents cbe7e94 + 35760bd
commit bde1eb0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/backend/src/models/analytics/performance_analysis.py b/backend/src/models/analytics/performance_analysis.py
@@ -396,7 +396,7 @@ def calculate_entity_summary(regular_cases: List[OneWeekRegularCasePerformanceSu
 
         case_summaries = [calculate_case_metrics(case, by_case_hours.get(case.id, 0), by_case_month_hours.get(case.id, 0)) 
                          for case in cases
-                         if (case.weekly_approved_hours and case.weekly_approved_hours > 0) or
+                         if (case.is_active and case.weekly_approved_hours and case.weekly_approved_hours > 0) or
                             (by_case_hours.get(case.id, 0) > 0)]
 
         regular_cases = [case for case in case_summaries if isinstance(case, OneWeekRegularCasePerformanceSummary)]

diff --git a/frontend/src/app/components/OmniCommands.tsx b/frontend/src/app/components/OmniCommands.tsx
@@ -18,7 +18,7 @@ import {
 import { Button } from "@/components/ui/button"
 import { MagnifyingGlassIcon } from "@radix-ui/react-icons"
 import { useQuery, gql } from "@apollo/client"
-import { UserIcon, BriefcaseIcon, UsersIcon, HandshakeIcon } from "lucide-react"
+import { UserIcon, BriefcaseIcon, UsersIcon, HandshakeIcon, TrophyIcon } from "lucide-react"
 
 const GET_CONSULTANTS = gql`
   query GetConsultants {
@@ -38,6 +38,13 @@ const GET_CONSULTANTS = gql`
       slug
       name
     }
+    cases(onlyActives: true) {
+      slug
+      title
+      tracker {
+        name
+      }
+    }
   }
 `
 
@@ -176,6 +183,28 @@ export function OmniCommands({ open, setOpen }: OmniCommandsProps) {
             </CommandItem>
           ))}
         </CommandGroup>
+
+        <CommandGroup heading="Cases">
+          {data?.cases.map((caseItem: { slug: string, title: string, tracker: { name: string }[] }) => (
+            <React.Fragment key={caseItem.slug}>
+              <CommandItem
+                onSelect={() => runCommand(() => router.push(`/about-us/cases/${caseItem.slug}`))}
+              >
+                <TrophyIcon className="mr-2 h-4 w-4" />
+                {caseItem.title}
+              </CommandItem>
+              {caseItem.tracker?.map((tracker, index) => (
+                <CommandItem
+                  key={`${caseItem.slug}-${index}`}
+                  onSelect={() => runCommand(() => router.push(`/about-us/cases/${caseItem.slug}`))}
+                >
+                  <TrophyIcon className="mr-2 h-4 w-4" />
+                  {tracker.name}
+                </CommandItem>
+              ))}
+            </React.Fragment>
+          ))}
+        </CommandGroup>
       </CommandList>
     </CommandDialog>
   )