Added tables & corresponding requests for coutry tab

parlemonde · Dec 5, 2024 · 337e0cd · 337e0cd
1 parent 5118ed9
commit 337e0cd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/server/controllers/statistics.ts b/server/controllers/statistics.ts
@@ -97,8 +97,8 @@ statisticsController.get({ path: '/countries/:countryId' }, async (_req, res) =>
     familyAccountsCount: await getFamilyAccountsCountForCountry(countryId, phase),
     childrenCodesCount: await getChildrenCodesCountForCountry(countryId, phase),
     connectedFamiliesCount: await getConnectedFamiliesCountForCountry(countryId, phase),
-    //familiesWithoutAccount: await getFamiliesWithoutAccountForCountry(countryId),
-    //floatingAccounts: await getFloatingAccountsForCountry(countryId),
+    familiesWithoutAccount: await getFamiliesWithoutAccountForCountry(countryId),
+    floatingAccounts: await getFloatingAccountsForCountry(countryId),
   });
 });
 

diff --git a/server/stats/countryStats.ts b/server/stats/countryStats.ts
@@ -28,7 +28,7 @@ export const getConnectedFamiliesCountForCountry = async (countryId: string, pha
 };
 
 export const getFamiliesWithoutAccountForCountry = async (countryId: string) => {
-  return getFamiliesWithoutAccount('classroom.villageId = :villageId', { countryId });
+  return getFamiliesWithoutAccount('classroom.countryCode = :countryId', { countryId });
 };
 
 export const getFloatingAccountsForCountry = async (countryId: string) => {

diff --git a/server/stats/queryStatsByFilter.ts b/server/stats/queryStatsByFilter.ts
@@ -67,10 +67,11 @@ export const getConnectedFamiliesCount = async (filterParams: StatsFilterParams)
 };
 
 export const getFloatingAccounts = async (filterParams: StatsFilterParams) => {
-  const { villageId } = filterParams;
+  const { villageId, countryId } = filterParams;
   const query = userRepository.createQueryBuilder('user').where('user.hasStudentLinked = 0').andWhere('user.type = 4');
 
   if (villageId) query.andWhere('user.villageId = :villageId', { villageId });
+  if (countryId) query.andWhere('user.countryCode = :countryId', { countryId });
 
   query.select(['user.id', 'user.firstname', 'user.lastname', 'user.language', 'user.email', 'user.createdAt']);
   const floatingAccounts = await query.getMany();

diff --git a/src/components/admin/dashboard-statistics/CountryStats.tsx b/src/components/admin/dashboard-statistics/CountryStats.tsx
@@ -20,8 +20,8 @@ import { mockClassroomsStats, mockConnectionsStats } from './mocks/mocks';
 import { PelicoCard } from './pelico-card';
 import styles from './styles/charts.module.css';
 import { sumContribution } from './utils/sumData';
-import { createFamiliesWithoutAccountRows } from './utils/tableCreator';
-import { FamiliesWithoutAccountHeaders } from './utils/tableHeaders';
+import { createFamiliesWithoutAccountRows, createFloatingAccountsRows } from './utils/tableCreator';
+import { FamiliesWithoutAccountHeaders, FloatingAccountsHeaders } from './utils/tableHeaders';
 import { useGetCountriesStats } from 'src/api/statistics/statistics.get';
 import { useCountries } from 'src/services/useCountries';
 import type { OneVillageTableRow } from 'types/statistics.type';
@@ -48,11 +48,16 @@ const CountryStats = () => {
   const countriesStats = useGetCountriesStats(selectedCountry, selectedPhase);
 
   const [familiesWithoutAccountRows, setFamiliesWithoutAccountRows] = React.useState<Array<OneVillageTableRow>>([]);
+  const [floatingAccountsRows, setFloatingAccountsRows] = React.useState<Array<OneVillageTableRow>>([]);
   React.useEffect(() => {
     if (countriesStats.data?.familiesWithoutAccount) {
       setFamiliesWithoutAccountRows(createFamiliesWithoutAccountRows(countriesStats.data?.familiesWithoutAccount));
     }
-  }, [countriesStats.data?.familiesWithoutAccount]);
+    if (countriesStats.data?.floatingAccounts) {
+      setFloatingAccountsRows([]);
+      setFloatingAccountsRows(createFloatingAccountsRows(countriesStats.data?.floatingAccounts));
+    }
+  }, [countriesStats.data?.familiesWithoutAccount, countriesStats.data?.floatingAccounts]);
 
   const handleCountryChange = (country: string) => {
     setSelectedCountry(country);
@@ -224,6 +229,13 @@ const CountryStats = () => {
               columns={FamiliesWithoutAccountHeaders}
               titleContent={`À surveiller : comptes non créés (${familiesWithoutAccountRows.length})`}
             />
+            <OneVillageTable
+              admin={false}
+              emptyPlaceholder={<p>{'Pas de données'}</p>}
+              data={floatingAccountsRows}
+              columns={FloatingAccountsHeaders}
+              titleContent={`À surveiller : comptes flottants (${floatingAccountsRows.length})`}
+            />
             <Box
               className={styles.classroomStats}
               sx={{