Added creationDate column to student and user tables bcs Accounts Wit…

…hout Family table needs it

server/entities/student.ts

@@ -1,4 +1,4 @@
-import { Entity, Column, ManyToOne, OneToMany, PrimaryGeneratedColumn, JoinColumn } from 'typeorm';
+import { Entity, Column, ManyToOne, OneToMany, PrimaryGeneratedColumn, JoinColumn, CreateDateColumn } from 'typeorm';
 
 import { Classroom } from './classroom';
 import { UserToStudent } from './userToStudent';
@@ -8,6 +8,9 @@ export class Student {
   @PrimaryGeneratedColumn()
   public id: number;
 
+  @CreateDateColumn()
+  createdAt: Date;
+
   @Column({ type: 'varchar', length: 100, nullable: true })
   public firstname: string;
 

server/entities/user.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryGeneratedColumn, ManyToOne, JoinColumn, OneToMany, ManyToMany, JoinTable } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn, ManyToOne, JoinColumn, OneToMany, ManyToMany, JoinTable, CreateDateColumn } from 'typeorm';
 
 import type { Country } from '../../types/country.type';
 import { UserType } from '../../types/user.type';
@@ -19,6 +19,9 @@ export class User implements UserInterface {
   @PrimaryGeneratedColumn()
   public id: number;
 
+  @CreateDateColumn()
+  createdAt: Date;
+
   @Column({ type: 'varchar', length: 255, unique: true })
   public email: string;
 

server/stats/villageStats.ts

@@ -52,6 +52,7 @@ export const getFamiliesWithoutAccount = async (villageId: number) => {
       'student.firstname AS student_firstname',
       'student.lastname AS student_lastname',
       'student.id AS student_id',
+      'student.createdAt as student_creation_date',
       'village.name AS village_name',
     ])
     .getRawMany();
@@ -65,7 +66,7 @@ export const getFloatingAccounts = async (villageId: number) => {
     .where('user.villageId = :villageId', { villageId })
     .andWhere('user.hasStudentLinked = 0')
     .andWhere('user.type = 4')
-    .select(['user.id', 'user.firstname', 'user.lastname', 'user.language', 'user.email'])
+    .select(['user.id', 'user.firstname', 'user.lastname', 'user.language', 'user.email', 'user.createdAt'])
     .getMany();
   return floatingAccounts;
 };

src/components/admin/dashboard-statistics/VillageStats.tsx

@@ -14,6 +14,7 @@ import styles from './styles/charts.module.css';
 import { useGetVillagesStats } from 'src/api/statistics/statistics.get';
 import { useCountries } from 'src/services/useCountries';
 import { useVillages } from 'src/services/useVillages';
+import { formatDate } from 'src/utils';
 import type { FamiliesWithoutAccount, OneVillageTableRow } from 'types/statistics.type';
 import type { VillageFilter } from 'types/village.type';
 
@@ -96,7 +97,7 @@ const VillageStats = () => {
         vm: row.village_name,
         classroom: row.classroom_name,
         country: row.classroom_country,
-        creationDate: 'À venir',
+        creationDate: row.student_creation_date ? formatDate(row.student_creation_date) : 'Donnée non disponible',
       };
     });
   }

src/utils/index.ts

@@ -106,6 +106,15 @@ export function countryToFlag(isoCode: string): string {
     : isoCode;
 }
 
+export function formatDate(isoString: string): string {
+  const date = new Date(isoString);
+  const day = date.getUTCDate().toString().padStart(2, '0');
+  const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
+  const year = date.getUTCFullYear();
+  const formattedDate = `${day}/${month}/${year}`;
+  return formattedDate;
+}
+
 /**
  * Returns a random token. Browser only!
  * @param length length of the returned token.

types/statistics.type.ts

@@ -38,6 +38,7 @@ export interface FamiliesWithoutAccount {
   student_id: number;
   student_firstname: string;
   student_lastname: string;
+  student_creation_date: string | null;
   village_name: string;
   classroom_name: string;
   classroom_country: string;
@@ -49,6 +50,7 @@ export interface FloatingAccount {
   firstname: string;
   lastname: string;
   language: string;
+  createdAt: string | null;
 }
 
 export interface OneVillageTableRow {