Skip to content
Draft
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
21 changes: 19 additions & 2 deletions src/components/SubjectCertsDropDown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ import { mapState } from "vuex";
import CheckMark from "@/components/CheckMark";
import LargeButton from "@/components/LargeButton";
import ArrowIcon from "@/assets/arrow.svg";
import getUnlockedSubjects from "@/utils/get-unlocked-subjects";

export default {
name: "SubjectCertsDropDown",
Expand Down Expand Up @@ -110,6 +111,20 @@ export default {
const largeScreenBreakpoint = 992;

return this.windowWidth <= largeScreenBreakpoint;
},
unlockedSubjects() {
const unlockedSubjects = getUnlockedSubjects(this.user.certifications);

/**
* @note: Some users have subjects that were grandfathered in and won't unlock
* because they do not have the required certs to unlock them
* Push the grandfathered in subjects to unlockedSubjects
**/
for (const subject of this.user.subjects) {
if (!unlockedSubjects.includes(subject)) unlockedSubjects.push(subject);
}

return unlockedSubjects;
}
},

Expand All @@ -118,9 +133,11 @@ export default {
return this.user.certifications[cert].passed;
},
hasUnlockedSubject(cert) {
if (cert === "algebra") return this.user.subjects.includes("algebraOne");
return this.user.subjects.includes(cert);
if (cert === "algebra")
return this.unlockedSubjects.includes("algebraOne");
return this.unlockedSubjects.includes(cert);
},

