diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts index 2ffabbbf..f87befd5 100644 --- a/client/src/gql/graphql.ts +++ b/client/src/gql/graphql.ts @@ -5,132 +5,147 @@ export type InputMaybe = Maybe; export type Exact = { [K in keyof T]: T[K] }; export type MakeOptional = Omit & { [SubKey in K]?: Maybe }; export type MakeMaybe = Omit & { [SubKey in K]: Maybe }; -export type MakeEmpty = { [_ in K]?: never }; -export type Incremental = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never }; /** All built-in and custom scalars, mapped to their actual values */ export type Scalars = { - ID: { input: string; output: string; } - String: { input: string; output: string; } - Boolean: { input: boolean; output: boolean; } - Int: { input: number; output: number; } - Float: { input: number; output: number; } + ID: string; + String: string; + Boolean: boolean; + Int: number; + Float: number; /** * The `DateTime` scalar type represents a DateTime * value as specified by * [iso8601](https://en.wikipedia.org/wiki/ISO_8601). */ - DateTime: { input: any; output: any; } + DateTime: any; /** * The `GenericScalar` scalar type represents a generic * GraphQL scalar value that could be: * String, Boolean, Int, Float, List or Object. */ - GenericScalar: { input: any; output: any; } - JSONStreamField: { input: any; output: any; } + GenericScalar: any; + JSONStreamField: any; /** * Allows use of a JSON String for input / output from the GraphQL schema. * * Use of this type is *not recommended* as you lose the benefits of having a defined, static * schema (one of the key benefits of GraphQL). */ - JSONString: { input: any; output: any; } + JSONString: any; }; /** An enumeration. */ -export type AssignmentAssignmentAssignmentTypeChoices = +export enum AssignmentAssignmentAssignmentTypeChoices { /** CASEWORK */ - | 'CASEWORK' + Casework = 'CASEWORK', /** PREP_ASSIGNMENT */ - | 'PREP_ASSIGNMENT' + PrepAssignment = 'PREP_ASSIGNMENT', /** REFLECTION */ - | 'REFLECTION'; + Reflection = 'REFLECTION' +} /** An enumeration. */ -export type AssignmentAssignmentCompletionCompletionStatusChoices = +export enum AssignmentAssignmentCompletionCompletionStatusChoices { /** EVALUATION_IN_PROGRESS */ - | 'EVALUATION_IN_PROGRESS' + EvaluationInProgress = 'EVALUATION_IN_PROGRESS', /** EVALUATION_SUBMITTED */ - | 'EVALUATION_SUBMITTED' + EvaluationSubmitted = 'EVALUATION_SUBMITTED', /** IN_PROGRESS */ - | 'IN_PROGRESS' + InProgress = 'IN_PROGRESS', /** SUBMITTED */ - | 'SUBMITTED'; + Submitted = 'SUBMITTED' +} export type AssignmentCompletionMutation = { __typename?: 'AssignmentCompletionMutation'; - assignment_completion?: Maybe; + assignment_completion?: Maybe; }; -export type AssignmentCompletionObjectType = { - __typename?: 'AssignmentCompletionObjectType'; - additional_json_data: Scalars['JSONString']['output']; - assignment: AssignmentObjectType; +export type AssignmentCompletionType = { + __typename?: 'AssignmentCompletionType'; + additional_json_data: Scalars['JSONString']; + assignment: AssignmentType; assignment_user: UserType; - completion_data?: Maybe; + completion_data?: Maybe; completion_status: AssignmentAssignmentCompletionCompletionStatusChoices; - created_at: Scalars['DateTime']['output']; - evaluation_grade?: Maybe; - evaluation_points?: Maybe; - evaluation_submitted_at?: Maybe; + created_at: Scalars['DateTime']; + evaluation_grade?: Maybe; + evaluation_points?: Maybe; + evaluation_submitted_at?: Maybe; evaluation_user?: Maybe; - id: Scalars['ID']['output']; - submitted_at?: Maybe; - updated_at: Scalars['DateTime']['output']; + id: Scalars['ID']; + submitted_at?: Maybe; + updated_at: Scalars['DateTime']; }; -/** An enumeration. */ -export type AssignmentCompletionStatus = - | 'EVALUATION_IN_PROGRESS' - | 'EVALUATION_SUBMITTED' - | 'IN_PROGRESS' - | 'SUBMITTED'; - -export type AssignmentObjectType = CoursePageInterface & { - __typename?: 'AssignmentObjectType'; +export type AssignmentType = CoursePageInterface & { + __typename?: 'AssignmentType'; assignment_type: AssignmentAssignmentAssignmentTypeChoices; - content_type?: Maybe; + content_type?: Maybe; /** Zeitaufwand als Text */ - effort_required: Scalars['String']['output']; + effort_required: Scalars['String']; /** Beschreibung der Bewertung */ - evaluation_description: Scalars['String']['output']; + evaluation_description: Scalars['String']; /** URL zum Beurteilungsinstrument */ - evaluation_document_url: Scalars['String']['output']; - evaluation_tasks?: Maybe; - frontend_url?: Maybe; - id?: Maybe; + evaluation_document_url: Scalars['String']; + evaluation_tasks?: Maybe; + frontend_url?: Maybe; + id?: Maybe; /** Erläuterung der Ausgangslage */ - intro_text: Scalars['String']['output']; - live?: Maybe; - performance_objectives?: Maybe; - slug?: Maybe; - tasks?: Maybe; - title?: Maybe; - translation_key?: Maybe; + intro_text: Scalars['String']; + live?: Maybe; + performance_objectives?: Maybe; + slug?: Maybe; + tasks?: Maybe; + title?: Maybe; + translation_key?: Maybe; +}; + +export type AttendanceCourseUserMutation = { + __typename?: 'AttendanceCourseUserMutation'; + course_session_attendance_course?: Maybe; +}; + +export type AttendanceUserInputType = { + user_id?: InputMaybe; +}; + +export type AttendanceUserType = { + __typename?: 'AttendanceUserType'; + email?: Maybe; + first_name?: Maybe; + last_name?: Maybe; + user_id?: Maybe; }; /** An enumeration. */ -export type CoreUserLanguageChoices = +export enum CoreUserLanguageChoices { /** Deutsch */ - | 'DE' + De = 'DE', /** Français */ - | 'FR' + Fr = 'FR', /** Italiano */ - | 'IT'; + It = 'IT' +} export type CoursePageInterface = { - content_type?: Maybe; - frontend_url?: Maybe; - id?: Maybe; - live?: Maybe; - slug?: Maybe; - title?: Maybe; - translation_key?: Maybe; + content_type?: Maybe; + frontend_url?: Maybe; + id?: Maybe; + live?: Maybe; + slug?: Maybe; + title?: Maybe; + translation_key?: Maybe; }; export type CourseSessionAttendanceCourseType = { __typename?: 'CourseSessionAttendanceCourseType'; + attendance_user_list?: Maybe>>; + course_session_id?: Maybe; + due_date_id?: Maybe; end?: Maybe; id: Scalars['ID']; + learning_content_id?: Maybe; location: Scalars['String']; start?: Maybe; trainer: Scalars['String']; @@ -138,112 +153,119 @@ export type CourseSessionAttendanceCourseType = { export type CourseType = { __typename?: 'CourseType'; - category_name: Scalars['String']['output']; - id: Scalars['ID']['output']; + category_name: Scalars['String']; + id: Scalars['ID']; learning_path?: Maybe; - slug: Scalars['String']['output']; - title: Scalars['String']['output']; + slug: Scalars['String']; + title: Scalars['String']; }; export type ErrorType = { __typename?: 'ErrorType'; - field: Scalars['String']['output']; - messages: Array; + field: Scalars['String']; + messages: Array; }; export type FeedbackResponse = Node & { __typename?: 'FeedbackResponse'; - created_at: Scalars['DateTime']['output']; - data?: Maybe; + created_at: Scalars['DateTime']; + data?: Maybe; /** The ID of the object */ - id: Scalars['ID']['output']; + id: Scalars['ID']; }; export type LearningPathType = CoursePageInterface & { __typename?: 'LearningPathType'; - content_type?: Maybe; - depth: Scalars['Int']['output']; - draft_title: Scalars['String']['output']; - expire_at?: Maybe; - expired: Scalars['Boolean']['output']; - first_published_at?: Maybe; - frontend_url?: Maybe; - go_live_at?: Maybe; - has_unpublished_changes: Scalars['Boolean']['output']; - id?: Maybe; - last_published_at?: Maybe; - latest_revision_created_at?: Maybe; - live?: Maybe; - locked: Scalars['Boolean']['output']; - locked_at?: Maybe; + content_type?: Maybe; + depth: Scalars['Int']; + draft_title: Scalars['String']; + expire_at?: Maybe; + expired: Scalars['Boolean']; + first_published_at?: Maybe; + frontend_url?: Maybe; + go_live_at?: Maybe; + has_unpublished_changes: Scalars['Boolean']; + id?: Maybe; + last_published_at?: Maybe; + latest_revision_created_at?: Maybe; + live?: Maybe; + locked: Scalars['Boolean']; + locked_at?: Maybe; locked_by?: Maybe; - numchild: Scalars['Int']['output']; + numchild: Scalars['Int']; owner?: Maybe; - path: Scalars['String']['output']; + path: Scalars['String']; /** Die informative Beschreibung, dargestellt in Suchmaschinen-Ergebnissen unter der Überschrift. */ - search_description: Scalars['String']['output']; + search_description: Scalars['String']; /** Der Titel der Seite, dargestellt in Suchmaschinen-Ergebnissen als die verlinkte Überschrift. */ - seo_title: Scalars['String']['output']; + seo_title: Scalars['String']; /** Ob ein Link zu dieser Seite in automatisch generierten Menüs auftaucht. */ - show_in_menus: Scalars['Boolean']['output']; - slug?: Maybe; - title?: Maybe; - translation_key?: Maybe; - url_path: Scalars['String']['output']; + show_in_menus: Scalars['Boolean']; + slug?: Maybe; + title?: Maybe; + translation_key?: Maybe; + url_path: Scalars['String']; }; export type Mutation = { __typename?: 'Mutation'; send_feedback?: Maybe; + update_course_session_attendance_course_users?: Maybe; upsert_assignment_completion?: Maybe; }; -export type MutationSendFeedbackArgs = { +export type MutationSend_FeedbackArgs = { input: SendFeedbackInput; }; -export type MutationUpsertAssignmentCompletionArgs = { - assignment_id: Scalars['ID']['input']; - assignment_user_id?: InputMaybe; - completion_data_string?: InputMaybe; - completion_status?: InputMaybe; - course_session_id: Scalars['ID']['input']; - evaluation_grade?: InputMaybe; - evaluation_points?: InputMaybe; +export type MutationUpdate_Course_Session_Attendance_Course_UsersArgs = { + attendance_user_list: Array>; + id: Scalars['ID']; +}; + + +export type MutationUpsert_Assignment_CompletionArgs = { + assignment_id: Scalars['ID']; + assignment_user_id?: InputMaybe; + completion_data_string?: InputMaybe; + completion_status?: InputMaybe; + course_session_id: Scalars['ID']; + evaluation_grade?: InputMaybe; + evaluation_points?: InputMaybe; }; /** An object with an ID */ export type Node = { /** The ID of the object */ - id: Scalars['ID']['output']; + id: Scalars['ID']; }; export type Query = { __typename?: 'Query'; - assignment?: Maybe; - assignment_completion?: Maybe; + assignment?: Maybe; + assignment_completion?: Maybe; course?: Maybe; course_session_attendance_course?: Maybe; }; export type QueryAssignmentArgs = { - id?: InputMaybe; - slug?: InputMaybe; + id?: InputMaybe; + slug?: InputMaybe; }; -export type QueryAssignmentCompletionArgs = { - assignment_id: Scalars['ID']['input']; - assignment_user_id?: InputMaybe; - course_session_id: Scalars['ID']['input']; +export type QueryAssignment_CompletionArgs = { + assignment_id: Scalars['ID']; + assignment_user_id?: InputMaybe; + course_session_id: Scalars['ID']; }; export type QueryCourseArgs = { - id?: InputMaybe; + id?: InputMaybe; }; @@ -253,15 +275,15 @@ export type QueryCourse_Session_Attendance_CourseArgs = { }; export type SendFeedbackInput = { - clientMutationId?: InputMaybe; - course_session: Scalars['Int']['input']; - data?: InputMaybe; - page: Scalars['String']['input']; + clientMutationId?: InputMaybe; + course_session: Scalars['Int']; + data?: InputMaybe; + page: Scalars['String']; }; export type SendFeedbackPayload = { __typename?: 'SendFeedbackPayload'; - clientMutationId?: Maybe; + clientMutationId?: Maybe; /** May contain more than one error for same field. */ errors?: Maybe>>; feedback_response?: Maybe; @@ -269,14 +291,14 @@ export type SendFeedbackPayload = { export type UserType = { __typename?: 'UserType'; - avatar_url: Scalars['String']['output']; - email: Scalars['String']['output']; - first_name: Scalars['String']['output']; - id: Scalars['ID']['output']; + avatar_url: Scalars['String']; + email: Scalars['String']; + first_name: Scalars['String']; + id: Scalars['ID']; language: CoreUserLanguageChoices; - last_name: Scalars['String']['output']; + last_name: Scalars['String']; /** Erforderlich. 150 Zeichen oder weniger. Nur Buchstaben, Ziffern und @/./+/-/_. */ - username: Scalars['String']['output']; + username: Scalars['String']; }; export type SendFeedbackMutationMutationVariables = Exact<{ @@ -287,29 +309,29 @@ export type SendFeedbackMutationMutationVariables = Exact<{ export type SendFeedbackMutationMutation = { __typename?: 'Mutation', send_feedback?: { __typename?: 'SendFeedbackPayload', feedback_response?: { __typename?: 'FeedbackResponse', id: string } | null, errors?: Array<{ __typename?: 'ErrorType', field: string, messages: Array } | null> | null } | null }; export type UpsertAssignmentCompletionMutationVariables = Exact<{ - assignmentId: Scalars['ID']['input']; - courseSessionId: Scalars['ID']['input']; - assignmentUserId?: InputMaybe; - completionStatus: AssignmentCompletionStatus; - completionDataString: Scalars['String']['input']; - evaluationGrade?: InputMaybe; - evaluationPoints?: InputMaybe; + assignmentId: Scalars['ID']; + courseSessionId: Scalars['ID']; + assignmentUserId?: InputMaybe; + completionStatus: Scalars['String']; + completionDataString: Scalars['String']; + evaluationGrade?: InputMaybe; + evaluationPoints?: InputMaybe; }>; -export type UpsertAssignmentCompletionMutation = { __typename?: 'Mutation', upsert_assignment_completion?: { __typename?: 'AssignmentCompletionMutation', assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null } | null } | null }; +export type UpsertAssignmentCompletionMutation = { __typename?: 'Mutation', upsert_assignment_completion?: { __typename?: 'AssignmentCompletionMutation', assignment_completion?: { __typename?: 'AssignmentCompletionType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null } | null } | null }; export type AssignmentCompletionQueryQueryVariables = Exact<{ - assignmentId: Scalars['ID']['input']; - courseSessionId: Scalars['ID']['input']; - assignmentUserId?: InputMaybe; + assignmentId: Scalars['ID']; + courseSessionId: Scalars['ID']; + assignmentUserId?: InputMaybe; }>; -export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, content_type?: string | null, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id?: string | null, intro_text: string, performance_objectives?: any | null, slug?: string | null, tasks?: any | null, title?: string | null, translation_key?: string | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null, evaluation_user?: { __typename?: 'UserType', id: string } | null, assignment_user: { __typename?: 'UserType', id: string } } | null }; +export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, content_type?: string | null, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id?: string | null, intro_text: string, performance_objectives?: any | null, slug?: string | null, tasks?: any | null, title?: string | null, translation_key?: string | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null, evaluation_user?: { __typename?: 'UserType', id: string } | null, assignment_user: { __typename?: 'UserType', id: string } } | null }; export type CourseQueryQueryVariables = Exact<{ - courseId: Scalars['Int']['input']; + courseId: Scalars['Int']; }>; @@ -317,6 +339,6 @@ export type CourseQueryQuery = { __typename?: 'Query', course?: { __typename?: ' export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendFeedbackInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode; -export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AssignmentCompletionStatus"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode; +export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode; export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode; export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode; \ No newline at end of file diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql index bc2d6843..b6811b08 100644 --- a/client/src/gql/schema.graphql +++ b/client/src/gql/schema.graphql @@ -1,16 +1,20 @@ type Query { course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseType course(id: Int): CourseType - assignment(id: ID, slug: String): AssignmentObjectType - assignment_completion(assignment_id: ID!, course_session_id: ID!, assignment_user_id: ID): AssignmentCompletionObjectType + assignment(id: ID, slug: String): AssignmentType + assignment_completion(assignment_id: ID!, course_session_id: ID!, assignment_user_id: ID): AssignmentCompletionType } type CourseSessionAttendanceCourseType { id: ID! location: String! trainer: String! + course_session_id: ID + learning_content_id: ID + due_date_id: ID end: DateTime start: DateTime + attendance_user_list: [AttendanceUserType] } """ @@ -20,6 +24,13 @@ value as specified by """ scalar DateTime +type AttendanceUserType { + user_id: ID + first_name: String + last_name: String + email: String +} + type CourseType { id: ID! title: String! @@ -105,7 +116,7 @@ enum CoreUserLanguageChoices { IT } -type AssignmentObjectType implements CoursePageInterface { +type AssignmentType implements CoursePageInterface { assignment_type: AssignmentAssignmentAssignmentTypeChoices! """Erläuterung der Ausgangslage""" @@ -145,7 +156,7 @@ enum AssignmentAssignmentAssignmentTypeChoices { scalar JSONStreamField -type AssignmentCompletionObjectType { +type AssignmentCompletionType { id: ID! created_at: DateTime! updated_at: DateTime! @@ -155,7 +166,7 @@ type AssignmentCompletionObjectType { evaluation_grade: Float evaluation_points: Float assignment_user: UserType! - assignment: AssignmentObjectType! + assignment: AssignmentType! completion_status: AssignmentAssignmentCompletionCompletionStatusChoices! completion_data: GenericScalar additional_json_data: JSONString! @@ -193,7 +204,8 @@ scalar JSONString type Mutation { send_feedback(input: SendFeedbackInput!): SendFeedbackPayload - upsert_assignment_completion(assignment_id: ID!, assignment_user_id: ID, completion_data_string: String, completion_status: AssignmentCompletionStatus, course_session_id: ID!, evaluation_grade: Float, evaluation_points: Float): AssignmentCompletionMutation + update_course_session_attendance_course_users(attendance_user_list: [AttendanceUserInputType]!, id: ID!): AttendanceCourseUserMutation + upsert_assignment_completion(assignment_id: ID!, assignment_user_id: ID, completion_data_string: String, completion_status: String, course_session_id: ID!, evaluation_grade: Float, evaluation_points: Float): AssignmentCompletionMutation } type SendFeedbackPayload { @@ -229,14 +241,14 @@ input SendFeedbackInput { clientMutationId: String } -type AssignmentCompletionMutation { - assignment_completion: AssignmentCompletionObjectType +type AttendanceCourseUserMutation { + course_session_attendance_course: CourseSessionAttendanceCourseType } -"""An enumeration.""" -enum AssignmentCompletionStatus { - IN_PROGRESS - SUBMITTED - EVALUATION_IN_PROGRESS - EVALUATION_SUBMITTED +input AttendanceUserInputType { + user_id: ID +} + +type AssignmentCompletionMutation { + assignment_completion: AssignmentCompletionType } \ No newline at end of file diff --git a/server/vbv_lernwelt/core/schema.py b/server/vbv_lernwelt/core/schema.py index e2a2476e..ed89136d 100644 --- a/server/vbv_lernwelt/core/schema.py +++ b/server/vbv_lernwelt/core/schema.py @@ -3,6 +3,7 @@ import graphene from vbv_lernwelt.assignment.graphql.mutations import AssignmentMutation from vbv_lernwelt.assignment.graphql.queries import AssignmentQuery from vbv_lernwelt.course.schema import CourseQuery +from vbv_lernwelt.course_session.graphql.mutations import CourseSessionMutation from vbv_lernwelt.course_session.graphql.queries import CourseSessionQuery from vbv_lernwelt.feedback.graphql.mutations import FeedbackMutation @@ -11,7 +12,9 @@ class Query(AssignmentQuery, CourseQuery, CourseSessionQuery, graphene.ObjectTyp pass -class Mutation(AssignmentMutation, FeedbackMutation, graphene.ObjectType): +class Mutation( + AssignmentMutation, CourseSessionMutation, FeedbackMutation, graphene.ObjectType +): pass diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py index 1e3df840..d4ea4043 100644 --- a/server/vbv_lernwelt/course/creators/test_course.py +++ b/server/vbv_lernwelt/course/creators/test_course.py @@ -1,5 +1,4 @@ import json -import random from datetime import datetime, timedelta import wagtail_factories @@ -41,6 +40,7 @@ from vbv_lernwelt.course_session.models import ( CourseSessionAssignment, CourseSessionAttendanceCourse, ) +from vbv_lernwelt.duedate.models import DueDate from vbv_lernwelt.learnpath.models import ( Circle, LearningContentAssignment, @@ -98,6 +98,31 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False): id=TEST_COURSE_SESSION_BERN_ID, start_date=now, ) + CourseSessionAttendanceCourse.objects.create( + course_session=cs_bern, + learning_content=LearningContentAttendanceCourse.objects.get( + slug="test-lehrgang-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug" + ), + due_date=DueDate.objects.create( + course_session=cs_bern, + start=timezone.make_aware( + (datetime.now() + timedelta(days=15)).replace( + hour=10, minute=30, second=0, microsecond=0 + ) + ), + end=timezone.make_aware( + (datetime.now() + timedelta(days=15)).replace( + hour=17, minute=30, second=0, microsecond=0 + ) + ), + page=LearningContentAttendanceCourse.objects.get( + slug="test-lehrgang-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug" + ), + ), + location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern", + trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch", + ) + cs_zurich = CourseSession.objects.create( course_id=COURSE_TEST_ID, title="Test Zürich 2022 a", diff --git a/server/vbv_lernwelt/course_session/graphql/mutations.py b/server/vbv_lernwelt/course_session/graphql/mutations.py index 24c280cd..95d5c137 100644 --- a/server/vbv_lernwelt/course_session/graphql/mutations.py +++ b/server/vbv_lernwelt/course_session/graphql/mutations.py @@ -1,7 +1,64 @@ +import graphene import structlog +from rest_framework.exceptions import PermissionDenied + +from vbv_lernwelt.core.models import User +from vbv_lernwelt.course.permissions import has_course_access +from vbv_lernwelt.course_session.graphql.types import CourseSessionAttendanceCourseType +from vbv_lernwelt.course_session.models import CourseSessionAttendanceCourse logger = structlog.get_logger(__name__) +class AttendanceUserInputType(graphene.InputObjectType): + user_id = graphene.ID(required=True) + + +class AttendanceCourseUserMutation(graphene.Mutation): + course_session_attendance_course = graphene.Field(CourseSessionAttendanceCourseType) + + class Input: + id = graphene.ID(required=True) + attendance_user_list = graphene.List(AttendanceUserInputType, required=True) + + @classmethod + def mutate( + cls, + root, + info, + id, + attendance_user_list, + ): + attendance_course = CourseSessionAttendanceCourse.objects.get(id=id) + + if not has_course_access( + info.context.user, + attendance_course.course_session.course_id, + ): + raise PermissionDenied() + + # FIXME: create completion for every user in attendance_user_list + + result_user_list = [] + for attendance_user in attendance_user_list: + u = User.objects.filter(id=attendance_user.user_id).first() + if u is not None: + result_user_list.append( + { + "user_id": u.id, + "email": u.email, + "first_name": u.first_name, + "last_name": u.last_name, + } + ) + + attendance_course.attendance_user_list = result_user_list + attendance_course.save() + + return AttendanceCourseUserMutation( + course_session_attendance_course=attendance_course + ) + + class CourseSessionMutation: - pass + update_course_session_attendance_course_users = AttendanceCourseUserMutation.Field() diff --git a/server/vbv_lernwelt/course_session/graphql/types.py b/server/vbv_lernwelt/course_session/graphql/types.py index 4125511d..18206e26 100644 --- a/server/vbv_lernwelt/course_session/graphql/types.py +++ b/server/vbv_lernwelt/course_session/graphql/types.py @@ -4,12 +4,22 @@ from graphene_django import DjangoObjectType from vbv_lernwelt.course_session.models import CourseSessionAttendanceCourse +class AttendanceUserType(graphene.ObjectType): + user_id = graphene.ID() + first_name = graphene.String() + last_name = graphene.String() + email = graphene.String() + + class CourseSessionAttendanceCourseType(DjangoObjectType): course_session_id = graphene.ID(source="course_session_id") learning_content_id = graphene.ID(source="learning_content_id") due_date_id = graphene.ID(source="due_date_id") end = graphene.DateTime() start = graphene.DateTime() + attendance_user_list = graphene.List( + AttendanceUserType, source="attendance_user_list" + ) class Meta: model = CourseSessionAttendanceCourse @@ -22,7 +32,6 @@ class CourseSessionAttendanceCourseType(DjangoObjectType): "trainer", "start", "end", - # "attendance_user_list", ) def resolve_start(self, info): diff --git a/server/vbv_lernwelt/course_session/migrations/0002_coursesessionattendancecourse_attendance_user_list.py b/server/vbv_lernwelt/course_session/migrations/0002_coursesessionattendancecourse_attendance_user_list.py new file mode 100644 index 00000000..0fe26463 --- /dev/null +++ b/server/vbv_lernwelt/course_session/migrations/0002_coursesessionattendancecourse_attendance_user_list.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2023-06-23 15:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("course_session", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="coursesessionattendancecourse", + name="attendance_user_list", + field=models.JSONField(default=list), + ), + ] diff --git a/server/vbv_lernwelt/course_session/models.py b/server/vbv_lernwelt/course_session/models.py index 91d9f7f6..7cd6738c 100644 --- a/server/vbv_lernwelt/course_session/models.py +++ b/server/vbv_lernwelt/course_session/models.py @@ -29,6 +29,11 @@ class CourseSessionAttendanceCourse(models.Model): location = models.CharField(max_length=255, blank=True, default="") trainer = models.CharField(max_length=255, blank=True, default="") + # because the attendance list is more of a snapshot of the current state + # we will store the attendance list as a JSONField + # the important field of the list type is "user_id" + attendance_user_list = models.JSONField(default=list) + def save(self, *args, **kwargs): if not self.pk: title = "" diff --git a/server/vbv_lernwelt/course_session/tests/test_graphql.py b/server/vbv_lernwelt/course_session/tests/test_graphql.py index 6b63c8c7..d678480d 100644 --- a/server/vbv_lernwelt/course_session/tests/test_graphql.py +++ b/server/vbv_lernwelt/course_session/tests/test_graphql.py @@ -2,25 +2,93 @@ import json from graphene_django.utils.testing import GraphQLTestCase +from vbv_lernwelt.core.create_default_users import create_default_users +from vbv_lernwelt.core.models import User +from vbv_lernwelt.course.creators.test_course import create_test_course +from vbv_lernwelt.course.models import CourseSession -class MyFancyTestCase(GraphQLTestCase): - def test_some_query(self): + +class AttendanceCourseUserMutationTestCase(GraphQLTestCase): + GRAPHQL_URL = "/server/graphql/" + + def setUp(self): + create_default_users() + create_test_course(include_vv=False, with_sessions=True) + self.course_session = CourseSession.objects.get(title="Test Bern 2022 a") + self.attendance_course = ( + self.course_session.coursesessionattendancecourse_set.first() + ) + self.trainer = User.objects.get(username="test-trainer1@example.com") + self.client.force_login(self.trainer) + + def test_simple_query(self): response = self.query( """ - query { - myModel { - id - name - } + { + course_session_attendance_course(id:1) { + id + trainer + } } - """, - op_name="myModel", + """ ) content = json.loads(response.content) - # This validates the status code and if you get errors + self.assertResponseNoErrors(response) + self.assertEqual( + content["data"]["course_session_attendance_course"]["trainer"], + "Roland Grossenbacher, roland.grossenbacher@helvetia.ch", + ) + + def test_mutation_add_user_when_present(self): + student = User.objects.get(username="test-student1@example.com") + + query = f""" + mutation {{ + update_course_session_attendance_course_users( + id:1, + attendance_user_list:[ + {{user_id: {student.id}}}, + {{user_id: "123123123"}} + ] + ) {{ + course_session_attendance_course {{ + id + attendance_user_list {{ + user_id + first_name + last_name + email + }} + }} + }} + }} + """ + print(query) + response = self.query(query) self.assertResponseNoErrors(response) - # Add some more asserts if you like - ... + data = json.loads(response.content) + + self.maxDiff = None + self.assertDictEqual( + { + "data": { + "update_course_session_attendance_course_users": { + "course_session_attendance_course": { + "id": str(self.attendance_course.id), + "attendance_user_list": [ + { + "user_id": str(student.id), + "first_name": student.first_name, + "last_name": student.last_name, + "email": student.email, + } + ], + } + } + } + }, + data, + )