Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const storyInstructorStudentsFixture: InstructorStudentRow[] = [
qualificationType: "Certificate (Level 3)",
year: "Year 2",
gender: "Female",
modulesExplored: 4,
careerReady: "3/6",
careerReadinessStarted: 4,
careerReadinessCompleted: "3/6",
skillsDiscoveryStatus: "in_progress",
careerExplorerMessagesSent: 5,
lastLogin: "Today",
Expand All @@ -33,8 +33,8 @@ const storyInstructorStudentsFixture: InstructorStudentRow[] = [
qualificationType: "Diploma (Level 5)",
year: "Year 1",
gender: "Male",
modulesExplored: 5,
careerReady: "5/6",
careerReadinessStarted: 5,
careerReadinessCompleted: "5/6",
skillsDiscoveryStatus: "completed",
careerExplorerMessagesSent: 1,
lastLogin: "2 days ago",
Expand All @@ -47,8 +47,8 @@ const storyInstructorStudentsFixture: InstructorStudentRow[] = [
qualificationType: "Certificate (Level 3)",
year: "Year 3",
gender: "Female",
modulesExplored: 2,
careerReady: "0/6",
careerReadinessStarted: 2,
careerReadinessCompleted: "0/6",
skillsDiscoveryStatus: "not_started",
careerExplorerMessagesSent: null,
lastLogin: "1 week ago",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ const InstructorStudentsTable: React.FC<InstructorStudentsTableProps> = ({
},
},
{
key: "modulesExplored",
label: t("instructorDashboard.studentsTable.headers.modulesCompleted"),
key: "careerReadinessStarted",
label: t("instructorDashboard.studentsTable.headers.careerReadinessStarted"),
sortable: true,
sortType: "number",
align: "center",
Expand Down Expand Up @@ -220,8 +220,8 @@ const InstructorStudentsTable: React.FC<InstructorStudentsTableProps> = ({
},
},
{
key: "careerReady",
label: t("instructorDashboard.studentsTable.headers.careerReady"),
key: "careerReadinessCompleted",
label: t("instructorDashboard.studentsTable.headers.careerReadinessCompleted"),
sortable: true,
sortType: "text",
align: "center",
Expand Down
8 changes: 4 additions & 4 deletions admin-frontend/src/hooks/useInstructorStudents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ const toInstructorStudentRow = (
const gender = normalizeGender(toText(item.gender)) ?? PLACEHOLDER_SYMBOL;
const lastActiveModuleId = toText(item.last_active_module) ?? PLACEHOLDER_SYMBOL;

const modulesExplored = item.modules_explored ?? 0;
const careerReady = item.career_readiness_modules_explored ?? 0;
const careerReadinessStarted = item.modules_explored ?? 0;
const careerReadinessCompleted = item.career_readiness_modules_explored ?? 0;
return {
id,
studentName: name,
programme,
qualificationType,
year,
gender,
modulesExplored,
careerReady: `${careerReady}/6`,
careerReadinessStarted,
careerReadinessCompleted: `${careerReadinessCompleted}/6`,
skillsDiscoveryStatus: item.skills_discovery_status ?? "not_started",
careerExplorerMessagesSent: item.career_explorer_messages_sent ?? null,
lastLogin: formatLastLogin(item.last_login),
Expand Down
10 changes: 5 additions & 5 deletions admin-frontend/src/hooks/useInstructorStudentsTableState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export type StudentsSortKey =
| "year"
| "lastLogin"
| "lastActiveModuleId"
| "modulesExplored"
| "careerReady"
| "careerReadinessStarted"
| "careerReadinessCompleted"
| "skillsDiscoveryStatus"
| "careerExplorerMessagesSent";
type SortDir = "asc" | "desc";
Expand Down Expand Up @@ -126,9 +126,9 @@ export function useInstructorStudentsTableState(
if (key === "year") return normalizeYear(row.year);
if (key === "lastLogin") return normalizeLastLogin(row.lastLogin);
if (key === "lastActiveModuleId") return normalizeText(row.lastActiveModuleId);
if (key === "modulesExplored") return row.modulesExplored;
if (key === "careerReady") {
const ratio = fracRatio(row.careerReady);
if (key === "careerReadinessStarted") return row.careerReadinessStarted;
if (key === "careerReadinessCompleted") {
const ratio = fracRatio(row.careerReadinessCompleted);
return Number.isNaN(ratio) ? null : ratio;
}
if (key === "skillsDiscoveryStatus") {
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/en-GB/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@
"year": "Year",
"gender": "Gender",
"profileStrength": "Profile Strength",
"modulesCompleted": "Career Readiness Modules Completed",
"careerReady": "Career Readiness Completed",
"careerReadinessStarted": "Career Readiness Started",
"careerReadinessCompleted": "Career Readiness Completed",
"skillsInterestsExplored": "Build Your Profile",
"careerExplorer": "Career Explorer",
"prioritySectorsExplored": "Priority Sectors Explored",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/en-US/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@
"year": "Year",
"gender": "Gender",
"profileStrength": "Profile Strength",
"modulesCompleted": "Career Readiness Modules Completed",
"careerReady": "Career Readiness Completed",
"careerReadinessStarted": "Career Readiness Started",
"careerReadinessCompleted": "Career Readiness Completed",
"skillsInterestsExplored": "Build Your Profile",
"careerExplorer": "Career Explorer",
"prioritySectorsExplored": "Priority Sectors Explored",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/es-AR/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@
"year": "Año",
"gender": "Género",
"profileStrength": "Fuerza del perfil",
"modulesCompleted": "Módulos de preparación profesional completados",
"careerReady": "Preparación profesional",
"careerReadinessStarted": "Módulos de preparación profesional comenzados",
"careerReadinessCompleted": "Preparación profesional",
"skillsInterestsExplored": "Construí tu perfil",
"careerExplorer": "Explorador de carrera",
"prioritySectorsExplored": "Sectores prioritarios explorados",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/es-ES/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@
"year": "Año",
"gender": "Género",
"profileStrength": "Fuerza del perfil",
"modulesCompleted": "Módulos de preparación profesional completados",
"careerReady": "Preparación profesional",
"careerReadinessStarted": "Módulos de preparación profesional comenzados",
"careerReadinessCompleted": "Preparación profesional",
"skillsInterestsExplored": "Construye tu perfil",
"careerExplorer": "Explorador de carrera",
"prioritySectorsExplored": "Sectores prioritarios explorados",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/ny-ZM/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@
"year": "Chaka",
"gender": "Jenda",
"profileStrength": "Mbiri Yamphamvu",
"modulesCompleted": "Ma module Okonzekera Ntchito Atsirizidwa",
"careerReady": "Kukonzekera Ntchito",
"careerReadinessStarted": "Ma module Okonzekera Ntchito ayamba",
"careerReadinessCompleted": "Kukonzekera Ntchito",
"skillsInterestsExplored": "Pangani mbiri yanu",
"careerExplorer": "Kufunafuna Ntchito",
"prioritySectorsExplored": "Magawo Ofunika Kwambiri Afufuzidwa",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/pt-MZ/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@
"year": "Ano",
"gender": "Género",
"profileStrength": "Força do Perfil",
"modulesCompleted": "Módulos de Preparação para a Carreira Concluídos",
"careerReady": "Preparação para a Carreira Concluída",
"careerReadinessStarted": "Módulos de Preparação para a Carreira Iniciados",
"careerReadinessCompleted": "Preparação para a Carreira Concluída",
"skillsInterestsExplored": "Construa o Seu Perfil",
"careerExplorer": "Explorador de Carreiras",
"prioritySectorsExplored": "Setores Prioritários Explorados",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/i18n/locales/sw-KE/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@
"year": "Mwaka",
"gender": "Jinsia",
"profileStrength": "Nguvu ya Wasifu",
"modulesCompleted": "Moduli za Utayari wa Kazi Zimekamilika",
"careerReady": "Kujiandaa kwa Kazi",
"careerReadinessStarted": "Moduli za Utayari wa Kazi Zilizoanza",
"careerReadinessCompleted": "Kujiandaa kwa Kazi",
"skillsInterestsExplored": "Jenga wasifu wako",
"careerExplorer": "Mtafiti wa Kazi",
"prioritySectorsExplored": "Sekta za Kipaumbele Zilizogunduliwa",
Expand Down
4 changes: 2 additions & 2 deletions admin-frontend/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export interface InstructorStudentRow {
qualificationType: string;
year: string;
gender: string;
modulesExplored: number;
careerReady: string;
careerReadinessStarted: number;
careerReadinessCompleted: string;
skillsDiscoveryStatus: "not_started" | "in_progress" | "completed";
careerExplorerMessagesSent: number | null;
lastLogin: string;
Expand Down
Loading