progressStatus(cert) {
if (this.isComplete(cert)) return "Completed";
if (this.hasUnlockedSubject(cert)) return "Unlocked";
Expand Down
166 changes: 166 additions & 0 deletions src/consts.js
Original file line number Diff line number Diff line change
Expand Up @@ -380,3 +380,169 @@ export const STATES_WITH_ABBREVIATIONS = [
{ label: "Wisconsin", value: "WI" },
{ label: "Wyoming", value: "WY" }
];

export const SUBJECT_TYPES = {
MATH: "math",
SCIENCE: "science",
COLLEGE: "college",
SAT: "sat",
TRAINING: "training"
};

export const TRAINING = {
UPCHIEVE_101: "upchieve101",
TUTORING_SKILLS: "tutoringSkills",
COLLEGE_COUNSELING: "collegeCounseling",
SAT_STRATEGIES: "satStrategies",
COLLEGE_SKILLS: "collegeSkills"
};

export const MATH_CERTS = {
PREALGREBA: "prealgebra",
ALGEBRA: "algebra",
GEOMETRY: "geometry",
TRIGONOMETRY: "trigonometry",
PRECALCULUS: "precalculus",
CALCULUS_AB: "calculusAB",
CALCULUS_BC: "calculusBC",
STATISTICS: "statistics"
};

export const MATH_SUBJECTS = {
PREALGREBA: "prealgebra",
ALGEBRA_ONE: "algebraOne",
ALGEBRA_TWO: "algebraTwo",
GEOMETRY: "geometry",
TRIGONOMETRY: "trigonometry",
PRECALCULUS: "precalculus",
CALCULUS_AB: "calculusAB",
CALCULUS_BC: "calculusBC",
STATISTICS: "statistics",
INTEGRATED_MATH_ONE: "integratedMathOne",
INTEGRATED_MATH_TWO: "integratedMathTwo",
INTEGRATED_MATH_THREE: "integratedMathThree",
INTEGRATED_MATH_FOUR: "integratedMathFour"
};

export const SCIENCE_CERTS = {
BIOLOGY: "biology",
CHEMISTRY: "chemistry",
PHYSICS_ONE: "physicsOne",
PHYSICS_TWO: "physicsTwo",
ENVIRONMENTAL_SCIENCE: "environmentalScience"
};
export const SCIENCE_SUBJECTS = {
BIOLOGY: "biology",
CHEMISTRY: "chemistry",
PHYSICS_ONE: "physicsOne",
PHYSICS_TWO: "physicsTwo",
ENVIRONMENTAL_SCIENCE: "environmentalScience"
};

export const COLLEGE_CERTS = {
ESSAYS: "essays",
FINANCIAL_AID: "financialAid",
SPORTS_RECRUITMENT_PLANNING: "sportsRecruitmentPlanning"
};

export const COLLEGE_SUBJECTS = {
ESSAYS: "essays",
FINANCIAL_AID: "financialAid",
SPORTS_RECRUITMENT_PLANNING: "sportsRecruitmentPlanning",
PLANNING: "planning",
APPLICATIONS: "applications"
};

export const SAT_CERTS = {
SAT_MATH: "satMath",
SAT_READING: "satReading"
};

export const SAT_SUBJECTS = {
SAT_MATH: "satMath",
SAT_READING: "satReading"
};

export const SUBJECTS = {
...MATH_SUBJECTS,
...SCIENCE_SUBJECTS,
...COLLEGE_SUBJECTS,
...SAT_SUBJECTS
};

export const CERT_UNLOCKING = {
[MATH_CERTS.CALCULUS_BC]: [
MATH_SUBJECTS.CALCULUS_BC,
MATH_SUBJECTS.CALCULUS_AB,
MATH_SUBJECTS.PRECALCULUS,
MATH_SUBJECTS.TRIGONOMETRY,
MATH_SUBJECTS.ALGEBRA_ONE,
MATH_SUBJECTS.ALGEBRA_TWO,
MATH_SUBJECTS.PREALGREBA
],
[MATH_CERTS.CALCULUS_AB]: [
MATH_SUBJECTS.CALCULUS_AB,
MATH_SUBJECTS.PRECALCULUS,
MATH_SUBJECTS.TRIGONOMETRY,
MATH_SUBJECTS.ALGEBRA_ONE,
MATH_SUBJECTS.ALGEBRA_TWO,
MATH_SUBJECTS.PREALGREBA
],
[MATH_CERTS.PRECALCULUS]: [
MATH_SUBJECTS.PRECALCULUS,
MATH_SUBJECTS.TRIGONOMETRY,
MATH_SUBJECTS.ALGEBRA_ONE,
MATH_SUBJECTS.ALGEBRA_TWO,
MATH_SUBJECTS.PREALGREBA
],
[MATH_CERTS.TRIGONOMETRY]: [MATH_SUBJECTS.TRIGONOMETRY],
[MATH_CERTS.ALGEBRA]: [
MATH_SUBJECTS.ALGEBRA_ONE,
MATH_SUBJECTS.ALGEBRA_TWO,
MATH_SUBJECTS.PREALGREBA
],
[MATH_CERTS.PREALGREBA]: [MATH_SUBJECTS.PREALGREBA],
[MATH_CERTS.STATISTICS]: [MATH_SUBJECTS.STATISTICS],
[MATH_CERTS.GEOMETRY]: [MATH_SUBJECTS.GEOMETRY],
[SCIENCE_CERTS.BIOLOGY]: [SCIENCE_SUBJECTS.BIOLOGY],
[SCIENCE_CERTS.CHEMISTRY]: [SCIENCE_SUBJECTS.CHEMISTRY],
[SCIENCE_CERTS.PHYSICS_ONE]: [SCIENCE_SUBJECTS.PHYSICS_ONE],
[SCIENCE_CERTS.PHYSICS_TWO]: [SCIENCE_SUBJECTS.PHYSICS_TWO],
[SCIENCE_CERTS.ENVIRONMENTAL_SCIENCE]: [
SCIENCE_SUBJECTS.ENVIRONMENTAL_SCIENCE
],
[COLLEGE_CERTS.ESSAYS]: [COLLEGE_SUBJECTS.ESSAYS],
[COLLEGE_SUBJECTS.APPLICATIONS]: [COLLEGE_SUBJECTS.APPLICATIONS],
[COLLEGE_SUBJECTS.PLANNING]: [COLLEGE_SUBJECTS.PLANNING],
[COLLEGE_CERTS.FINANCIAL_AID]: [COLLEGE_SUBJECTS.FINANCIAL_AID],
[COLLEGE_CERTS.SPORTS_RECRUITMENT_PLANNING]: [
COLLEGE_SUBJECTS.SPORTS_RECRUITMENT_PLANNING
],
[SAT_CERTS.SAT_MATH]: [SAT_CERTS.SAT_MATH],
[SAT_CERTS.SAT_READING]: [SAT_CERTS.SAT_READING],
[TRAINING.COLLEGE_COUNSELING]: [SUBJECTS.PLANNING, SUBJECTS.APPLICATIONS]
};

export const COMPUTED_CERTS = {
[SUBJECTS.INTEGRATED_MATH_ONE]: [
SUBJECTS.ALGEBRA_ONE,
MATH_CERTS.GEOMETRY,
MATH_CERTS.STATISTICS
],
[SUBJECTS.INTEGRATED_MATH_TWO]: [
SUBJECTS.ALGEBRA_ONE,
MATH_CERTS.GEOMETRY,
MATH_CERTS.STATISTICS,
MATH_CERTS.TRIGONOMETRY
],
[SUBJECTS.INTEGRATED_MATH_THREE]: [
MATH_CERTS.PRECALCULUS,
MATH_CERTS.STATISTICS
],
[SUBJECTS.INTEGRATED_MATH_FOUR]: [MATH_CERTS.PRECALCULUS],
[SUBJECTS.SAT_MATH]: [
SUBJECTS.ALGEBRA_ONE,
MATH_CERTS.TRIGONOMETRY,
MATH_CERTS.GEOMETRY
]
};
26 changes: 26 additions & 0 deletions src/utils/get-subject-type.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import {
MATH_SUBJECTS,
MATH_CERTS,
SCIENCE_SUBJECTS,
COLLEGE_SUBJECTS,
SAT_SUBJECTS,
TRAINING,
SUBJECT_TYPES
} from "../consts";

const getSubjectType = subject => {
let type = "";

if (Object.values(MATH_SUBJECTS).includes(subject)) type = SUBJECT_TYPES.MATH;
if (Object.values(MATH_CERTS).includes(subject)) type = SUBJECT_TYPES.MATH;
if (Object.values(SCIENCE_SUBJECTS).includes(subject))
type = SUBJECT_TYPES.SCIENCE;
if (Object.values(COLLEGE_SUBJECTS).includes(subject))
type = SUBJECT_TYPES.COLLEGE;
if (Object.values(SAT_SUBJECTS).includes(subject)) type = SUBJECT_TYPES.SAT;
if (Object.values(TRAINING).includes(subject)) type = SUBJECT_TYPES.TRAINING;

return type;
};

export default getSubjectType;
31 changes: 31 additions & 0 deletions src/utils/get-unlocked-subjects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { CERT_UNLOCKING, COMPUTED_CERTS } from "../consts";

const getUnlockedSubjects = userCertifications => {
// Add all the certifications that this completed cert unlocks into a Set
const currentSubjects = new Set();

for (const cert in userCertifications) {
if (userCertifications[cert].passed && CERT_UNLOCKING[cert])
CERT_UNLOCKING[cert].forEach(subject => currentSubjects.add(subject));
}

for (const cert in COMPUTED_CERTS) {
const prerequisiteCerts = COMPUTED_CERTS[cert];
let meetsRequirements = true;

for (let i = 0; i < prerequisiteCerts.length; i++) {
const prereqCert = prerequisiteCerts[i];

if (!currentSubjects.has(prereqCert)) {
meetsRequirements = false;
break;
}
}

if (meetsRequirements) currentSubjects.add(cert);
}

return Array.from(currentSubjects);
};

export default getUnlockedSubjects;
Loading