Merge pull request #56 from MR-medreport/MED-57

MED-57: update dashboard with real data
2025-08-26 11:31:25 +03:00
parent 5663f41f22 dedb42f15b
commit f5abf2d21e
15 changed files with 344 additions and 162 deletions
--- a/app/home/[account]/_components/team-account-benefit-statistics.tsx
+++ b/app/home/[account]/_components/team-account-benefit-statistics.tsx
@@ -3,24 +3,38 @@ import React from 'react';
 import { redirect } from 'next/navigation';

 import { formatCurrency } from '@/packages/shared/src/utils';
+import { Database } from '@/packages/supabase/src/database.types';
 import { PiggyBankIcon, Settings } from 'lucide-react';
 import { useTranslation } from 'react-i18next';

 import { createPath, pathsConfig } from '@kit/shared/config';
 import { Card, CardTitle } from '@kit/ui/card';
+import { cn } from '@kit/ui/lib/utils';
 import { Button } from '@kit/ui/shadcn/button';
 import { Trans } from '@kit/ui/trans';

 interface TeamAccountBenefitStatisticsProps {
+  employeeCount: number;
  accountSlug: string;
+  companyParams: Database['medreport']['Tables']['company_params']['Row'];
 }

 const StatisticsCard = ({ children }: { children: React.ReactNode }) => {
  return <Card className="p-4">{children}</Card>;
 };

