Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

526/aqa-teaching-order-enhancement #286

Merged
merged 2 commits into from
Nov 11, 2024
Merged

526/aqa-teaching-order-enhancement #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cac51c
added AQA teaching order and separated teaching orders between AQA an…
sxpydo Nov 7, 2024
74cae63
updated test to included to the aqa teaching order - tests passed
sxpydo Nov 7, 2024
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
3 changes: 2 additions & 1 deletion src/app/components/site/NavigationBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ export const NavigationBar = () => {
{isTeacherOrAbove(user) && (
<>
<LinkItem to="/set_tests">Manage tests</LinkItem>
<LinkItem to="/teaching_order_g_ocr">GCSE suggested teaching order</LinkItem>
<LinkItem to="/teaching_order_g_ocr">GCSE suggested teaching order (OCR)</LinkItem>
<LinkItem to="/teaching_order_g_aqa">GCSE suggested teaching order (AQA)</LinkItem>
<LinkItem to="/teaching_order">A Level suggested teaching order</LinkItem>
</>
)}
Expand Down
7 changes: 7 additions & 0 deletions src/app/components/site/Routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ export const Routes = [
path="/teaching_order_g_ocr"
pageId="teaching_order_g_ocr"
/>,
<StaticPageRoute
key={key++}
exact
ifUser={isTutorOrAbove}
path="/teaching_order_g_aqa"
pageId="teaching_order_g_aqa"
/>,
<StaticPageRoute key={key++} exact ifUser={isTutorOrAbove} path="/teaching_order" pageId="teaching_order" />,
<StaticPageRoute key={key++} exact path="/teachcomputing" pageId="teach_computing" />,

Expand Down
1 change: 1 addition & 0 deletions src/test/pages/IsaacApp.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const teacherLinks = [
"/my_markbook",
"/set_tests",
"/teaching_order_g_ocr",
"/teaching_order_g_aqa",
"/teaching_order",
];
const learnLinks = [
Expand Down
Loading