OnlyPapy98/pmu-plateforme-jeux-admin-plr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first step for plr game platform

Browse Source
This commit is contained in:
OnlyPapy98
2025-12-29 13:56:18 +01:00
parent 169b5ca412
commit ed79cae77d
40 changed files with 620 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/core/interfaces/resultat.ts
View File

@@ -1,5 +1,13 @@
import { Course } from './course';
export enum ResultatStatut {
PROVISOIRE,
OFFICIEL,
ANNULE,
EN_ATTENTE
}
export interface Resultat {
id: string;
course: Course;
@@ -8,7 +16,7 @@ export interface Resultat {
* The backend returns an array of strings/numbers (cheval numbers);
* in the UI we normalize them to plain numbers.
*/
ordreArrivee: number[];
ordreArrivee: string;
/**
* Chevaux en dead-heat (ex aequo), represented by their numbers.
*/
@@ -26,33 +34,24 @@ export interface Resultat {
// API response structure (course may be just an ID in some cases)
export interface ResultatApiResponse {
id: string | number;
course: Course | string | number;
/**
* In the raw API this is an array of strings/numbers.
*/
ordreArrivee: (string | number)[];
chevauxDeadHeat: (string | number)[];
totalMises: number;
masseAPartager: number;
prelevementsLegaux: number;
montantRembourse: number;
montantCagnotte: number;
adeadHeat: boolean;
courseId: string | number;
ordreArrivee: string;
courseNom: string;
courseNumero: number;
reunionNumero:number;
hippodromeNom: string;
statut: ResultatStatut;
datePublication?: string;
dateAnnulation?: string;
dateValidation?: string;
createdAt?: string;
updatedAt?: string;
}
// POST payload structure
export interface CreateResultatPayload {
course: {
id: string | number;
};
ordreArrivee: string[];
chevauxDeadHeat?: (string | number)[];
totalMises?: number;
masseAPartager?: number;
prelevementsLegaux?: number;
montantRembourse?: number;
montantCagnotte?: number;
adeadHeat?: boolean;
courseId: number;
statut: ResultatStatut;
ordreArrivee: string;
notes?: string
}

6
src/app/core/services/agent-limit.ts
View File

@@ -108,7 +108,7 @@ export class AgentLimitService {
let httpParams = new HttpParams();
if (params) {
if (params.page) httpParams = httpParams.set('page', params.page.toString());
if (params.perPage) httpParams = httpParams.set('perPage', params.perPage.toString());
if (params.size) httpParams = httpParams.set('size', params.size.toString());
if (params.search) httpParams = httpParams.set('search', params.search);
if (params.sortKey) httpParams = httpParams.set('sortKey', params.sortKey);
if (params.sortDir) httpParams = httpParams.set('sortDir', params.sortDir);
@@ -127,7 +127,7 @@ export class AgentLimitService {
return normalizePage<AgentLimit>(
{ data: limits, meta: { total: limits.length } },
params.page || 1,
params.perPage || 10
params.size || 10
);
}
// Otherwise return all as single page
@@ -207,7 +207,7 @@ export class AgentLimitService {
// First, find the previous default limit
return this.list({
page: 1,
perPage: 1000,
size: 1000,
search: '',
sortKey: 'code',
sortDir: 'asc',

6
src/app/core/services/agent.ts
View File

@@ -274,7 +274,7 @@ export class AgentService {
let httpParams = new HttpParams();
if (params) {
if (params.page) httpParams = httpParams.set('page', params.page.toString());
if (params.perPage) httpParams = httpParams.set('perPage', params.perPage.toString());
if (params.size) httpParams = httpParams.set('perPage', params.size.toString());
if (params.search) httpParams = httpParams.set('search', params.search);
if (params.sortKey) httpParams = httpParams.set('sortKey', params.sortKey);
if (params.sortDir) httpParams = httpParams.set('sortDir', params.sortDir);
@@ -296,7 +296,7 @@ export class AgentService {
return normalizePage<Agent>(
{ data: agents, meta: { total: agents.length } },
params.page || 1,
params.perPage || 10
params.size || 10
);
}
// Otherwise return all as single page
@@ -445,7 +445,7 @@ export class AgentService {
// Get all agents first
return this.list({
page: 1,
perPage: 10000,
size: 10000,
search: '',
sortKey: 'code',
sortDir: 'asc',

2
src/app/core/services/course.ts
View File

@@ -59,7 +59,7 @@ export class CourseService {
return isNgrok ? { 'ngrok-skip-browser-warning': 'true' } : {};
}
list(params: ListParams, usePaginationEndpoint: boolean = true): Observable<PagedResult<Course>> {
list(params: ListParams): Observable<PagedResult<Course>> {
const coursesList = this.http.get<PagedResult<CourseApiResponse>>(this.apiUrl, {
headers: this.getNgrokHeaders(),
params: this.servivesUtil.getParamsFromModel(params),

126
src/app/core/services/resultat.ts
View File

@@ -1,6 +1,8 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable, of, forkJoin } from 'rxjs';
import { PaginatedHttpService } from '@shared/paging/paginated-http.service';
import { ListParams, PagedResult } from '@shared/paging/paging';
import { map, catchError, switchMap } from 'rxjs/operators';
import { Resultat, ResultatApiResponse, CreateResultatPayload } from '../interfaces/resultat';
import { Course } from '../interfaces/course';
@@ -8,13 +10,20 @@ import { CourseService } from './course';
import { environment } from 'src/environments/environment.development';
const USE_SERVER = true;
const API_BASE = '/api/v1/resultat';
const API_BASE = '/api/resultats';
@Injectable({ providedIn: 'root' })
export class ResultatService {
private apiUrl = environment.apiBaseUrl + API_BASE;
constructor(private http: HttpClient, private courseService: CourseService) {}
constructor(private http: HttpClient, private courseService: CourseService, private pager: PaginatedHttpService) {}
// Fetch raw paginated resultats from the backend and normalize paging
listRawPaged(params: ListParams): Observable<PagedResult<ResultatApiResponse>> {
const url = this.apiUrl;
// Delegate to shared paginated HTTP helper (Spring-style defaults)
return this.pager.fetch<ResultatApiResponse>(url, params);
}
private getNgrokHeaders(): Record<string, string> {
const isNgrok =
@@ -31,11 +40,8 @@ export class ResultatService {
.get<ResultatApiResponse>(`${this.apiUrl}/${id}`, { headers: this.getNgrokHeaders() })
.pipe(
switchMap((apiResultat) => {
// Fetch the full course object if course is just an ID
const courseId =
typeof apiResultat.course === 'object' && 'id' in apiResultat.course
? String(apiResultat.course.id)
: String(apiResultat.course);
// New API uses `courseId` explicitly
const courseId = String((apiResultat as any).courseId ?? '');
return this.courseService.getById(courseId).pipe(
map((course) => {
@@ -62,16 +68,8 @@ export class ResultatService {
.get<ResultatApiResponse[]>(this.apiUrl, { headers: this.getNgrokHeaders() })
.pipe(
switchMap((apiResultats) => {
// Fetch all unique course IDs
const courseIds = [
...new Set(
apiResultats.map((r) =>
typeof r.course === 'object' && 'id' in r.course
? String(r.course.id)
: String(r.course)
)
),
];
// Fetch all unique course IDs (API uses courseId)
const courseIds = [...new Set(apiResultats.map((r) => String((r as any).courseId ?? '')))].filter(Boolean);
// Fetch all courses in parallel
const courseRequests = courseIds.map((id) =>
this.courseService
@@ -91,10 +89,7 @@ export class ResultatService {
return apiResultats
.map((apiResultat) => {
const courseId =
typeof apiResultat.course === 'object' && 'id' in apiResultat.course
? String(apiResultat.course.id)
: String(apiResultat.course);
const courseId = String((apiResultat as any).courseId ?? '');
const course = courseMap.get(courseId);
if (!course) {
return null;
@@ -118,11 +113,23 @@ export class ResultatService {
return of([]);
}
// GET raw API responses (ResultatApiResponse[])
listRaw(): Observable<ResultatApiResponse[]> {
if (USE_SERVER) {
return this.http
.get<ResultatApiResponse[]>(this.apiUrl, { headers: this.getNgrokHeaders() })
.pipe(
catchError((err) => {
console.error('Error fetching raw resultats:', err);
return of([] as ResultatApiResponse[]);
})
);
}
return of([] as ResultatApiResponse[]);
}
// GET /api/v1/resultat/course/{courseId}
getByCourseId(courseId: string): Observable<Resultat | undefined> {
if (!USE_SERVER) {
return of(undefined);
}
return this.http
.get<any>(`${this.apiUrl}/course/${courseId}`, {
@@ -169,28 +176,25 @@ export class ResultatService {
// POST /api/v1/resultat
create(payload: CreateResultatPayload): Observable<Resultat> {
if (USE_SERVER) {
return this.http
.post<ResultatApiResponse>(this.apiUrl, payload, { headers: this.getNgrokHeaders() })
.pipe(
switchMap((apiResultat) => {
const courseId = String(payload.course.id);
return this.courseService.getById(courseId).pipe(
map((course) => {
if (!course) {
throw new Error('Course not found');
}
return this.transformApiResponse(apiResultat, course);
})
);
}),
catchError((err) => {
console.error('Error creating resultat:', err);
throw err;
})
);
}
throw new Error('Server mode is required');
return this.http
.post<ResultatApiResponse>(this.apiUrl, payload, { headers: this.getNgrokHeaders() })
.pipe(
switchMap((apiResultat) => {
const courseId = String(payload.courseId);
return this.courseService.getById(courseId).pipe(
map((course) => {
if (!course) {
throw new Error('Course not found');
}
return this.transformApiResponse(apiResultat, course);
})
);
}),
catchError((err) => {
console.error('Error creating resultat:', err);
throw err;
})
);
}
// PUT /api/v1/resultat/{id}
@@ -202,10 +206,7 @@ export class ResultatService {
})
.pipe(
switchMap((apiResultat) => {
const courseId =
typeof apiResultat.course === 'object' && 'id' in apiResultat.course
? String(apiResultat.course.id)
: String(apiResultat.course);
const courseId = String((apiResultat as any).courseId ?? '');
return this.courseService.getById(courseId).pipe(
map((course) => {
@@ -261,20 +262,17 @@ export class ResultatService {
return {
id: String(apiResultat.id),
course,
// Normalize ordreArrivee to an array of cheval numbers
ordreArrivee: (apiResultat.ordreArrivee || [])
.map((v) => (typeof v === 'string' ? Number(v) : v))
.filter((v): v is number => typeof v === 'number' && !Number.isNaN(v)),
// Normalize dead-heat horses to numbers as well
chevauxDeadHeat: (apiResultat.chevauxDeadHeat || [])
.map((v) => (typeof v === 'string' ? Number(v) : v))
.filter((v): v is number => typeof v === 'number' && !Number.isNaN(v)),
totalMises: apiResultat.totalMises,
masseAPartager: apiResultat.masseAPartager,
prelevementsLegaux: apiResultat.prelevementsLegaux,
montantRembourse: apiResultat.montantRembourse,
montantCagnotte: apiResultat.montantCagnotte,
adeadHeat: apiResultat.adeadHeat,
// API now returns 'ordreArrivee' as CSV/string; normalize to number[]
ordreArrivee: apiResultat.ordreArrivee,
// dead-heat not provided by new API shape — default to empty
chevauxDeadHeat: [],
// Financial fields may not be present in new API; default to 0
totalMises: (apiResultat as any).totalMises ?? 0,
masseAPartager: (apiResultat as any).masseAPartager ?? 0,
prelevementsLegaux: (apiResultat as any).prelevementsLegaux ?? 0,
montantRembourse: (apiResultat as any).montantRembourse ?? 0,
montantCagnotte: (apiResultat as any).montantCagnotte ?? 0,
adeadHeat: (apiResultat as any).adeadHeat ?? false,
createdAt: apiResultat.createdAt,
updatedAt: apiResultat.updatedAt,
};

16
src/app/core/services/reunion.ts
View File

@@ -180,7 +180,7 @@ export class ReunionService {
meta: { total: 0, uniqueHippodromes: 0, upcomingReunions: 0, pastReunions: 0 },
},
params.page,
params.perPage
params.size
)
);
}
@@ -197,7 +197,7 @@ export class ReunionService {
meta: { total: 0, uniqueHippodromes: 0, upcomingReunions: 0, pastReunions: 0 },
},
params.page,
params.perPage
params.size
)
);
}
@@ -273,8 +273,8 @@ export class ReunionService {
// Apply client-side filtering, sorting, and pagination
let filtered = this.applyClientFilters(transformedData, params);
const total = filtered.length;
const start = (params.page - 1) * params.perPage;
const pageData = filtered.slice(start, start + params.perPage);
const start = (params.page - 1) * params.size;
const pageData = filtered.slice(start, start + params.size);
const upcomingReunions = filtered.filter(
(r) => new Date(r.date) >= new Date()
@@ -288,7 +288,7 @@ export class ReunionService {
meta: { total, uniqueHippodromes, upcomingReunions, pastReunions },
},
params.page,
params.perPage
params.size
);
})
);
@@ -359,8 +359,8 @@ export class ReunionService {
});
}
const start = (params.page - 1) * params.perPage;
const pageData = data.slice(start, start + params.perPage);
const start = (params.page - 1) * params.size;
const pageData = data.slice(start, start + params.size);
const upcomingReunions = data.filter((r) => new Date(r.date) >= new Date()).length;
const pastReunions = data.filter((r) => new Date(r.date) < new Date()).length;
@@ -373,7 +373,7 @@ export class ReunionService {
meta: { total: data.length, uniqueHippodromes, upcomingReunions, pastReunions },
},
params.page,
params.perPage
params.size
)
);
}

8
src/app/core/services/role.ts
View File

@@ -91,7 +91,7 @@ export class RoleService {
private buildParams(params: ListParams): HttpParams {
let httpParams = new HttpParams()
.set('page', String(params.page - 1))
.set('size', String(params.perPage));
.set('size', String(params.size));
if (params.search) {
httpParams = httpParams.set('search', params.search);
}
@@ -117,13 +117,13 @@ export class RoleService {
return normalizePage<Role>(
{ data: roles, meta: { total: roles.length } },
params.page,
params.perPage
params.size
);
}),
catchError((err) => {
console.error('Error fetching roles:', err);
return of(
normalizePage<Role>({ data: [], meta: { total: 0 } }, params.page, params.perPage)
normalizePage<Role>({ data: [], meta: { total: 0 } }, params.page, params.size)
);
})
);
@@ -137,7 +137,7 @@ export class RoleService {
meta: { total: 0 },
},
params.page,
params.perPage
params.size
)
);
}

2
src/app/core/services/services-utils.ts
View File

@@ -8,7 +8,7 @@ export class ServicesUtils{
let httpParams = new HttpParams();
Object.entries(params).forEach(([key, value])=>{
if(params != null && params!=undefined){
httpParams.set(key, String(value))
httpParams = httpParams.set(key, String(value))
}
})
return httpParams;

4
src/app/core/services/tpe.ts
View File

@@ -211,7 +211,7 @@ export class TpeService {
let httpParams = new HttpParams();
if (params) {
if (params.page) httpParams = httpParams.set('page', params.page.toString());
if (params.perPage) httpParams = httpParams.set('perPage', params.perPage.toString());
if (params.size) httpParams = httpParams.set('perPage', params.size.toString());
if (params.search) httpParams = httpParams.set('search', params.search);
if (params.sortKey) httpParams = httpParams.set('sortKey', params.sortKey);
if (params.sortDir) httpParams = httpParams.set('sortDir', params.sortDir);
@@ -230,7 +230,7 @@ export class TpeService {
return normalizePage<TpeDevice>(
{ data: tpes, meta: { total: tpes.length } },
params.page || 1,
params.perPage || 10
params.size || 10
);
}
// Otherwise return all as single page

10
src/app/core/services/user.ts
View File

@@ -117,23 +117,23 @@ export class UserService {
});
}
const start = (params.page - 1) * params.perPage;
const pageData = data.slice(start, start + params.perPage);
const start = (params.page - 1) * params.size;
const pageData = data.slice(start, start + params.size);
return normalizePage<User>(
{ data: pageData, meta: { total: data.length } },
params.page,
params.perPage
params.size
);
}),
catchError(() =>
of(normalizePage<User>({ data: [], meta: { total: 0 } }, params.page, params.perPage))
of(normalizePage<User>({ data: [], meta: { total: 0 } }, params.page, params.size))
)
);
}
// Fallback should not be used anymore
return of(normalizePage<User>({ data: [], meta: { total: 0 } }, params.page, params.perPage));
return of(normalizePage<User>({ data: [], meta: { total: 0 } }, params.page, params.size));
}
create(payload: Omit<User, 'id'>): Observable<User> {

4
src/app/dashboard/dashboard-routing-module.ts
View File

@@ -21,6 +21,10 @@ const routes: Routes = [
path: 'reunions',
loadComponent: () => import('./pages/reunion/reunion').then((m) => m.ReunionList),
},
{
path: 'rapport',
loadComponent: () => import('./pages/rapport/rapport').then((m) => m.Rapport),
},
{
path: 'users',
loadComponent: () => import('./pages/users/users').then((m) => m.UsersPage),

2
src/app/dashboard/layout/layout.ts
View File

@@ -46,7 +46,7 @@ export class Layout {
{ icon: '🏟️', label: 'Hippodromes', link: '/hippodromes' },
{ icon: '📅', label: 'Reunions', link: '/reunions' },
{ icon: '🏇', label: 'Courses', link: '/courses' },
{ icon: 'icon-chart-bar', label: 'Rapport des courses', link: '/rapport-courses' },
{ icon: 'icon-chart-bar', label: 'Rapport des courses', link: '/rapport' },
];
workspaceMenuItems: MenuItem[] = [

4
src/app/dashboard/pages/agents/agents.html
View File

@@ -28,9 +28,9 @@
<app-paginator
[total]="total()"
[page]="page()"
[perPage]="perPage()"
[perPage]="size()"
(pageChange)="page.set($event)"
(perPageChange)="perPage.set($event)"
(perPageChange)="size.set($event)"
></app-paginator>
</div>

14
src/app/dashboard/pages/agents/agents.ts
View File

@@ -51,7 +51,7 @@ export class AgentsPage {
loading = signal(false);
page = signal(1);
perPage = signal(10);
size = signal(10);
search = signal('');
sort = signal<SortState>({ key: 'code', dir: 'asc' });
@@ -148,7 +148,7 @@ export class AgentsPage {
) {
// Preload TPE maps for display
this.tpeSvc
.list({ page: 1, perPage: 200, search: '', sortKey: 'imei', sortDir: 'asc' } as any)
.list({ page: 1, size: 200, search: '', sortKey: 'imei', sortDir: 'asc' } as any)
.subscribe((res) => {
const tpes = res.content as TpeDevice[];
this.rebuildTpeMaps(tpes);
@@ -156,7 +156,7 @@ export class AgentsPage {
effect(() => {
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -167,7 +167,7 @@ export class AgentsPage {
private fetch(params: {
page: number;
perPage: number;
size: number;
search: string;
sortKey: string;
sortDir: SortDir;
@@ -191,7 +191,7 @@ export class AgentsPage {
private refreshTpeMap() {
this.tpeSvc
.list({ page: 1, perPage: 200, search: '', sortKey: 'imei', sortDir: 'asc' } as any)
.list({ page: 1, size: 200, search: '', sortKey: 'imei', sortDir: 'asc' } as any)
.subscribe((res) => {
const tpes = res.content as TpeDevice[];
this.rebuildTpeMaps(tpes);
@@ -381,7 +381,7 @@ export class AgentsPage {
// Refresh data
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -399,7 +399,7 @@ export class AgentsPage {
this.api.delete(row.id).subscribe(() =>
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,

8
src/app/dashboard/pages/courses/courses.html
View File

@@ -106,10 +106,10 @@
</app-data-table>
<app-paginator
[page]="page()"
[page]="page() + 1"
[perPage]="perPage()"
[total]="total()"
(pageChange)="page.set($event)"
(pageChange)="page.set($event - 1)"
(perPageChange)="perPage.set($event)"
[pageSizes]="pageSize"
/>
@@ -158,12 +158,12 @@
<app-resultat-form
[course]="selectedCourseForResultat()!"
[resultat]="resultatsMap().get(selectedCourseForResultat()!.id)"
(save)="onResultatSave($event)"
(save)="onResultatSave($event.horses, $event.typesParisOuverts)"
(validate)="onResultatValidate()"
(confirm)="onResultatConfirm()"
(cancel)="closeResultatModal()"
/>
<div modal-actions class="flex justify-end gap-2">
<div modal-actions class="flex justify-between gap-2">
<z-button zType="destructive" (click)="closeResultatModal()">Fermer</z-button>
</div>
</app-modal>

168
src/app/dashboard/pages/courses/courses.ts
View File

@@ -18,7 +18,7 @@ import { Course as CourseType } from 'src/app/core/interfaces/course';
import { SortDir } from '@shared/paging/paging';
import { CourseApiResponse, CourseService } from 'src/app/core/services/course';
import { ResultatService } from 'src/app/core/services/resultat';
import { Resultat } from 'src/app/core/interfaces/resultat';
import { Resultat, ResultatStatut } from 'src/app/core/interfaces/resultat';
import { A11yModule } from '@angular/cdk/a11y';
import { CourseForm } from '@shared/forms/course-form/course-form';
import { NonPartantForm } from '@shared/forms/nonpartant-form/nonpartant-form';
@@ -57,10 +57,10 @@ export class Course {
totalClosed = signal(0);
totalByType = signal<Record<string, number>>({});
page = signal(1);
page = signal(0);
perPage = signal(10);
search = signal('');
sort = signal<SortState>({ key: 'numero', dir: 'asc' });
sort = signal<SortState>({ key: 'id', dir: 'asc' });
pageSize = [10, 20, 50];
modalOpen = signal(false);
@@ -102,40 +102,42 @@ export class Course {
return '<span class="text-gray-500 dark:text-gray-400">—</span>';
}
// Group horses that are at the same place (ex-aequo/dead heat).
// Backend/Resultat model store ordreArrivee as cheval numbers (1,2,3,...) and
// chevauxDeadHeat as the subset that are ex-aequo.
const deadHeatSet = new Set(resultat.chevauxDeadHeat || []);
return `<span class="text-gray-500 dark:text-gray-400">${resultat.ordreArrivee}</span>`
const groups: number[][] = [];
let currentGroup: number[] = [];
// // Group horses that are at the same place (ex-aequo/dead heat).
// // Backend/Resultat model store ordreArrivee as cheval numbers (1,2,3,...) and
// // chevauxDeadHeat as the subset that are ex-aequo.
// const deadHeatSet = new Set(resultat.chevauxDeadHeat || []);
resultat.ordreArrivee.forEach((num, index) => {
const isInDeadHeat = deadHeatSet.has(num);
const prevNum = index > 0 ? resultat.ordreArrivee[index - 1] : null;
const prevIsInDeadHeat = prevNum !== null && deadHeatSet.has(prevNum);
// const groups: number[][] = [];
// let currentGroup: number[] = [];
if (isInDeadHeat && prevIsInDeadHeat && currentGroup.length > 0) {
// Continue the current dead heat group
currentGroup.push(num);
} else {
// Start a new group
if (currentGroup.length > 0) {
groups.push(currentGroup);
}
currentGroup = [num];
}
});
// resultat.ordreArrivee.forEach((num, index) => {
// const isInDeadHeat = deadHeatSet.has(num);
// const prevNum = index > 0 ? resultat.ordreArrivee[index - 1] : null;
// const prevIsInDeadHeat = prevNum !== null && deadHeatSet.has(prevNum);
// Don't forget the last group
if (currentGroup.length > 0) {
groups.push(currentGroup);
}
// if (isInDeadHeat && prevIsInDeadHeat && currentGroup.length > 0) {
// // Continue the current dead heat group
// currentGroup.push(num);
// } else {
// // Start a new group
// if (currentGroup.length > 0) {
// groups.push(currentGroup);
// }
// currentGroup = [num];
// }
// });
const s = groups.map((nums) => nums.join('=')).join(' - ');
// // Don't forget the last group
// if (currentGroup.length > 0) {
// groups.push(currentGroup);
// }
// For now, we'll show the resultat. In the future, we might add a statut field to Resultat
return `<span class="mr-2">${s}</span>`;
// const s = groups.map((nums) => nums.join('=')).join(' - ');
// // For now, we'll show the resultat. In the future, we might add a statut field to Resultat
// return ;
},
},
{
@@ -187,7 +189,7 @@ export class Course {
effect(() => {
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -198,7 +200,7 @@ export class Course {
private fetch(params: {
page: number;
perPage: number;
size: number;
search: string;
sortKey: string;
sortDir: SortDir;
@@ -256,7 +258,7 @@ export class Course {
// === UI Actions ===
onSearch(q: string) {
this.search.set(q);
this.page.set(1);
this.page.set(0);
}
openCreate() {
@@ -283,21 +285,15 @@ export class Course {
this.formComp?.onSubmit();
}
onFormSave(payload: Partial<CourseType>) {
const current = this.editingItem();
const req$ = current?.id
? this.api.update(current.id, payload)
: this.api.create(payload as Omit<CourseApiResponse, 'id'>);
req$.subscribe(() => {
this.closeModal();
this.fetch({
page: this.page(),
perPage: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
});
onFormSave(_: CourseType) {
// The form now persists create/update itself. Just close and refresh.
this.closeModal();
this.fetch({
page: this.page(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
});
}
@@ -307,7 +303,7 @@ export class Course {
this.api.delete(row.id).subscribe(() =>
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
@@ -360,7 +356,7 @@ export class Course {
this.closeNonPartantModal();
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
@@ -381,20 +377,22 @@ export class Course {
this.selectedCourseForResultat.set(null);
}
onResultatSave(places: number[][]) {
onResultatSave(places: number[][], typesParisOuverts: string[]) {
const c = this.selectedCourseForResultat();
if (!c) return;
// Determine required number of horses based on course type
const getRequiredHorses = (type: string): number => {
const typeStr = String(type).toUpperCase();
if (typeStr.includes('TIERCE') || typeStr === 'PLAT') return 3;
if (typeStr.includes('QUARTE')) return 4;
const getRequiredHorses = (types: string[]): number => {
const typeStr = types;
if (typeStr.includes('PLACE') || typeStr.includes('GAGNANT')) return 3;
if(typeStr.includes('JUMELE_GAGNANT') || typeStr.includes('JUMELE_PLACE') || typeStr.includes('JUMELE_ORDRE')) return 2;
if(typeStr.includes('TRIO') || typeStr.includes('TRIO_ORDRE') || typeStr.includes('TRIPLET')) return 3
if (typeStr.includes('QUATRO')) return 4;
if (typeStr.includes('QUINTE')) return 5;
return 3; // Default
};
const requiredHorses = 3;
const requiredHorses = getRequiredHorses(typesParisOuverts);
// Collect all selected horses (flatten the places array)
const allHorses: number[] = places
@@ -409,46 +407,28 @@ export class Course {
// Convert to ordreArrivee format
// If all are ex-aequo, they all go in ordreArrivee as they are (first place)
// Otherwise, distribute them across places
const ordreArrivee: Array<string> = [];
const chevauxDeadHeat: number[] = [];
if (isAllExAequo) {
// All horses are in first place (ex-aequo)
allHorses.forEach((numero) => {
ordreArrivee.push(numero.toString());
chevauxDeadHeat.push(numero);
});
} else {
// Horses are distributed across places
places.forEach((placeGroup, placeIndex) => {
const validHorses = placeGroup.filter((n) => typeof n === 'number' && n > 0);
if (validHorses.length === 0) return;
const isDeadHeat = validHorses.length > 1;
validHorses.forEach((numero) => {
ordreArrivee.push(numero.toString());
if (isDeadHeat) {
chevauxDeadHeat.push(numero);
}
});
});
}
let ordreArrivee: string = '';
places.forEach((place)=>{
if(Array.isArray(place) && place.length>1){
place.forEach((p, index)=>{
if(index == 0){
ordreArrivee = ordreArrivee ==''? String(p) : ordreArrivee+","+String(p)
}else{
ordreArrivee = ordreArrivee ==''? String(p) : ordreArrivee+"="+String(p)
}
})
}else{
ordreArrivee = ordreArrivee ==''? String(place[0]): ordreArrivee+","+String(place[0])
}
})
// Check if resultat already exists
const existingResultat = this.resultatsMap().get(c.id);
const payload = {
course: { id: c.id },
courseId: Number(c.id) ,
ordreArrivee,
chevauxDeadHeat: chevauxDeadHeat.map((n) => String(n)),
totalMises: 0,
masseAPartager: 0,
prelevementsLegaux: 0,
montantRembourse: 0,
montantCagnotte: 0,
adeadHeat: chevauxDeadHeat.length > 0,
statut: ResultatStatut.EN_ATTENTE,
};
const request$ = existingResultat
@@ -460,7 +440,7 @@ export class Course {
this.closeResultatModal();
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
@@ -490,7 +470,7 @@ export class Course {
this.closeResultatModal();
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
@@ -520,7 +500,7 @@ export class Course {
this.closeResultatModal();
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,

2
src/app/dashboard/pages/hippodrome/hippodrome.html
View File

@@ -97,7 +97,7 @@
[page]="page()"
[perPage]="perPage()"
[total]="total()"
(pageChange)="page.set($event)"
(pageChange)="page.set($event - 1)"
(perPageChange)="onPerPage($event)"
[pageSizes]="pageSize"
/>

4
src/app/dashboard/pages/hippodrome/hippodrome.ts
View File

@@ -46,7 +46,7 @@ export class Hippodrome {
totalReunions = signal(0);
totalCourses = signal(0);
page = signal(1);
page = signal(0);
perPage = signal(10);
pageSize = [10, 20, 50];
search = signal('');
@@ -105,7 +105,7 @@ export class Hippodrome {
this.api
.list({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,

2
src/app/dashboard/pages/limits/limits.html
View File

@@ -49,7 +49,7 @@
</ng-template>
</app-data-table>
<app-paginator [total]="total()" [page]="page()" [perPage]="perPage()" (pageChange)="page.set($event)" (perPageChange)="perPage.set($event)"></app-paginator>
<app-paginator [total]="total()" [page]="page()" [perPage]="size()" (pageChange)="page.set($event)" (perPageChange)="size.set($event)"></app-paginator>
</div>
<app-modal [open]="modalOpen()" [title]="modalTitle()" (close)="closeModal()" size="xl">

20
src/app/dashboard/pages/limits/limits.ts
View File

@@ -24,7 +24,7 @@ export class LimitsPage implements OnInit {
total = signal(0);
loading = signal(false);
page = signal(1);
perPage = signal(10);
size = signal(10);
search = signal('');
sort = signal<SortState>({ key: 'code', dir: 'asc' });
selectedActif = signal<boolean | null>(null);
@@ -92,11 +92,11 @@ export class LimitsPage implements OnInit {
constructor(private api: AgentLimitService) {
effect(() => {
// Only trigger fetch when page, perPage, or sort changes (not search - handled by searchSubject)
// Only trigger fetch when page, size, or sort changes (not search - handled by searchSubject)
const searchValue = this.search();
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: searchValue,
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -120,7 +120,7 @@ export class LimitsPage implements OnInit {
// If empty, use normal list
return this.api.list({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: '',
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -155,14 +155,14 @@ export class LimitsPage implements OnInit {
// Initial fetch
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
});
}
private fetch(params: { page: number; perPage: number; search: string; sortKey: string; sortDir: SortDir }) {
private fetch(params: { page: number; size: number; search: string; sortKey: string; sortDir: SortDir }) {
// Don't fetch if there's a search query - it's handled by searchSubject
const searchQuery = params.search.trim();
if (searchQuery) {
@@ -214,7 +214,7 @@ export class LimitsPage implements OnInit {
// If empty, fetch normally
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: '',
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -227,7 +227,7 @@ export class LimitsPage implements OnInit {
this.page.set(1);
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -261,7 +261,7 @@ export class LimitsPage implements OnInit {
this.closeModal();
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -282,7 +282,7 @@ export class LimitsPage implements OnInit {
this.api.delete(row.id).subscribe(() => {
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,

4
src/app/dashboard/pages/main/main.ts
View File

@@ -118,7 +118,7 @@ export class Main {
private baseParams(): ListParams {
return {
page: 1,
perPage: 1,
size: 1,
search: '',
sortKey: 'id',
sortDir: 'asc' as SortDir,
@@ -158,7 +158,7 @@ export class Main {
.list(params, true)
.pipe(catchError(() => of({ data: [], meta: { total: 0 } } as any))),
courses: this.courseService
.list(coursesParams, true)
.list(coursesParams)
.pipe(catchError(() => of({ data: [], meta: { total: 0 } } as any))),
roles: this.roleService
.list(params)

0
src/app/dashboard/pages/rapport/rapport.css Normal file
View File

33
src/app/dashboard/pages/rapport/rapport.html Normal file
View File

@@ -0,0 +1,33 @@
<div class="space-y-4">
<div class="flex items-center justify-between">
<h2 class="text-2xl font-semibold">Rapport — Courses avec résultats</h2>
<z-button zType="default" (click)="fetch()">Récupérer le rapport</z-button>
</div>
<div class="mt-4">
<app-data-table [data]="rows()" [columns]="cols" [loading]="loading()">
<ng-template #rowActions let-row>
<z-button zType="ghost" zSize="icon" aria-label="Voir le rapport" (click)="openReport(row)">
<div class="icon-file-text"></div>
</z-button>
</ng-template>
</app-data-table>
<div class="flex items-center justify-between mt-3">
<div class="flex items-center gap-4">
<div class="flex items-center gap-2">
<label class="text-sm">Lignes par page</label>
<select class="border rounded px-2 py-1" [value]="perPage()" (change)="onPerPageChangeEvent($event)">
<option [value]="5">5</option>
<option [value]="10">10</option>
<option [value]="25">25</option>
<option [value]="50">50</option>
</select>
</div>
<div class="text-sm text-muted">{{ totalElements() }} résultats</div>
</div>
<div>
<z-pagination [zPageIndex]="page()" [zTotal]="totalPages()" (zPageIndexChange)="onPageChange($event)"></z-pagination>
</div>
</div>
</div>
</div>

23
src/app/dashboard/pages/rapport/rapport.spec.ts Normal file
View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Rapport } from './rapport';
describe('Rapport', () => {
let component: Rapport;
let fixture: ComponentFixture<Rapport>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [Rapport]
})
.compileComponents();
fixture = TestBed.createComponent(Rapport);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

94
src/app/dashboard/pages/rapport/rapport.ts Normal file
View File

@@ -0,0 +1,94 @@
import { CommonModule } from '@angular/common';
import { ChangeDetectionStrategy, Component, signal, ViewChild } from '@angular/core';
import { DataTable, TableColumn } from '@shared/components/data-table/data-table';
import { ZardButtonComponent } from '@shared/components/button/button.component';
import { ZardPaginationModule } from '@shared/components/pagination/pagination.module';
import { ListParams, PagedResult } from '@shared/paging/paging';
import { ResultatApiResponse } from 'src/app/core/interfaces/resultat';
import { ResultatService } from 'src/app/core/services/resultat';
@Component({
standalone: true,
selector: 'app-rapport',
templateUrl: './rapport.html',
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [CommonModule, DataTable, ZardButtonComponent, ZardPaginationModule],
})
export class Rapport {
rows = signal<ResultatApiResponse[]>([]);
loading = signal(false);
// Pagination state
page = signal<number>(1);
perPage = signal<number>(10);
totalPages = signal<number>(1);
totalElements = signal<number>(0);
@ViewChild(DataTable) table?: DataTable<ResultatApiResponse>;
cols: TableColumn<ResultatApiResponse>[] = [
{ key: 'courseNumero', label: 'N°' },
{ key: 'hippodromeNom', label: 'Hippodrome' },
{ key: 'courseNom', label: 'Course' },
{ key: 'ordreArrivee', label: "Ordre d'arrivée", cell: (r) => String(r.ordreArrivee ?? '').replace(/,/g, ' - ') },
{ key: 'statut', label: 'Statut', cell: (r)=>(r.statut.toString().toLowerCase().replace("_", " ")) },
{ key: 'datePublication', label: 'Date pub.', cell: (r) => r.datePublication ?? r.createdAt ?? '—' },
{ key: 'dateValidation', label: 'Date validation' },
];
constructor(private api: ResultatService) {
// initial load
this.fetch();
}
private fetchPage(params?: Partial<ListParams>) {
this.loading.set(true);
const p: ListParams = { page: this.page(), size: this.perPage(), ...(params || {}) };
this.api.listRawPaged(p).subscribe({
next: (res: PagedResult<ResultatApiResponse>) => {
const filtered = (res?.content || []).filter((r) => !!(r.ordreArrivee && String(r.ordreArrivee).trim()));
this.rows.set(filtered);
// normalize paging meta
this.totalPages.set(res.totalPages ?? 1);
this.totalElements.set(res.totalElements ?? (filtered.length || 0));
// ensure local page is in sync with backend response
if (res.pageable?.pageNumber) this.page.set(res.pageable.pageNumber);
this.loading.set(false);
},
error: (err) => {
console.error('Error fetching paged reports:', err);
this.rows.set([]);
this.loading.set(false);
},
});
}
fetch() {
this.fetchPage();
}
onPageChange(nextPage: number) {
this.page.set(nextPage);
this.fetchPage();
}
onPerPageChange(size: number) {
this.perPage.set(size);
this.page.set(1);
this.fetchPage();
}
// wrapper for template change event to avoid $event typing issues
onPerPageChangeEvent(e: Event) {
const v = (e.target as HTMLSelectElement)?.value;
const size = Number(v) || 10;
this.onPerPageChange(size);
}
openReport(row: ResultatApiResponse) {
try {
// Open a per-result report URL in a new tab. Adjust path if your server uses another route.
const url = `/rapport/${row.id}`;
window.open(url, '_blank');
} catch (err) {
console.error('Failed to open report for', row, err);
}
}
}

4
src/app/dashboard/pages/reunion/reunion.html
View File

@@ -64,10 +64,10 @@
<app-paginator
[page]="page()"
[perPage]="perPage()"
[perPage]="size()"
[total]="total()"
(pageChange)="page.set($event)"
(perPageChange)="perPage.set($event)"
(perPageChange)="size.set($event)"
[pageSizes]="pageSize"
/>
</div>

10
src/app/dashboard/pages/reunion/reunion.ts
View File

@@ -48,7 +48,7 @@ export class ReunionList {
// pagination, sorting, search
page = signal(1);
perPage = signal(10);
size = signal(10);
search = signal('');
sort = signal<SortState>({ key: 'date', dir: 'asc' });
pageSize = [10, 20, 50];
@@ -134,7 +134,7 @@ export class ReunionList {
effect(() => {
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
@@ -145,7 +145,7 @@ export class ReunionList {
private fetch(params: {
page: number;
perPage: number;
size: number;
search: string;
sortKey: string;
sortDir: SortDir;
@@ -211,7 +211,7 @@ export class ReunionList {
// refetch current page
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,
@@ -224,7 +224,7 @@ export class ReunionList {
this.api.delete(row.id).subscribe(() =>
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir,

10
src/app/dashboard/pages/roles/roles.ts
View File

@@ -39,7 +39,7 @@ export class RolesPage {
loading = signal(false);
permissions = signal<Permission[]>([]);
page = signal(1);
perPage = signal(10);
size = signal(10);
search = signal('');
sort = signal<SortState>({ key: 'name', dir: 'asc' });
@@ -65,7 +65,7 @@ export class RolesPage {
effect(() => {
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -76,7 +76,7 @@ export class RolesPage {
private fetch(params: {
page: number;
perPage: number;
size: number;
search: string;
sortKey: string;
sortDir: SortDir;
@@ -136,7 +136,7 @@ export class RolesPage {
);
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -160,7 +160,7 @@ export class RolesPage {
toast.success(`Le rôle « ${row.name} » a été supprimé avec succès`);
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.size(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,

22
src/app/dashboard/pages/tpe/tpe.ts
View File

@@ -152,7 +152,7 @@ export class TpePage implements OnInit {
const searchValue = this.search();
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: searchValue,
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -175,7 +175,7 @@ export class TpePage implements OnInit {
// If empty, use normal list
return this.api.list({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: '',
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -211,7 +211,7 @@ export class TpePage implements OnInit {
if (!this.search().trim()) {
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: '',
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -249,7 +249,7 @@ export class TpePage implements OnInit {
private fetch(params: {
page: number;
perPage: number;
size: number;
search: string;
sortKey: string;
sortDir: SortDir;
@@ -305,7 +305,7 @@ export class TpePage implements OnInit {
// If empty, fetch normally
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: '',
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -318,7 +318,7 @@ export class TpePage implements OnInit {
this.page.set(1);
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -331,7 +331,7 @@ export class TpePage implements OnInit {
next: () => {
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -347,7 +347,7 @@ export class TpePage implements OnInit {
next: () => {
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -393,7 +393,7 @@ export class TpePage implements OnInit {
this.selectedAgentId.set('');
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -456,7 +456,7 @@ export class TpePage implements OnInit {
// Refresh data
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -476,7 +476,7 @@ export class TpePage implements OnInit {
this.api.delete(row.id).subscribe(() => {
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,

8
src/app/dashboard/pages/users/users.ts
View File

@@ -83,7 +83,7 @@ export class UsersPage {
effect(() => {
const params = {
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -94,7 +94,7 @@ export class UsersPage {
private fetch(params: {
page: number;
perPage: number;
size: number;
search: string;
sortKey: string;
sortDir: SortDir;
@@ -156,7 +156,7 @@ export class UsersPage {
);
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,
@@ -181,7 +181,7 @@ export class UsersPage {
toast.success(`L'utilisateur « ${row.nom} ${row.prenom} » a été supprimé avec succès`);
this.fetch({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search(),
sortKey: this.sort().key,
sortDir: this.sort().dir as SortDir,

102
src/app/shared/forms/course-form/course-form.html
View File

@@ -19,26 +19,25 @@
<div class="grid sm:grid-cols-3 gap-5">
<z-form-field>
<label z-form-label zRequired for="hippodrome">Hippodrome</label>
<z-form-control
[errorMessage]="isInvalid('hippodromeId') ? 'Veuillez sélectionner une réunion' : ''"
>
<z-select
id="hippodromeId"
placeholder="Rechercher une réunion..."
formControlName="hippodromeId"
[zLabel]="selectedHippodromeLabel() || ''">
@if (loadingHippodromes()) {
<z-select-item [zValue]="''" disabled>Chargement des Hippodromes...</z-select-item>
} @else { @for (r of filteredHippodromes(); track r.id) {
<z-select-item [zValue]="r.id">
{{ r.nom }} - ({{ r.ville }})
</z-select-item>
} }
</z-select>
</z-form-control>
</z-form-field>
<z-form-field>
<label z-form-label zRequired for="hippodrome">Hippodrome</label>
<z-form-control
[errorMessage]="isInvalid('hippodromeId') ? 'Veuillez sélectionner une réunion' : ''"
>
<z-select
id="hippodromeId"
placeholder="Rechercher une réunion..."
formControlName="hippodromeId"
[zLabel]="selectedHippodromeLabel() || ''"
>
@if (loadingHippodromes()) {
<z-select-item [zValue]="''" disabled>Chargement des Hippodromes...</z-select-item>
} @else { @for (r of filteredHippodromes(); track r.id) {
<z-select-item [zValue]="r.id"> {{ r.nom }} - ({{ r.ville }}) </z-select-item>
} }
</z-select>
</z-form-control>
</z-form-field>
<z-form-field>
<label z-form-label zRequired class="text-sm font-semibold text-gray-700 dark:text-gray-300"
>Numero de la reunion</label
>
@@ -84,7 +83,7 @@
<z-form-control>
<input
z-input
placeholder="Ex: TIERCE, QUINTE"
placeholder="Ex: Plat"
formControlName="discipline"
class="w-full px-4 py-2.5 rounded-lg border border-gray-300 dark:border-gray-600 focus:ring-2 focus:ring-orange-500 dark:bg-gray-800 dark:text-gray-100"
/>
@@ -142,13 +141,13 @@
z-form-label
class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-2 block"
>
heure de départ
heure de départ
</label>
<div class="flex gap-3 items-center">
<input
z-input
type="time"
formControlName="heureDepartPrevu"
formControlName="heureDepartPrevue"
class="w-32 px-3 py-2.5 rounded-lg border border-gray-300 dark:border-gray-600 focus:ring-2 focus:ring-purple-500 dark:bg-gray-800 dark:text-gray-100 text-sm"
/>
</div>
@@ -161,23 +160,6 @@
</div>
</div>
<!-- 📅 SECTION 3 — Réunion -->
<div class="space-y-4">
<div class="flex items-center gap-3 pb-3 border-b border-gray-200 dark:border-gray-700">
<div
class="flex items-center justify-center w-10 h-10 rounded-xl bg-gradient-to-br from-green-500 to-green-600 text-white text-xl"
>
📅
</div>
<div>
<h2 class="text-xl font-bold text-gray-900 dark:text-gray-100">Réunion associée</h2>
<p class="text-sm text-gray-500 dark:text-gray-400">
Sélectionnez la réunion concernée ou créez-en une nouvelle
</p>
</div>
</div>
</div>
<!-- 🏇 SECTION 4 — Détails techniques -->
<div class="space-y-4">
<div class="flex items-center gap-3 pb-3 border-b border-gray-200 dark:border-gray-700">
@@ -194,21 +176,25 @@
<div class="grid sm:grid-cols-1 lg:grid-cols-2 gap-5">
<z-form-field>
<label z-form-label class="text-sm font-semibold text-gray-700 dark:text-gray-300"
>Types de paris ouverts (CSV)</label
>
<z-form-control>
<z-select
formControlName="typeParisOuverts"
class="w-full">
@for (t of courseTypes; track t.value) {
<z-select-item [zValue]="t.value">{{ t.label }}</z-select-item>
}
</z-select>
<p class="mt-1 text-sm text-gray-500">Séparez les types par des virgules.</p>
</z-form-control>
</z-form-field>
<label z-form-label class="text-sm font-semibold text-gray-700 dark:text-gray-300">
Types de paris ouverts
</label>
<z-form-control class="space-y-2">
@for (t of courseTypes; track t.value) {
<label class="flex items-center gap-2 text-sm">
<input
type="checkbox"
[value]="t.value"
(change)="onToggleType($event)"
[checked]="form.value.typesParisOuverts?.includes(t.value)"
/>
{{ t.label }}
</label>
}
</z-form-control>
</z-form-field>
<z-form-field>
<label z-form-label zRequired class="text-sm font-semibold text-gray-700 dark:text-gray-300"
@@ -216,7 +202,9 @@
>
<z-form-control
[errorMessage]="
isInvalid('nombrePartants') ? errorMessage('nombrePartants') || 'Ce champ est obligatoire' : ''
isInvalid('nombrePartants')
? errorMessage('nombrePartants') || 'Ce champ est obligatoire'
: ''
"
>
<input
@@ -251,7 +239,7 @@
<z-form-control>
<input
z-input
placeholder="Âge, catégorie..."
placeholder="Ex: A"
formControlName="categorie"
class="w-full px-4 py-2.5 rounded-lg border border-gray-300 dark:border-gray-600 focus:ring-2 focus:ring-orange-500 dark:bg-gray-800 dark:text-gray-100"
/>

134
src/app/shared/forms/course-form/course-form.ts
View File

@@ -48,10 +48,17 @@ import { CourseApiResponse, CourseService } from 'src/app/core/services/course';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class CourseForm implements OnInit, AfterViewInit, OnDestroy {
@Output() save = new EventEmitter<Partial<CourseApiResponse>>();
@Output() save = new EventEmitter<Course>();
@Output() cancel = new EventEmitter<void>();
@Input() value?: Course;
private _value?: Course;
@Input() set value(v: Course | undefined) {
this._value = v;
this.hydrateFromValue(v);
}
get value(): Course | undefined {
return this._value;
}
form: FormGroup;
submitted = false;
@@ -76,7 +83,7 @@ export class CourseForm implements OnInit, AfterViewInit, OnDestroy {
nom: ['', Validators.required],
numero: [null, Validators.required],
statut: [CourseStatut.BROUILLON, Validators.required],
heureDepartPrevu: ['', Validators.required],
heureDepartPrevue: ['', Validators.required],
discipline: ['', Validators.required],
distanceMetres: [null, Validators.required],
nombrePartants: [null, Validators.required],
@@ -86,7 +93,7 @@ export class CourseForm implements OnInit, AfterViewInit, OnDestroy {
reporteeAutreJour: [false],
incidentTechnique: [false],
nonPartants: [[]],
typesParisOuverts: [''],
typesParisOuverts: [[], Validators.required],
createdBy: ['agent-001'],
validatedBy: [''],
});
@@ -158,7 +165,7 @@ export class CourseForm implements OnInit, AfterViewInit, OnDestroy {
this.subs.add(
this.hippodromeService
.list({ page: 1, perPage: 1000 }, true)
.list({ page: 0, size: 1000 }, true)
.subscribe({
next: (res) => {
this.hippodromes.set(res.content);
@@ -175,11 +182,101 @@ export class CourseForm implements OnInit, AfterViewInit, OnDestroy {
this.cdr.markForCheck();
}
getDateCorrectFormat = (date: Date): string => {
let hour = date.getHours().toString();
let minutes = date.getMinutes().toString();
hour = hour.length == 1? `0${hour}`: hour;
minutes = minutes.length == 1? `0${minutes}`:minutes
return `${hour}:${minutes}`
};
private hydrateFromValue(v?: Course) {
if (!v) {
// Reset to defaults
this.form.reset({
hippodromeId: '',
reunionNumero: null,
reunionDate: '',
nom: '',
numero: null,
statut: CourseStatut.BROUILLON,
heureDepartPrevue: '',
discipline: '',
distanceMetres: null,
nombrePartants: null,
annulee: false,
categorie: '',
reporteeMemeJour: false,
reporteeAutreJour: false,
incidentTechnique: false,
nonPartants: [],
typesParisOuverts: [],
});
this.selectedHippodromeLabel.set('');
this.form.markAsPristine();
this.form.markAsUntouched();
return;
}
const hippodromeId = v.hippodrome?.id ? String(v.hippodrome.id) : '';
this.form.patchValue(
{
hippodromeId,
reunionNumero: v.reunionNumero ?? null,
reunionDate: v.reunionDate ?? '',
nom: v.nom ?? '',
numero: v.numero ?? null,
statut: v.statut ?? CourseStatut.BROUILLON,
heureDepartPrevue: v.heureDepartPrevue? this.getDateCorrectFormat(new Date(v.heureDepartPrevue)) :'',
discipline: v.discipline ?? '',
distanceMetres: v.distanceMetres ?? null,
nombrePartants: v.nombrePartants ?? null,
annulee: v.annulee ?? false,
categorie: v.categorie ?? '',
reporteeMemeJour: v.reporteeMemeJour ?? false,
reporteeAutreJour: v.reporteeAutreJour ?? false,
incidentTechnique: v.incidentTechnique ?? false,
nonPartants: v.nonPartants ?? [],
typesParisOuverts: v.typesParisOuverts,
},
{ emitEvent: false }
);
// Set hippodrome label if available
if (hippodromeId && this.hippodromes().length > 0) {
const h = this.hippodromes().find((r) => String(r.id) === hippodromeId);
if (h) this.selectedHippodromeLabel.set(`${h.nom} – (${h.ville})`);
else if (v.hippodrome?.nom) this.selectedHippodromeLabel.set(`${v.hippodrome.nom} – (${v.hippodrome.ville || ''})`);
} else if (v.hippodrome?.nom) {
this.selectedHippodromeLabel.set(`${v.hippodrome.nom} – (${v.hippodrome.ville || ''})`);
}
this.form.markAsPristine();
this.form.markAsUntouched();
}
isInvalid(control: string): boolean {
const c = this.form.get(control);
return !!(c && c.invalid && (c.touched || this.submitted));
}
onToggleType(event: Event) {
const input = event.target as HTMLInputElement;
const value = input.value;
const current = this.form.value.typesParisOuverts ?? [];
this.form.patchValue({
typesParisOuverts: input.checked
? [...current, value]
: current.filter((v: string) => v !== value)
});
}
onSubmit() {
this.submitted = true;
@@ -196,10 +293,7 @@ onSubmit() {
const hippodromeObj = foundHippodrome ?? (hippodromeId ? { id: +hippodromeId } : undefined);
// 2️⃣ Transformer typesParisOuverts CSV → tableau
const typesParis = raw.typesParisOuverts
? raw.typesParisOuverts.split(',').map((s: string) => s.trim()).filter(Boolean)
: [];
// 2️⃣ Transformer typesParisOuverts CSV → tablea
// 3️⃣ Construire payload
const payload: Partial<CourseApiResponse> = {
@@ -211,10 +305,10 @@ onSubmit() {
numero: raw.numero ? +raw.numero : undefined,
statut: raw.statut,
discipline: raw.discipline,
heureDepartPrevue: new Date(raw.reunionDate+raw.heureDepartPrevu).toISOString(),
heureDepartPrevue: new Date(`${raw.reunionDate}T${raw.heureDepartPrevue}:00`).toISOString(),
distanceMetres: raw.distanceMetres ? +raw.distanceMetres : undefined,
nombrePartants: raw.nombrePartants ? +raw.nombrePartants : undefined,
typesParisOuverts: typesParis,
typesParisOuverts: raw.typesParisOuverts,
annulee: raw.annulee ?? false,
reporteeMemeJour: raw.reporteeMemeJour ?? false,
reporteeAutreJour: raw.reporteeAutreJour ?? false,
@@ -223,17 +317,20 @@ onSubmit() {
categorie: raw.categorie,
};
console.log(payload);
// 4️⃣ Appeler le service (create ou update)
if (this.value?.id) {
// Persist: create or update via CourseService, then emit the saved Course
if (this.value && this.value.id) {
this.courseServive.update(this.value.id, payload).subscribe({
next: () => this.save.emit(payload),
error: err => console.error('Erreur update course', err)
next: (updated) => {
if (updated) this.save.emit(updated);
else console.error('Update returned empty result');
},
error: (err) => console.error('Error updating course:', err),
});
} else {
this.courseServive.create(payload).subscribe({
next: () => this.save.emit(payload),
error: err => console.error(err)
next: (created) => this.save.emit(created),
error: (err) => console.error('Error creating course:', err),
});
}
}
@@ -272,6 +369,7 @@ errorMessage(control: string): string | null {
{ label: 'Brouillon', value: CourseStatut.BROUILLON },
{ label: 'Validé', value: CourseStatut.VALIDE },
{ label: 'Fremé', value: CourseStatut.FERME },
{label: 'Ouvert', value: CourseStatut.OUVERT},
{ label: 'Resultat Provisoire', value: CourseStatut.RESULTAT_PROVISOIRE },
{ label: 'Resultat officiel', value: CourseStatut.RESULTAT_OFFICIEL },
{ label: 'Reglée', value: CourseStatut.REGLEE },

14
src/app/shared/forms/resultat-form/resultat-form.html
View File

@@ -13,26 +13,24 @@
</div>
<!-- Action Buttons -->
<div class="flex gap-2">
<div class="flex gap-x-3">
<button
type="button"
class="flex-1 px-3 py-2 text-sm rounded bg-gray-900 text-white hover:bg-gray-800 disabled:opacity-50"
class="flex-1 px-3 py-2 text-sm rounded bg-blue-400 text-white hover:bg-blue-600 disabled:opacity-50"
(click)="onSave()"
[disabled]="!canSave()"
>
[disabled]="!canSave()">
Enregistrer
</button>
<button
type="button"
class="px-3 py-2 text-sm rounded border border-blue-300 bg-blue-50 text-blue-700 hover:bg-blue-100 disabled:opacity-50"
class="flex-1 px-3 py-2 text-sm rounded border border-blue-300 bg-blue-50 text-blue-700 hover:bg-blue-100 disabled:opacity-50"
(click)="validate.emit()"
[disabled]="!canValidate()"
>
[disabled]="!canValidate()">
Valider
</button>
<button
type="button"
class="px-3 py-2 text-sm rounded border border-emerald-300 bg-emerald-50 text-emerald-700 hover:bg-emerald-100 disabled:opacity-50"
class="flex-1 px-3 py-2 text-sm rounded border border-emerald-300 bg-emerald-50 text-emerald-700 hover:bg-emerald-100 disabled:opacity-50"
(click)="confirm.emit()"
[disabled]="!canConfirm()"
>

66
src/app/shared/forms/resultat-form/resultat-form.ts
View File

@@ -25,7 +25,10 @@ type ResultatShape = { places: FormArray<FormGroup<PlaceRow>> };
export class ResultatForm {
@Input() course!: Course;
@Input() resultat?: Resultat | null;
@Output() save = new EventEmitter<number[][]>();
@Output() save = new EventEmitter<{
horses: number[][];
typesParisOuverts: string[];
}>();
@Output() validate = new EventEmitter<void>();
@Output() confirm = new EventEmitter<void>();
@Output() cancel = new EventEmitter<void>();
@@ -34,21 +37,40 @@ export class ResultatForm {
places: new FormArray<FormGroup<PlaceRow>>([]),
});
getRequiredHorses = (types: string[]): number => {
// Normalize types to uppercase strings for robust comparisons
const normalized = (types || []).map((t) => String(t).toUpperCase());
if (normalized.includes('QUINTE')) return 5;
if (normalized.includes('QUATRO')) return 4;
if (normalized.includes('TRIO') || normalized.includes('TRIO_ORDRE') || normalized.includes('TRIPLET')) return 3;
if (
normalized.includes('JUMELE_GAGNANT') ||
normalized.includes('JUMELE_PLACE') ||
normalized.includes('JUMELE_ORDRE')
)
return 2;
if (normalized.includes('PLACE') || normalized.includes('GAGNANT')) return 1;
return 3; // Default
};
reqLen = computed(() =>
3
this.getRequiredHorses(this.course.typesParisOuverts)
);
maxNum = computed(() => this.course?.nombrePartants ?? 0);
npSet = computed(() => new Set(this.course?.nonPartants ?? []));
statut = computed((): 'CREATED' | 'VALIDATED' | 'NONE' => {
return this.resultat ? 'CREATED' : 'NONE';
// Ensure non-partants are compared as strings to avoid type mismatches
npSet = computed(() => new Set((this.course?.nonPartants ?? []).map((v) => String(v))));
statut = computed((): 'PROVISOIRE' | 'OFFICIEL' | 'ANNULE' | 'EN_ATTENTE' => {
return this.resultat ? 'PROVISOIRE' : 'EN_ATTENTE';
});
canValidate(): boolean {
return this.statut() === 'CREATED';
return this.statut() === 'EN_ATTENTE';
}
canConfirm(): boolean {
return this.statut() === 'VALIDATED';
return this.statut() === 'PROVISOIRE';
}
// Helper methods for template
@@ -255,15 +277,25 @@ export class ResultatForm {
const len = this.reqLen();
// Extract existing places from resultat if available.
// Backend now returns ordreArrivee as an array of cheval numbers and
// chevauxDeadHeat as the subset that are in dead-heat (ex-aequo).
// Be defensive: ordreArrivee may be provided as array or CSV string, normalize to number[]
let existing: number[][] = [];
if (this.resultat && this.resultat.ordreArrivee && this.resultat.ordreArrivee.length > 0) {
const deadHeatSet = new Set(this.resultat.chevauxDeadHeat || []);
if (this.resultat && this.resultat.ordreArrivee && (this.resultat.ordreArrivee as any).length > 0) {
const rawOrdre = (this.resultat as any).ordreArrivee;
const allHorses: number[] = ((): number[] => {
if (Array.isArray(rawOrdre)) return rawOrdre.map(Number).filter((n) => !Number.isNaN(n));
if (typeof rawOrdre === 'string') {
return rawOrdre
.split(/[^0-9]+/)
.map((s) => Number(s))
.filter((n) => !Number.isNaN(n));
}
const n = Number(rawOrdre);
return Number.isNaN(n) ? [] : [n];
})();
const allHorses = this.resultat.ordreArrivee;
const allInDeadHeat =
allHorses.every((num) => deadHeatSet.has(num)) && allHorses.length === len;
const deadHeatSet = new Set(((this.resultat.chevauxDeadHeat ?? []) as any).map(Number));
const allInDeadHeat = allHorses.every((num) => deadHeatSet.has(num)) && allHorses.length === len;
if (allInDeadHeat) {
// All horses are in first place (ex-aequo)
@@ -277,9 +309,9 @@ export class ResultatForm {
const groups: number[][] = [];
let currentGroup: number[] = [];
this.resultat.ordreArrivee.forEach((num, index) => {
allHorses.forEach((num, index) => {
const isInDeadHeat = deadHeatSet.has(num);
const prevNum = index > 0 ? this.resultat!.ordreArrivee[index - 1] : null;
const prevNum = index > 0 ? allHorses[index - 1] : null;
const prevIsInDeadHeat = prevNum !== null && deadHeatSet.has(prevNum);
if (isInDeadHeat && prevIsInDeadHeat && currentGroup.length > 0) {
@@ -538,6 +570,6 @@ export class ResultatForm {
.filter((v): v is number => typeof v === 'number');
places.push(placeHorses);
}
this.save.emit(places);
this.save.emit({horses: places, typesParisOuverts: this.course.typesParisOuverts});
}
}

2
src/app/shared/forms/reunion-form/reunion-form.ts
View File

@@ -227,7 +227,7 @@ export class ReunionForm implements OnInit, AfterViewInit, OnDestroy {
// Fetch hippodromes from API
this.loadingHippodromes.set(true);
this.subs.add(
this.hippodromeService.list({ page: 1, perPage: 1000 }, false).subscribe({
this.hippodromeService.list({ page: 1, size: 1000 }, false).subscribe({
next: (result) => {
this.hippodromes.set(result.content);
this.loadingHippodromes.set(false);

2
src/app/shared/paging/data-source.ts
View File

@@ -10,7 +10,7 @@ export class TableDataSource {
readonly params = computed<ListParams>(() => ({
page: this.page(),
perPage: this.perPage(),
size: this.perPage(),
search: this.search() || undefined,
sortKey: this.sortKey(),
sortDir: this.sortDir(),

4
src/app/shared/paging/paginated-http.service.ts
View File

@@ -40,7 +40,7 @@ export class PaginatedHttpService {
let httpParams = new HttpParams()
.set(pageParam, String(zeroBasedPageIndex ? Math.max(params.page - 1, 0) : params.page))
.set(sizeParam, String(params.perPage));
.set(sizeParam, String(params.size));
if (params.search) httpParams = httpParams.set(searchParam, params.search);
@@ -56,6 +56,6 @@ export class PaginatedHttpService {
return this.http
.get<any>(url, { params: httpParams, headers: this.getNgrokHeaders() })
.pipe(map((raw) => normalizePage<T>(raw, params.page, params.perPage)));
.pipe(map((raw) => normalizePage<T>(raw, params.page, params.size)));
}
}

2
src/app/shared/paging/paging.ts
View File

@@ -3,7 +3,7 @@ export type SortDir = 'asc' | 'desc' | '';
export interface ListParams {
page: number; // 1-based for UI
perPage: number;
size: number;
search?: string;
sortKey?: string;
sortDir?: SortDir;

2
src/environments/environment.development.ts
View File

@@ -1,4 +1,4 @@
export const environment = {
production: false,
apiBaseUrl: 'https://ddd3b90fc1ef.ngrok-free.app',
apiBaseUrl: 'http://192.168.1.235:8280',
};

2
src/environments/environment.ts
View File

@@ -1,4 +1,4 @@
export const environment = {
production: false,
apiBaseUrl: 'https://ddd3b90fc1ef.ngrok-free.app',
apiBaseUrl: 'http://192.168.1.235:8280',
};