-const StatisticsCardTitle = ({ children }: { children: React.ReactNode }) => {
-  return <CardTitle className="text-sm font-medium">{children}</CardTitle>;
+const StatisticsCardTitle = ({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) => {
+  return (
+    <CardTitle className={cn('text-sm font-medium', className)}>
+      {children}
+    </CardTitle>
+  );
 };

 const StatisticsDescription = ({ children }: { children: React.ReactNode }) => {
@@ -32,7 +46,9 @@ const StatisticsValue = ({ children }: { children: React.ReactNode }) => {
 };

 const TeamAccountBenefitStatistics = ({
+  employeeCount,
  accountSlug,
+  companyParams,
 }: TeamAccountBenefitStatisticsProps) => {
  const {
    i18n: { language },
@@ -74,7 +90,8 @@ const TeamAccountBenefitStatistics = ({
              i18nKey="teams:benefitStatistics.budget.volume"
              values={{
                volume: formatCurrency({
-                  value: 15000,
+                  value:
+                    (Number(companyParams.benefit_amount) || 0) * employeeCount,
                  locale: language,
                  currencyCode: 'EUR',
                }),
@@ -85,11 +102,17 @@ const TeamAccountBenefitStatistics = ({
      </Card>

      <div className="grid flex-2 grid-cols-2 gap-2 sm:grid-cols-3 sm:grid-rows-2">
+        <StatisticsCard>
+          <StatisticsCardTitle className="text-lg font-bold">
+            <Trans i18nKey="teams:benefitStatistics.data.serviceSum" />
+          </StatisticsCardTitle>
+          <StatisticsValue>1800 €</StatisticsValue>
+        </StatisticsCard>
        <StatisticsCard>
          <StatisticsCardTitle>
            <Trans i18nKey="teams:benefitStatistics.data.analysis" />
          </StatisticsCardTitle>
-          <StatisticsValue>18 %</StatisticsValue>
+          <StatisticsValue>200 €</StatisticsValue>
          <StatisticsDescription>
            <Trans
              i18nKey="teams:benefitStatistics.data.reservations"
@@ -101,7 +124,7 @@ const TeamAccountBenefitStatistics = ({
          <StatisticsCardTitle>
            <Trans i18nKey="teams:benefitStatistics.data.doctorsAndSpecialists" />
          </StatisticsCardTitle>
-          <StatisticsValue>22 %</StatisticsValue>
+          <StatisticsValue>200 €</StatisticsValue>
          <StatisticsDescription>
            <Trans
              i18nKey="teams:benefitStatistics.data.reservations"
@@ -113,7 +136,7 @@ const TeamAccountBenefitStatistics = ({
          <StatisticsCardTitle>
            <Trans i18nKey="teams:benefitStatistics.data.researches" />
          </StatisticsCardTitle>
-          <StatisticsValue>20 %</StatisticsValue>
+          <StatisticsValue>200 €</StatisticsValue>
          <StatisticsDescription>
            <Trans
              i18nKey="teams:benefitStatistics.data.reservations"
@@ -122,8 +145,10 @@ const TeamAccountBenefitStatistics = ({
          </StatisticsDescription>
        </StatisticsCard>
        <StatisticsCard>
-          <StatisticsCardTitle>E-konsultatsioon</StatisticsCardTitle>
-          <StatisticsValue>17 %</StatisticsValue>
+          <StatisticsCardTitle>
+            <Trans i18nKey="teams:benefitStatistics.data.eclinic" />
+          </StatisticsCardTitle>
+          <StatisticsValue>200 €</StatisticsValue>
          <StatisticsDescription>
            <Trans
              i18nKey="teams:benefitStatistics.data.reservations"
@@ -131,28 +156,19 @@ const TeamAccountBenefitStatistics = ({
            />
          </StatisticsDescription>
        </StatisticsCard>
-        <Card className="col-span-2 p-4">
+
+        <StatisticsCard>
          <StatisticsCardTitle>
            <Trans i18nKey="teams:benefitStatistics.data.healthResearchPlans" />
          </StatisticsCardTitle>
-          <div className="grid grid-cols-2 gap-2">
-            <div className="border-r">
-              <StatisticsValue>23 %</StatisticsValue>
-              <StatisticsDescription>
-                <Trans
-                  i18nKey="teams:benefitStatistics.data.serviceUsage"
-                  values={{ value: 46 }}
-                />
-              </StatisticsDescription>
-            </div>
-            <div className="ml-4">
-              <StatisticsValue>1800 €</StatisticsValue>
-              <StatisticsDescription>
-                <Trans i18nKey="teams:benefitStatistics.data.serviceSum" />
-              </StatisticsDescription>
-            </div>
-          </div>
-        </Card>
+          <StatisticsValue>200 €</StatisticsValue>
+          <StatisticsDescription>
+            <Trans
+              i18nKey="teams:benefitStatistics.data.serviceUsage"
+              values={{ value: 46 }}
+            />
+          </StatisticsDescription>
+        </StatisticsCard>
      </div>
    </div>
  );
--- a/app/home/[account]/_components/team-account-health-details.tsx
+++ b/app/home/[account]/_components/team-account-health-details.tsx
@@ -1,33 +1,36 @@
 import React from 'react';

+import { Database } from '@/packages/supabase/src/database.types';
+
 import { Card } from '@kit/ui/card';
 import { Trans } from '@kit/ui/trans';
 import { cn } from '@kit/ui/utils';

-import {
-  NormStatus,
-  getAccountHealthDetailsFields,
-} from '../_lib/server/load-team-account-health-details';
+import { getAccountHealthDetailsFields } from '../_lib/server/load-team-account-health-details';
 import { TeamAccountStatisticsProps } from './team-account-statistics';

 const TeamAccountHealthDetails = ({
  memberParams,
+  bmiThresholds,
+  members,
 }: {
  memberParams: TeamAccountStatisticsProps['memberParams'];
+  bmiThresholds: Omit<
+    Database['medreport']['Tables']['bmi_thresholds']['Row'],
+    'id'
+  >[];
+  members: Database['medreport']['Functions']['get_account_members']['Returns'];
 }) => {
-  const accountHealthDetailsFields =
-    getAccountHealthDetailsFields(memberParams);
+  const accountHealthDetailsFields = getAccountHealthDetailsFields(
+    memberParams,
+    bmiThresholds,
+    members,
+  );
  return (
    <div className="grid flex-1 grid-cols-2 gap-4 md:grid-cols-3">
-      {accountHealthDetailsFields.map(({ title, Icon, value, normStatus }) => (
+      {accountHealthDetailsFields.map(({ title, Icon, value, iconBg }) => (
        <Card className="relative p-4" key={title}>
-          <div
-            className={cn('absolute top-2 right-2 rounded-2xl p-2', {
-              'bg-success': normStatus === NormStatus.NORMAL,
-              'bg-warning': normStatus === NormStatus.WARNING,
-              'bg-destructive': normStatus === NormStatus.CRITICAL,
-            })}
-          >
+          <div className={cn('absolute top-2 right-2 rounded-2xl p-2', iconBg)}>
            <Icon color="white" className="stroke-2" />
          </div>
          <h5 className="mt-8 leading-none">
--- a/app/home/[account]/_components/team-account-navigation-menu.tsx
+++ b/app/home/[account]/_components/team-account-navigation-menu.tsx
@@ -1,8 +1,9 @@
 import { useMemo } from 'react';

+import { getTeamAccountSidebarConfig } from '@/packages/shared/src/config';
+
 import { AppLogo } from '@kit/shared/components/app-logo';
 import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container';
-import { getTeamAccountSidebarConfig } from '@kit/shared/config';

 // local imports
 import { TeamAccountWorkspace } from '../_lib/server/team-account-workspace.loader';
--- a/app/home/[account]/_components/team-account-statistics.tsx
+++ b/app/home/[account]/_components/team-account-statistics.tsx
@@ -1,14 +1,25 @@
 'use client';

+import { useState } from 'react';
+
 import { redirect } from 'next/navigation';

 import { Database } from '@/packages/supabase/src/database.types';
-import { ChevronRight, Euro, User } from 'lucide-react';
+import { format } from 'date-fns';
+import { enGB, et } from 'date-fns/locale';
+import { CalendarIcon, ChevronRight, Euro, User } from 'lucide-react';
+import { useTranslation } from 'react-i18next';

+import { createPath, pathsConfig } from '@kit/shared/config';
 import { Card } from '@kit/ui/card';
 import { Trans } from '@kit/ui/makerkit/trans';
-
-import { pathsConfig, createPath } from '@kit/shared/config';
+import { Button } from '@kit/ui/shadcn/button';
+import { Calendar, DateRange } from '@kit/ui/shadcn/calendar';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@kit/ui/shadcn/popover';

 import TeamAccountBenefitStatistics from './team-account-benefit-statistics';
 import TeamAccountHealthDetails from './team-account-health-details';
@@ -19,82 +30,145 @@ export interface TeamAccountStatisticsProps {
    Database['medreport']['Tables']['account_params']['Row'],
    'weight' | 'height'
  >[];
+  bmiThresholds: Omit<
+    Database['medreport']['Tables']['bmi_thresholds']['Row'],
+    'id'
+  >[];
+  members: Database['medreport']['Functions']['get_account_members']['Returns'];
+  companyParams: Database['medreport']['Tables']['company_params']['Row'];
 }

 export default function TeamAccountStatistics({
  teamAccount,
  memberParams,
+  bmiThresholds,
+  members,
+  companyParams,
 }: TeamAccountStatisticsProps) {
+  const [date, setDate] = useState<DateRange | undefined>({
+    from: new Date(),
+    to: new Date(),
+  });
+  const {
+    i18n: { language },
+  } = useTranslation();
+  const dateFormatOptions = {
+    locale: language === 'et' ? et : enGB,
+  };
+
  return (
-    <div
-      className={
-        'animate-in fade-in flex flex-col space-y-4 pb-36 duration-500'
-      }
-    >
-      <TeamAccountBenefitStatistics accountSlug={teamAccount.slug || ''} />
+    <>
+      <div className="mt-4 flex items-center justify-between">
+        <h4 className="font-bold">
+          <Trans
+            i18nKey={'teams:home.headerTitle'}
+            values={{ companyName: teamAccount.name }}
+          />
+        </h4>

-      <h5 className="mt-4 mb-2">
-        <Trans i18nKey="teams:home.healthDetails" />
-      </h5>
-      <div className="flex flex-col gap-2 sm:flex-row">
-        <TeamAccountHealthDetails memberParams={memberParams} />
+        <Popover>
+          <PopoverTrigger asChild>
+            <Button variant="outline" data-empty={!date}>
+              <CalendarIcon />
+              {date?.from && date?.to ? (
+                `${format(date.from, 'd MMMM yyyy', dateFormatOptions)} - ${format(date.to, 'd MMMM yyyy', dateFormatOptions)}`
+              ) : (
+                <span>
+                  <Trans i18nKey="common:formField.selectDate" />
+                </span>
+              )}
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent className="w-auto p-0">
+            <Calendar
+              mode="range"
+              selected={date}
+              onSelect={setDate}
+              locale={language === 'et' ? et : enGB}
+            />
+          </PopoverContent>
+        </Popover>
+      </div>

-        <div className="flex flex-col gap-2">
-          <Card
-            variant="gradient-success"
-            className="border-success/50 hover:bg-success/20 relative flex h-full cursor-pointer flex-col justify-center px-6 py-4 transition-colors"
-            onClick={() =>
-              redirect(
-                createPath(
-                  pathsConfig.app.accountMembers,
-                  teamAccount.slug || '',
-                ),
-              )
-            }
-          >
-            <div className="flex flex-col">
+      <div
+        className={
+          'animate-in fade-in flex flex-col space-y-4 pb-36 duration-500'
+        }
+      >
+        <TeamAccountBenefitStatistics
+          employeeCount={members.length}
+          accountSlug={teamAccount.slug || ''}
+          companyParams={companyParams}
+        />
+
+        <h5 className="mt-4 mb-2">
+          <Trans i18nKey="teams:home.healthDetails" />
+        </h5>
+
+        <div className="flex flex-col gap-2 sm:flex-row">
+          <TeamAccountHealthDetails
+            memberParams={memberParams}
+            bmiThresholds={bmiThresholds}
+            members={members}
+          />
+
+          <div className="flex flex-col gap-2">
+            <Card
+              variant="gradient-success"
+              className="border-success/50 hover:bg-success/20 relative flex h-full cursor-pointer flex-col justify-center px-6 py-4 transition-colors"
+              onClick={() =>
+                redirect(
+                  createPath(
+                    pathsConfig.app.accountMembers,
+                    teamAccount.slug || '',
+                  ),
+                )
+              }
+            >
+              <div className="flex flex-col">
+                <div className="border-input absolute top-2 right-2 rounded-md border bg-white p-3">
+                  <ChevronRight className="stroke-2" />
+                </div>
+                <div className="bg-primary/10 w-fit rounded-2xl p-2">
+                  <User color="green" className="stroke-2" />
+                </div>
+                <span className="mt-4 mb-2 text-lg font-semibold">
+                  <Trans i18nKey="teams:home.membersSettingsButtonTitle" />
+                </span>
+                <p className="text-muted-foreground text-sm">
+                  <Trans i18nKey="teams:home.membersSettingsButtonDescription" />
+                </p>
+              </div>
+            </Card>
+
+            <Card
+              variant="gradient-warning"
+              className="border-warning/40 hover:bg-warning/20 relative flex h-full cursor-pointer flex-col justify-center px-6 py-4 transition-colors"
+              onClick={() =>
+                redirect(
+                  createPath(
+                    pathsConfig.app.accountBilling,
+                    teamAccount.slug || '',
+                  ),
+                )
+              }
+            >
              <div className="border-input absolute top-2 right-2 rounded-md border bg-white p-3">
                <ChevronRight className="stroke-2" />
              </div>
-              <div className="bg-primary/10 w-fit rounded-2xl p-2">
-                <User color="green" className="stroke-2" />
+              <div className="bg-warning/10 w-fit rounded-2xl p-2">
+                <Euro color="orange" className="stroke-2" />
              </div>
              <span className="mt-4 mb-2 text-lg font-semibold">
-                <Trans i18nKey="teams:home.membersSettingsButtonTitle" />
+                <Trans i18nKey="teams:home.membersBillingButtonTitle" />
              </span>
              <p className="text-muted-foreground text-sm">
-                <Trans i18nKey="teams:home.membersSettingsButtonDescription" />
+                <Trans i18nKey="teams:home.membersBillingButtonDescription" />
              </p>
-            </div>
-          </Card>
-
-          <Card
-            variant="gradient-warning"
-            className="border-warning/40 hover:bg-warning/20 relative flex h-full cursor-pointer flex-col justify-center px-6 py-4 transition-colors"
-            onClick={() =>
-              redirect(
-                createPath(
-                  pathsConfig.app.accountBilling,
-                  teamAccount.slug || '',
-                ),
-              )
-            }
-          >
-            <div className="border-input absolute top-2 right-2 rounded-md border bg-white p-3">
-              <ChevronRight className="stroke-2" />
-            </div>
-            <div className="bg-warning/10 w-fit rounded-2xl p-2">
-              <Euro color="orange" className="stroke-2" />
-            </div>
-            <span className="mt-4 mb-2 text-lg font-semibold">
-              <Trans i18nKey="teams:home.membersBillingButtonTitle" />
-            </span>
-            <p className="text-muted-foreground text-sm">
-              <Trans i18nKey="teams:home.membersBillingButtonDescription" />
-            </p>
-          </Card>
+            </Card>
+          </div>
        </div>
      </div>
-    </div>
+    </>
  );
 }
--- a/app/home/[account]/_lib/server/load-team-account-health-details.ts
+++ b/app/home/[account]/_lib/server/load-team-account-health-details.ts
@@ -1,8 +1,14 @@
 import React from 'react';

+import { Database } from '@/packages/supabase/src/database.types';
+import Isikukood from 'isikukood';
 import { Clock, TrendingUp, User } from 'lucide-react';

-import { bmiFromMetric } from '~/lib/utils';
+import {
+  bmiFromMetric,
+  getBmiBackgroundColor,
+  getBmiStatus,
+} from '~/lib/utils';

 import { TeamAccountStatisticsProps } from '../../_components/team-account-statistics';

@@ -14,66 +20,89 @@ interface AccountHealthDetailsField {
    color?: string;
    className?: string;
  }>;
-  normStatus: NormStatus;
-}
-
-export enum NormStatus {
-  CRITICAL = 'CRITICAL',
-  WARNING = 'WARNING',
-  NORMAL = 'NORMAL',
+  iconBg: string;
 }

 export const getAccountHealthDetailsFields = (
  memberParams: TeamAccountStatisticsProps['memberParams'],
+  bmiThresholds: Omit<
+    Database['medreport']['Tables']['bmi_thresholds']['Row'],
+    'id'
+  >[],
+  members: Database['medreport']['Functions']['get_account_members']['Returns'],
 ): AccountHealthDetailsField[] => {
-  const averageBMI = (
-    memberParams.reduce((sum, { height, weight }) => {
-      return bmiFromMetric(weight ?? 0, height ?? 0) + sum;
-    }, 0) / memberParams.length
-  ).toFixed(0);
+  const avarageWeight =
+    memberParams.reduce((sum, r) => sum + r.weight!, 0) / memberParams.length;
+  const avarageHeight =
+    memberParams.reduce((sum, r) => sum + r.height!, 0) / memberParams.length;
+  const avarageAge =
+    members.reduce((sum, r) => {
+      const person = new Isikukood(r.personal_code);
+      return sum + person.getAge();
+    }, 0) / members.length;
+  const numberOfMaleMembers = members.filter((r) => {
+    const person = new Isikukood(r.personal_code);
+    return person.getGender() === 'male';
+  }).length;
+  const numberOfFemaleMembers = members.filter((r) => {
+    const person = new Isikukood(r.personal_code);
+    return person.getGender() === 'female';
+  }).length;
+  const averageBMI = bmiFromMetric(avarageWeight, avarageHeight);
+  const bmiStatus = getBmiStatus(bmiThresholds, {
+    age: avarageAge,
+    height: avarageHeight,
+    weight: avarageWeight,
+  });
+  const malePercentage = members.length
+    ? (numberOfMaleMembers / members.length) * 100
+    : 0;
+  const femalePercentage = members.length
+    ? (numberOfFemaleMembers / members.length) * 100
+    : 0;

  return [
    {
      title: 'teams:healthDetails.women',
-      value: `50% (${memberParams.length})`,
+      value: `${femalePercentage}% (${numberOfFemaleMembers})`,
      Icon: User,
-      normStatus: NormStatus.NORMAL,
+      iconBg: 'bg-success',
    },
    {
      title: 'teams:healthDetails.men',
-      value: `50% (${memberParams.length})`,
+      value: `${malePercentage}% (${numberOfMaleMembers})`,
      Icon: User,
-      normStatus: NormStatus.NORMAL,
+      iconBg: 'bg-success',
    },
    {
      title: 'teams:healthDetails.avgAge',
-      value: '56',
+      value: avarageAge.toFixed(0),
      Icon: Clock,
-      normStatus: NormStatus.NORMAL,
+      iconBg: 'bg-success',
    },
    {
      title: 'teams:healthDetails.bmi',
      value: averageBMI,
      Icon: TrendingUp,
-      normStatus: NormStatus.WARNING,
+      iconBg: getBmiBackgroundColor(bmiStatus),
    },
    {
      title: 'teams:healthDetails.cholesterol',
-      value: '6.1',
+      value: '-',
      Icon: TrendingUp,
-      normStatus: NormStatus.WARNING,
+      iconBg: 'bg-warning',
    },
    {
      title: 'teams:healthDetails.vitaminD',
-      value: '76',
+      value: '-',
      Icon: TrendingUp,
-      normStatus: NormStatus.NORMAL,
+      iconBg: 'bg-warning',
    },
    {
      title: 'teams:healthDetails.smokers',
-      value: '22%',
+      value: '-',
      Icon: TrendingUp,
-      normStatus: NormStatus.CRITICAL,
+      iconBg: 'bg-warning',
    },
  ];
 };
--- a/app/home/[account]/page.tsx
+++ b/app/home/[account]/page.tsx
@@ -2,18 +2,21 @@

 import { use } from 'react';

+import { createAccountsApi } from '@/packages/features/accounts/src/server/api';
 import { CompanyGuard } from '@/packages/features/team-accounts/src/components';
 import { createTeamAccountsApi } from '@/packages/features/team-accounts/src/server/api';
 import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';

 import { PageBody } from '@kit/ui/page';
-import { Trans } from '@kit/ui/trans';

 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
+import { withI18n } from '~/lib/i18n/with-i18n';
+import {
+  PAGE_VIEW_ACTION,
+  createPageViewLog,
+} from '~/lib/services/audit/pageView.service';

 import { Dashboard } from './_components/dashboard';
-import { TeamAccountLayoutPageHeader } from './_components/team-account-layout-page-header';
-import { withI18n } from '~/lib/i18n/with-i18n';

 interface TeamAccountHomePageProps {
  params: Promise<{ account: string }>;
@@ -31,25 +34,32 @@ export const generateMetadata = async () => {
 function TeamAccountHomePage({ params }: TeamAccountHomePageProps) {
  const account = use(params).account;
  const client = getSupabaseServerClient();
-  const api = createTeamAccountsApi(client);
-  const teamAccount = use(api.getTeamAccount(account));
-  const { memberParams } = use(api.getMembers(account));
+  const teamAccountsApi = createTeamAccountsApi(client);
+  const accountsApi = createAccountsApi(client);
+  const teamAccount = use(teamAccountsApi.getTeamAccount(account));
+  const { memberParams, members } = use(teamAccountsApi.getMembers(account));
+  const bmiThresholds = use(accountsApi.fetchBmiThresholds());
+  const companyParams = use(
+    teamAccountsApi.getTeamAccountParams(teamAccount.id),
+  );
+
+  use(
+    createPageViewLog({
+      accountId: teamAccount.id,
+      action: PAGE_VIEW_ACTION.VIEW_TEAM_ACCOUNT_DASHBOARD,
+    }),
+  );

  return (
-    <>
-      <TeamAccountLayoutPageHeader
-        title={
-          <Trans
-            i18nKey={'teams:home.headerTitle'}
-            values={{ companyName: account }}
-          />
-        }
+    <PageBody>
+      <Dashboard
+        teamAccount={teamAccount}
+        memberParams={memberParams}
+        bmiThresholds={bmiThresholds}
+        members={members}
+        companyParams={companyParams}
      />
-
-      <PageBody>
-        <Dashboard teamAccount={teamAccount} memberParams={memberParams} />
-      </PageBody>
-    </>
+    </PageBody>
  );
 }

--- a/app/select-package/page.tsx
+++ b/app/select-package/page.tsx
@@ -1,20 +1,19 @@
 import Link from 'next/link';

-import SelectAnalysisPackages from '@kit/shared/components/select-analysis-packages';
 import { CaretRightIcon } from '@radix-ui/react-icons';
 import { Scale } from 'lucide-react';

+import { MedReportLogo } from '@kit/shared/components/med-report-logo';
+import SelectAnalysisPackages from '@kit/shared/components/select-analysis-packages';
+import { pathsConfig } from '@kit/shared/config';
 import { Button } from '@kit/ui/button';
 import { Trans } from '@kit/ui/trans';

 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';

-
 import ComparePackagesModal from '../home/(user)/_components/compare-packages-modal';
 import { loadAnalysisPackages } from '../home/(user)/_lib/server/load-analysis-packages';
-import { MedReportLogo } from '@kit/shared/components/med-report-logo';
-import { pathsConfig } from '@kit/shared/config';

 export const generateMetadata = async () => {
  const { t } = await createI18nServerInstance();
--- a/lib/services/audit/pageView.service.ts
+++ b/lib/services/audit/pageView.service.ts
@@ -4,6 +4,7 @@ export enum PAGE_VIEW_ACTION {
  VIEW_ANALYSIS_RESULTS = 'VIEW_ANALYSIS_RESULTS',
  REGISTRATION_SUCCESS = 'REGISTRATION_SUCCESS',
  VIEW_ORDER_ANALYSIS = 'VIEW_ORDER_ANALYSIS',
+  VIEW_TEAM_ACCOUNT_DASHBOARD = 'VIEW_TEAM_ACCOUNT_DASHBOARD',
 }

 export const createPageViewLog = async ({
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -71,15 +71,13 @@ export function getBmiStatus(
 export function getBmiBackgroundColor(bmiStatus: BmiCategory | null): string {
  switch (bmiStatus) {
    case BmiCategory.UNDER_WEIGHT:
+    case BmiCategory.OVER_WEIGHT:
      return 'bg-warning';
    case BmiCategory.NORMAL:
      return 'bg-success';
-    case BmiCategory.OVER_WEIGHT:
-      return 'bg-warning';
    case BmiCategory.VERY_OVERWEIGHT:
-      return 'bg-destructive';
    case BmiCategory.OBESE:
-      return 'bg-error';
+      return 'bg-destructive';
    default:
      return 'bg-success';
  }
--- a/packages/features/team-accounts/src/server/api.ts
+++ b/packages/features/team-accounts/src/server/api.ts
@@ -291,6 +291,7 @@ export class TeamAccountsApi {
      .single();

    if (error) {
+      console.warn('Error fetching company params', error);
      throw error;
    }

--- a/packages/shared/src/components/root-providers.tsx
+++ b/packages/shared/src/components/root-providers.tsx
@@ -18,7 +18,6 @@ import { VersionUpdater } from '@kit/ui/version-updater';

 import { i18nResolver } from '../../../../lib/i18n/i18n.resolver';
 import { getI18nSettings } from '../../../../lib/i18n/i18n.settings';
-
 import { ReactQueryProvider } from './react-query-provider';

 const captchaSiteKey = authConfig.captchaTokenSiteKey;
--- a/packages/supabase/src/database.types.ts
+++ b/packages/supabase/src/database.types.ts
@@ -1778,6 +1778,7 @@ export type Database = {
          primary_owner_user_id: string
          name: string
          email: string
+          personal_code: string
          picture_url: string
          created_at: string
          updated_at: string
--- a/public/locales/et/common.json
+++ b/public/locales/et/common.json
@@ -122,7 +122,8 @@
    "weight": "Kaal",
    "height": "Pikkus",
    "occurance": "Toetuse sagedus",
-    "amount": "Summa"
+    "amount": "Summa",
+    "selectDate": "Vali kuupäev"
  },
  "wallet": {
    "balance": "Sinu MedReporti konto seis",
@@ -135,4 +136,4 @@
  "previous": "Eelmine",
  "next": "Järgmine",
  "invalidDataError": "Vigased andmed"
-}
+}
--- a/public/locales/et/teams.json
+++ b/public/locales/et/teams.json
@@ -1,7 +1,7 @@
 {
  "home": {
    "pageTitle": "Ülevaade",
-    "headerTitle": "{{companyName}} tervise ülevaade",
+    "headerTitle": "{{companyName}} Tervisekassa kokkuvõte",
    "healthDetails": "Ettevõtte terviseandmed",
    "membersSettingsButtonTitle": "Halda töötajaid",
    "membersSettingsButtonDescription": "Lisa, muuda või eemalda töötajaid.",
@@ -31,13 +31,14 @@
      "volume": "Eelarve maht {{volume}}"
    },
    "data": {
-      "reservations": "{{value}} broneeringut",
+      "reservations": "{{value}} teenust",
      "analysis": "Analüüsid",
      "doctorsAndSpecialists": "Eriarstid ja spetsialistid",
      "researches": "Uuringud",
      "healthResearchPlans": "Terviseuuringute paketid",
      "serviceUsage": "{{value}} teenuse kasutust",
-      "serviceSum": "Teenuste summa"
+      "serviceSum": "Teenuste summa",
+      "eclinic": "Digikliinik"
    }
  },
  "healthDetails": {
--- a/supabase/migrations/20250825110100_improve_members_queries.sql
+++ b/supabase/migrations/20250825110100_improve_members_queries.sql
@@ -0,0 +1,48 @@
+DROP FUNCTION IF EXISTS medreport.get_account_members(text);
+
+CREATE OR REPLACE FUNCTION medreport.get_account_members(account_slug text)
+ RETURNS TABLE(
+    id uuid, 
+    user_id uuid, 
+    account_id uuid, 
+    role character varying, 
+    role_hierarchy_level integer, 
+    primary_owner_user_id uuid, 
+    name character varying, 
+    email character varying, 
+    personal_code text,
+    picture_url character varying, 
+    created_at timestamp with time zone, 
+    updated_at timestamp with time zone
+)
+ LANGUAGE plpgsql
+ SET search_path TO ''
+AS $function$begin
+    return QUERY
+        select
+            acc.id,
+            am.user_id,
+            am.account_id,
+            am.account_role,
+            r.hierarchy_level,
+            a.primary_owner_user_id,
+            acc.name,
+            acc.email,
+            acc.personal_code,
+            acc.picture_url,
+            am.created_at,
+            am.updated_at
+        from
+            medreport.accounts_memberships am
+                join medreport.accounts a on a.id = am.account_id
+                join medreport.accounts acc on acc.id = am.user_id
+                join medreport.roles r on r.name = am.account_role
+        where
+                a.slug = account_slug;
+
+end;$function$
+;
+
+grant
+    execute on function medreport.get_account_members (text) to authenticated,
+    service_role;