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.

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

Update MPE for AY22/23 S2 #3414

Merged
merged 3 commits into from
Oct 10, 2022
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/erbium
lts/gallium
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Tip: Pick an area you're interested in, and just focus on it. It is not necessar

## Development Tools

You should have [Node.js](https://nodejs.org/) version 12 or above (use Node 12 LTS or `lts/erbium` if possible) and [Yarn](https://yarnpkg.com/en/) version 1.2.0 or above. We recommend using [nvm](https://github.com/creationix/nvm) to manage your Node versions.
You should have [Node.js](https://nodejs.org/) version 16 or above (use Node 16 LTS or `lts/gallium` if possible) and [Yarn](https://yarnpkg.com/en/) version 1.2.0 or above. We recommend using [fnm](https://github.com/Schniz/fnm) to manage your Node versions.

## Proposing a Change

Expand Down
2 changes: 1 addition & 1 deletion website/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:16-alpine

RUN apk update && \
apk add --no-cache git python build-base && \
Expand Down
2 changes: 1 addition & 1 deletion website/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:16-alpine

RUN apk update && \
apk add --no-cache git python build-base && \
Expand Down
2 changes: 1 addition & 1 deletion website/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Don't know where to start? First, read our repository [contribution guide](../CO

## Getting Started

Install [Node 12 LTS](https://nodejs.org/en/) and [Yarn](https://yarnpkg.com/en/docs/install) then run the following command:
Install [Node 16 LTS](https://nodejs.org/en/) and [Yarn](https://yarnpkg.com/en/docs/install) then run the following command:

```sh
$ yarn
Expand Down
2 changes: 1 addition & 1 deletion website/src/featureFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
export const enableShortUrl = false;

/** Enable Module Planning Exercise */
export const enableMpe = false;
export const enableMpe = true;
2 changes: 1 addition & 1 deletion website/src/views/mpe/MpeContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const MpeContainer: React.FC = () => {
and there is no guarantee that you will be allocated the selected modules during the
ModReg Exercise.
</p>
<p>The MPE for this round will be from 7 Mar to 11 Mar 2022.</p>
<p>The MPE for this round will be from 10 Oct to 14 Oct 2022.</p>
<p>
Participation in the MPE will be used as <strong>one of the tie-breakers</strong> during
the ModReg Exercise, in cases where the demand exceeds the available quota and students
Expand Down
12 changes: 9 additions & 3 deletions website/src/views/mpe/UpdateSubmissionQueue.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,15 @@ describe(UpdateSubmissionQueue, () => {

const queue = new UpdateSubmissionQueue(update);

queue.update(emptySubmission);
queue.update(submission);
queue.update(emptySubmission);
queue.update(emptySubmission).catch(() => {
/* ignore */
});
queue.update(submission).catch(() => {
/* ignore */
});
queue.update(emptySubmission).catch(() => {
/* ignore */
});
await expect(
queue.update({ ...submission, preferences: [preference, preference] }),
).rejects.toThrow('2');
Expand Down
2 changes: 1 addition & 1 deletion website/src/views/mpe/constants.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const MAX_MODULES = 7;
export const MPE_SEMESTER: 1 | 2 = 1;
export const MPE_SEMESTER: 1 | 2 = 2;
export const MPE_AY = '2022/2023';