Merge pull request #102 from isaacphysics/events

Events

Author: mlt47

src/IsaacApiTypes.tsx

@@ -474,7 +474,7 @@ export type EmailVerificationStatus = "VERIFIED" | "NOT_VERIFIED" | "DELIVERY_FA
 
 export type GroupMembershipStatus = "ACTIVE" | "INACTIVE" | "DELETED";
 
-export type Gender = "MALE" | "FEMALE" | "OTHER" | "UNKNOWN";
+export type Gender = "MALE" | "FEMALE" | "OTHER" | "PREFER_NOT_TO_SAY" | "UNKNOWN";
 
 export type AuthenticationProvider = "GOOGLE" | "FACEBOOK" | "TWITTER" | "RAVEN" | "TEST" | "SEGUE";
 

src/IsaacAppTypes.tsx

@@ -1,16 +1,6 @@
+import React from "react";
 import * as ApiTypes from "./IsaacApiTypes";
-import {
-    Content,
-    GameboardDTO,
-    GameboardItemState,
-    GroupMembershipDTO,
-    UserGroupDTO,
-    UserSummaryDTO,
-    UserSummaryWithEmailAddressDTO
-} from "./IsaacApiTypes";
 import {ACTION_TYPE, DOCUMENT_TYPE, EXAM_BOARD, MEMBERSHIP_STATUS, TAG_ID} from "./app/services/constants";
-import React from "react";
-
 
 export type Action =
     | {type: ACTION_TYPE.TEST_ACTION}
@@ -212,9 +202,30 @@ export type Action =
     | {type: ACTION_TYPE.GROUPS_MANAGER_ADD_RESPONSE_SUCCESS; group: ApiTypes.UserGroupDTO; managerEmail: string; newGroup: ApiTypes.UserGroupDTO}
     | {type: ACTION_TYPE.GROUPS_MANAGER_ADD_RESPONSE_FAILURE; group: ApiTypes.UserGroupDTO; managerEmail: string}
 
-    | {type: ACTION_TYPE.GROUPS_MANAGER_DELETE_REQUEST; group: ApiTypes.UserGroupDTO; manager: UserSummaryWithEmailAddressDTO}
-    | {type: ACTION_TYPE.GROUPS_MANAGER_DELETE_RESPONSE_SUCCESS; group: ApiTypes.UserGroupDTO; manager: UserSummaryWithEmailAddressDTO}
-    | {type: ACTION_TYPE.GROUPS_MANAGER_DELETE_RESPONSE_FAILURE; group: ApiTypes.UserGroupDTO; manager: UserSummaryWithEmailAddressDTO}
+    | {type: ACTION_TYPE.GROUPS_MANAGER_DELETE_REQUEST; group: ApiTypes.UserGroupDTO; manager: ApiTypes.UserSummaryWithEmailAddressDTO}
+    | {type: ACTION_TYPE.GROUPS_MANAGER_DELETE_RESPONSE_SUCCESS; group: ApiTypes.UserGroupDTO; manager: ApiTypes.UserSummaryWithEmailAddressDTO}
+    | {type: ACTION_TYPE.GROUPS_MANAGER_DELETE_RESPONSE_FAILURE; group: ApiTypes.UserGroupDTO; manager: ApiTypes.UserSummaryWithEmailAddressDTO}
+
+    | {type: ACTION_TYPE.EVENTS_REQUEST}
+    | {type: ACTION_TYPE.EVENTS_RESPONSE_SUCCESS; augmentedEvents: ApiTypes.IsaacEventPageDTO[]; total: number}
+    | {type: ACTION_TYPE.EVENTS_RESPONSE_FAILURE}
+    | {type: ACTION_TYPE.EVENTS_CLEAR}
+
+    | {type: ACTION_TYPE.EVENT_REQUEST}
+    | {type: ACTION_TYPE.EVENT_RESPONSE_SUCCESS; augmentedEvent: AugmentedEvent}
+    | {type: ACTION_TYPE.EVENT_RESPONSE_FAILURE}
+
+    | {type: ACTION_TYPE.EVENT_BOOKING_REQUEST}
+    | {type: ACTION_TYPE.EVENT_BOOKING_RESPONSE_SUCCESS}
+    | {type: ACTION_TYPE.EVENT_BOOKING_RESPONSE_FAILURE}
+
+    | {type: ACTION_TYPE.EVENT_WAITING_LIST_REQUEST}
+    | {type: ACTION_TYPE.EVENT_WAITING_LIST_RESPONSE_SUCCESS}
+    | {type: ACTION_TYPE.EVENT_WAITING_LIST_RESPONSE_FAILURE}
+
+    | {type: ACTION_TYPE.EVENT_CANCELLATION_REQUEST}
+    | {type: ACTION_TYPE.EVENT_CANCELLATION_RESPONSE_SUCCESS}
+    | {type: ACTION_TYPE.EVENT_CANCELLATION_RESPONSE_FAILURE}
 
     | {type: ACTION_TYPE.BOARDS_REQUEST; accumulate: boolean}
     | {type: ACTION_TYPE.BOARDS_RESPONSE_SUCCESS; boards: ApiTypes.GameboardListDTO; accumulate: boolean}
