diff --git a/apps/api/src/features/training/training.service.ts b/apps/api/src/features/training/training.service.ts index 9b24f73..3603bde 100644 --- a/apps/api/src/features/training/training.service.ts +++ b/apps/api/src/features/training/training.service.ts @@ -127,6 +127,8 @@ export class TrainingService { genderResult, municipalityDistribution, parishDistribution, + surveyStatusDistribution, + isExportingDistribution, ] = await Promise.all([ // 1. Total OSPs this.drizzle @@ -307,6 +309,26 @@ export class TrainingService { .leftJoin(parishes, eq(trainingSurveys.parish, parishes.id)) .where(whereCondition) .groupBy(parishes.name), + + // 19. Distribución por Estatus de la Encuesta (Completada / Borrador) + this.drizzle + .select({ + name: trainingSurveys.surveyStatus, + value: sql`count(*)`, + }) + .from(trainingSurveys) + .where(whereCondition) + .groupBy(trainingSurveys.surveyStatus), + + // 20. Distribución por Exportación + this.drizzle + .select({ + name: sql`case when ${trainingSurveys.isExporting} then 'Sí' else 'No' end`, + value: sql`count(*)`, + }) + .from(trainingSurveys) + .where(whereCondition) + .groupBy(trainingSurveys.isExporting), ]); return { @@ -374,6 +396,14 @@ export class TrainingService { ...item, value: Number(item.value), })), + surveyStatusDistribution: surveyStatusDistribution.map((item) => ({ + ...item, + value: Number(item.value), + })), + isExportingDistribution: isExportingDistribution.map((item) => ({ + ...item, + value: Number(item.value), + })), }; } diff --git a/apps/web/.env_template b/apps/web/.env_template copy similarity index 100% rename from apps/web/.env_template rename to apps/web/.env_template copy diff --git a/apps/web/constants/routes.ts b/apps/web/constants/routes.ts index c031c83..69b9371 100644 --- a/apps/web/constants/routes.ts +++ b/apps/web/constants/routes.ts @@ -60,7 +60,7 @@ export const StatisticsItems: NavItem[] = [ url: '#', // Placeholder as there is no direct link for the parent icon: 'chartColumn', isActive: true, - role: ['admin', 'superadmin', 'autoridad'], + role: ['admin', 'superadmin', 'autoridad', 'manager'], items: [ // { @@ -82,7 +82,7 @@ export const StatisticsItems: NavItem[] = [ shortcut: ['s', 's'], url: '/dashboard/estadisticas/socioproductiva', icon: 'blocks', - role: ['admin', 'superadmin', 'autoridad'], + role: ['admin', 'superadmin', 'autoridad', 'manager'], }, ], }, diff --git a/apps/web/feactures/training/components/training-statistics.tsx b/apps/web/feactures/training/components/training-statistics.tsx index 4bdca66..fd26e54 100644 --- a/apps/web/feactures/training/components/training-statistics.tsx +++ b/apps/web/feactures/training/components/training-statistics.tsx @@ -62,18 +62,31 @@ export function TrainingStatistics() { const { data: dataMunicipality } = useMunicipalityQuery(stateId); const { data: dataParish } = useParishQuery(municipalityId); - const stateOptions = dataState?.data || [{ id: 0, name: 'Sin estados' }]; - const municipalityOptions = - Array.isArray(dataMunicipality?.data) && dataMunicipality.data.length > 0 - ? dataMunicipality.data - : [{ id: 0, stateId: 0, name: 'Sin Municipios' }]; - const parishOptions = - Array.isArray(dataParish?.data) && dataParish.data.length > 0 - ? dataParish.data - : [{ id: 0, stateId: 0, name: 'Sin Parroquias' }]; + const ALL_OPTION = [{ value: 'all', label: 'Todos' }]; + + const stateOptions = [ + ...ALL_OPTION, + ...(dataState?.data || []).map((item) => ({ + value: item.id.toString(), + label: item.name, + })), + ]; + const municipalityOptions = [ + ...ALL_OPTION, + ...(Array.isArray(dataMunicipality?.data) ? dataMunicipality.data : []).map( + (item) => ({ value: item.id.toString(), label: item.name }), + ), + ]; + const parishOptions = [ + ...ALL_OPTION, + ...(Array.isArray(dataParish?.data) ? dataParish.data : []).map((item) => ({ + value: item.id.toString(), + label: item.name, + })), + ]; // Query with Filters - const { data, isLoading, refetch } = useTrainingStatsQuery({ + const { data, isLoading } = useTrainingStatsQuery({ startDate: startDate || undefined, endDate: endDate || undefined, stateId: stateId || undefined, @@ -135,25 +148,55 @@ export function TrainingStatistics() { ); } + const toList = (value: unknown): any[] => + Array.isArray(value) ? value : []; + + const raw = data ?? {}; + const totalOsps = raw.totalOsps ?? 0; + const totalProducts = raw.totalProducts ?? 0; + const { - totalOsps, - // totalProducers, - statusDistribution, - activityDistribution, - typeDistribution, - stateDistribution, - yearDistribution, - ecoSectorDistribution, - productiveSectorDistribution, - centralActivityDistribution, - mainActivityDistribution, - structureTypeDistribution, - isOpenSpaceDistribution, - hasTransportDistribution, - genderDistribution, - municipalityDistribution, - parishDistribution, - } = data; + statusDistribution: statusRaw, + activityDistribution: activityRaw, + typeDistribution: typeRaw, + stateDistribution: stateRaw, + yearDistribution: yearRaw, + ecoSectorDistribution: ecoRaw, + productiveSectorDistribution: prodRaw, + centralActivityDistribution: centralRaw, + mainActivityDistribution: mainRaw, + structureTypeDistribution: structureRaw, + isOpenSpaceDistribution: openRaw, + hasTransportDistribution: transportRaw, + genderDistribution: genderRaw, + municipalityDistribution: municipalityRaw, + parishDistribution: parishRaw, + surveyStatusDistribution: surveyRaw, + isExportingDistribution: exportingRaw, + } = raw; + + const statusDistribution = toList(statusRaw); + const activityDistribution = toList(activityRaw); + const typeDistribution = toList(typeRaw); + const stateDistribution = toList(stateRaw); + const yearDistribution = toList(yearRaw); + const ecoSectorDistribution = toList(ecoRaw); + const productiveSectorDistribution = toList(prodRaw); + const centralActivityDistribution = toList(centralRaw); + const mainActivityDistribution = toList(mainRaw); + const structureTypeDistribution = toList(structureRaw); + const isOpenSpaceDistribution = toList(openRaw); + const hasTransportDistribution = toList(transportRaw); + const genderDistribution = toList(genderRaw); + const municipalityDistribution = toList(municipalityRaw); + const parishDistribution = toList(parishRaw); + const surveyStatusDistribution = toList(surveyRaw); + const isExportingDistribution = toList(exportingRaw); + + const totalCompleted = + surveyStatusDistribution.find((s) => s.name === 'COMPLETADA')?.value ?? 0; + const totalDrafts = + surveyStatusDistribution.find((s) => s.name === 'BORRADOR')?.value ?? 0; const COLORS = [ '#0088FE', @@ -192,49 +235,44 @@ export function TrainingStatistics() {
({ - value: item.id.toString(), - label: item.name, - }))} - onValueChange={(value: any) => { - setStateId(Number(value)); + options={stateOptions} + onValueChange={(value) => { + setStateId(value === 'all' || value === null ? 0 : Number(value)); setMunicipalityId(0); // Reset municipality setParishId(0); // Reset parish }} placeholder="Selecciona un estado" - defaultValue={stateId ? stateId.toString() : ''} + value={stateId ? stateId.toString() : 'all'} />
({ - value: item.id.toString(), - label: item.name, - }))} - onValueChange={(value: any) => { - setMunicipalityId(Number(value)); + options={municipalityOptions} + onValueChange={(value) => { + setMunicipalityId( + value === 'all' || value === null ? 0 : Number(value), + ); setParishId(0); }} placeholder="Selecciona municipio" - defaultValue={municipalityId ? municipalityId.toString() : ''} + value={municipalityId ? municipalityId.toString() : 'all'} disabled={!stateId || stateId === 0} />
({ - value: item.id.toString(), - label: item.name, - }))} - onValueChange={(value: any) => setParishId(Number(value))} + options={parishOptions} + onValueChange={(value) => + setParishId(value === 'all' || value === null ? 0 : Number(value)) + } placeholder="Selecciona parroquia" - defaultValue={parishId ? parishId.toString() : ''} + value={parishId ? parishId.toString() : 'all'} disabled={!municipalityId || municipalityId === 0} />
-
+ {/*
-
+
*/}