@@ -254,7 +265,7 @@ export interface AppGroup extends ApiTypes.UserGroupDTO {
 }
 
 export interface AppGroupMembership extends ApiTypes.UserSummaryWithGroupMembershipDTO {
-    groupMembershipInformation: GroupMembershipDTO;
+    groupMembershipInformation: ApiTypes.GroupMembershipDTO;
 }
 
 export interface ShortcutResponses {
@@ -277,10 +288,15 @@ export interface UserExamPreferences {
     [EXAM_BOARD.OCR]?: boolean;
 }
 
+export interface SubjectInterests {
+    CS_ALEVEL?: boolean;
+}
+
 export interface UserPreferencesDTO {
     BETA_FEATURE?: string;
     EMAIL_PREFERENCE?: UserEmailPreferences;
     EXAM_BOARD?: UserExamPreferences;
+    SUBJECT_INTEREST?: SubjectInterests;
 }
 
 export interface ValidatedChoice<C extends ApiTypes.ChoiceDTO> {
@@ -346,12 +362,12 @@ export enum BoardOrder {
 
 export type ActualBoardLimit = number | "ALL";
 
-export type AppGameBoard = GameboardDTO & {assignedGroups?: UserGroupDTO[]};
+export type AppGameBoard = ApiTypes.GameboardDTO & {assignedGroups?: ApiTypes.UserGroupDTO[]};
 
 // Admin Content Errors:
 export interface ContentErrorItem {
     listOfErrors: string[];
-    partialContent: Content;
+    partialContent: ApiTypes.Content;
     successfulIngest: boolean;
 }
 
@@ -377,17 +393,37 @@ export interface FigureNumbersById {[figureId: string]: number}
 export const FigureNumberingContext = React.createContext<FigureNumbersById>({});
 
 export interface AppAssignmentProgress {
-    user: UserSummaryDTO;
+    user: ApiTypes.UserSummaryDTO;
     correctPartResults: number[];
     incorrectPartResults: number[];
-    results: GameboardItemState[];
+    results: ApiTypes.GameboardItemState[];
 
     tickCount: number;
     correctQuestionPartsCount: number;
     incorrectQuestionPartsCount: number;
     notAttemptedPartResults: number[];
 }
 
+export interface AugmentedEvent extends ApiTypes.IsaacEventPageDTO {
+    multiDay?: boolean;
+    expired?: boolean;
+    withinBookingDeadline?: boolean;
+    inProgress?: boolean;
+    teacher?: boolean;
+    student?: boolean;
+    virtual?: boolean;
+    field?: "physics" | "maths";
+}
+
+export interface AdditionalInformation {
+    jobTitle?: string;
+    yearGroup?: string;
+    medicalRequirements?: string;
+    accessibilityRequirements?: string;
+    emergencyName?: string;
+    emergencyNumber?: string;
+}
+
 export interface ZxcvbnResult {
     calc_time: number;
     crack_times_display: { [key: string]: string };

src/app/components/content/IsaacSymbolicLogicQuestion.tsx

@@ -4,7 +4,7 @@ import {setCurrentAttempt} from "../../state/actions";
 import {IsaacContentValueOrChildren} from "./IsaacContentValueOrChildren";
 import {AppState} from "../../state/reducers";
 import {LogicFormulaDTO, IsaacSymbolicLogicQuestionDTO} from "../../../IsaacApiTypes";
-import { InequalityModal } from "../elements/InequalityModal";
+import { InequalityModal } from "../elements/modals/InequalityModal";
 import katex from "katex";
 import {IsaacHints} from "./IsaacHints";
 import { determineExamBoardFrom } from "../../services/examBoard";

src/app/components/elements/DateString.ts

@@ -1,3 +1,10 @@
+// TODO Format options
+// export const FORMAT = {
+//     TIME_ONLY: (d: Date) => `${d.getUTCHours()}:${d.getUTCMinutes()} UTC`,
+//     DAY: (d: Date) => `${d.getUTCDay()} ${d.getUTCDate()} ${d.getUTCMonth()} ${d.getUTCFullYear()}`,
+//     DAY_AND_TIME: (d: Date) => `${d.getUTCDay()} ${d.getUTCDate()} ${d.getUTCMonth()} ${d.getUTCFullYear()}  ${d.getUTCHours()}:${d.getUTCMinutes()}`,
+// };
+
 export const DateString = ({children, defaultValue}: {children: any; defaultValue?: any}) => {
     const fallback = defaultValue || "NOT A VALID DATE";
     try {