ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in feature/uuid-primary-key (pull request #159) 

Feature/uuid primary key

Approved-by: Christian Cueni
This commit is contained in:
Daniel Egger 2023-07-17 15:21:13 +00:00
parent 5bd8192f05 e8178fa36a
commit 8e16daa525
106 changed files with 648 additions and 1642 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/gql/gql.ts
View File

@ -14,8 +14,8 @@ import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-
*/ */
const documents = { const documents = {
"\n mutation SendFeedbackMutation($input: SendFeedbackInput!) {\n send_feedback(input: $input) {\n feedback_response {\n id\n }\n errors {\n field\n messages\n }\n }\n }\n": types.SendFeedbackMutationDocument, "\n mutation SendFeedbackMutation($input: SendFeedbackInput!) {\n send_feedback(input: $input) {\n feedback_response {\n id\n }\n errors {\n field\n messages\n }\n }\n }\n": types.SendFeedbackMutationDocument,
"\n mutation UpsertAssignmentCompletion(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: ID\n $completionStatus: AssignmentCompletionStatus!\n $completionDataString: String!\n $evaluationGrade: Float\n $evaluationPoints: Float\n ) {\n upsert_assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n learning_content_page_id: $learningContentId\n assignment_user_id: $assignmentUserId\n completion_status: $completionStatus\n completion_data_string: $completionDataString\n evaluation_grade: $evaluationGrade\n evaluation_points: $evaluationPoints\n ) {\n assignment_completion {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n }\n": types.UpsertAssignmentCompletionDocument, "\n mutation UpsertAssignmentCompletion(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: UUID\n $completionStatus: AssignmentCompletionStatus!\n $completionDataString: String!\n $evaluationGrade: Float\n $evaluationPoints: Float\n ) {\n upsert_assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n learning_content_page_id: $learningContentId\n assignment_user_id: $assignmentUserId\n completion_status: $completionStatus\n completion_data_string: $completionDataString\n evaluation_grade: $evaluationGrade\n evaluation_points: $evaluationPoints\n ) {\n assignment_completion {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n }\n": types.UpsertAssignmentCompletionDocument,
"\n query assignmentCompletionQuery(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: ID\n ) {\n assignment(id: $assignmentId) {\n assignment_type\n content_type\n effort_required\n evaluation_description\n evaluation_document_url\n evaluation_tasks\n id\n intro_text\n performance_objectives\n slug\n tasks\n title\n translation_key\n }\n assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n assignment_user_id: $assignmentUserId\n learning_content_page_id: $learningContentId\n ) {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_user {\n id\n }\n assignment_user {\n id\n }\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n": types.AssignmentCompletionQueryDocument, "\n query assignmentCompletionQuery(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: UUID\n ) {\n assignment(id: $assignmentId) {\n assignment_type\n content_type\n effort_required\n evaluation_description\n evaluation_document_url\n evaluation_tasks\n id\n intro_text\n performance_objectives\n slug\n tasks\n title\n translation_key\n }\n assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n assignment_user_id: $assignmentUserId\n learning_content_page_id: $learningContentId\n ) {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_user {\n id\n }\n assignment_user {\n id\n }\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n": types.AssignmentCompletionQueryDocument,
"\n query courseQuery($courseId: Int!) {\n course(id: $courseId) {\n id\n slug\n title\n category_name\n learning_path {\n id\n }\n }\n }\n": types.CourseQueryDocument, "\n query courseQuery($courseId: Int!) {\n course(id: $courseId) {\n id\n slug\n title\n category_name\n learning_path {\n id\n }\n }\n }\n": types.CourseQueryDocument,
}; };
@ -40,11 +40,11 @@ export function graphql(source: "\n mutation SendFeedbackMutation($input: SendF
/** /**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/ */
export function graphql(source: "\n mutation UpsertAssignmentCompletion(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: ID\n $completionStatus: AssignmentCompletionStatus!\n $completionDataString: String!\n $evaluationGrade: Float\n $evaluationPoints: Float\n ) {\n upsert_assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n learning_content_page_id: $learningContentId\n assignment_user_id: $assignmentUserId\n completion_status: $completionStatus\n completion_data_string: $completionDataString\n evaluation_grade: $evaluationGrade\n evaluation_points: $evaluationPoints\n ) {\n assignment_completion {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n }\n"): (typeof documents)["\n mutation UpsertAssignmentCompletion(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: ID\n $completionStatus: AssignmentCompletionStatus!\n $completionDataString: String!\n $evaluationGrade: Float\n $evaluationPoints: Float\n ) {\n upsert_assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n learning_content_page_id: $learningContentId\n assignment_user_id: $assignmentUserId\n completion_status: $completionStatus\n completion_data_string: $completionDataString\n evaluation_grade: $evaluationGrade\n evaluation_points: $evaluationPoints\n ) {\n assignment_completion {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n }\n"]; export function graphql(source: "\n mutation UpsertAssignmentCompletion(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: UUID\n $completionStatus: AssignmentCompletionStatus!\n $completionDataString: String!\n $evaluationGrade: Float\n $evaluationPoints: Float\n ) {\n upsert_assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n learning_content_page_id: $learningContentId\n assignment_user_id: $assignmentUserId\n completion_status: $completionStatus\n completion_data_string: $completionDataString\n evaluation_grade: $evaluationGrade\n evaluation_points: $evaluationPoints\n ) {\n assignment_completion {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n }\n"): (typeof documents)["\n mutation UpsertAssignmentCompletion(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: UUID\n $completionStatus: AssignmentCompletionStatus!\n $completionDataString: String!\n $evaluationGrade: Float\n $evaluationPoints: Float\n ) {\n upsert_assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n learning_content_page_id: $learningContentId\n assignment_user_id: $assignmentUserId\n completion_status: $completionStatus\n completion_data_string: $completionDataString\n evaluation_grade: $evaluationGrade\n evaluation_points: $evaluationPoints\n ) {\n assignment_completion {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n }\n"];
/** /**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/ */
export function graphql(source: "\n query assignmentCompletionQuery(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: ID\n ) {\n assignment(id: $assignmentId) {\n assignment_type\n content_type\n effort_required\n evaluation_description\n evaluation_document_url\n evaluation_tasks\n id\n intro_text\n performance_objectives\n slug\n tasks\n title\n translation_key\n }\n assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n assignment_user_id: $assignmentUserId\n learning_content_page_id: $learningContentId\n ) {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_user {\n id\n }\n assignment_user {\n id\n }\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n"): (typeof documents)["\n query assignmentCompletionQuery(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: ID\n ) {\n assignment(id: $assignmentId) {\n assignment_type\n content_type\n effort_required\n evaluation_description\n evaluation_document_url\n evaluation_tasks\n id\n intro_text\n performance_objectives\n slug\n tasks\n title\n translation_key\n }\n assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n assignment_user_id: $assignmentUserId\n learning_content_page_id: $learningContentId\n ) {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_user {\n id\n }\n assignment_user {\n id\n }\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n"]; export function graphql(source: "\n query assignmentCompletionQuery(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: UUID\n ) {\n assignment(id: $assignmentId) {\n assignment_type\n content_type\n effort_required\n evaluation_description\n evaluation_document_url\n evaluation_tasks\n id\n intro_text\n performance_objectives\n slug\n tasks\n title\n translation_key\n }\n assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n assignment_user_id: $assignmentUserId\n learning_content_page_id: $learningContentId\n ) {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_user {\n id\n }\n assignment_user {\n id\n }\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n"): (typeof documents)["\n query assignmentCompletionQuery(\n $assignmentId: ID!\n $courseSessionId: ID!\n $learningContentId: ID\n $assignmentUserId: UUID\n ) {\n assignment(id: $assignmentId) {\n assignment_type\n content_type\n effort_required\n evaluation_description\n evaluation_document_url\n evaluation_tasks\n id\n intro_text\n performance_objectives\n slug\n tasks\n title\n translation_key\n }\n assignment_completion(\n assignment_id: $assignmentId\n course_session_id: $courseSessionId\n assignment_user_id: $assignmentUserId\n learning_content_page_id: $learningContentId\n ) {\n id\n completion_status\n submitted_at\n evaluation_submitted_at\n evaluation_user {\n id\n }\n assignment_user {\n id\n }\n evaluation_grade\n evaluation_points\n completion_data\n }\n }\n"];
/** /**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/ */

29
client/src/gql/graphql.ts
View File

@ -34,6 +34,11 @@ export type Scalars = {
* schema (one of the key benefits of GraphQL). * schema (one of the key benefits of GraphQL).
*/ */
JSONString: { input: any; output: any; } JSONString: { input: any; output: any; }
/**
* Leverages the internal Python implementation of UUID (uuid.UUID) to provide native UUID objects
* in fields, resolvers and input.
*/
UUID: { input: any; output: any; }
}; };
/** An enumeration. */ /** An enumeration. */
@ -73,7 +78,7 @@ export type AssignmentCompletionObjectType = {
evaluation_points?: Maybe<Scalars['Float']['output']>; evaluation_points?: Maybe<Scalars['Float']['output']>;
evaluation_submitted_at?: Maybe<Scalars['DateTime']['output']>; evaluation_submitted_at?: Maybe<Scalars['DateTime']['output']>;
evaluation_user?: Maybe<UserType>; evaluation_user?: Maybe<UserType>;
id: Scalars['ID']['output']; id: Scalars['UUID']['output'];
learning_content_page_id?: Maybe<Scalars['ID']['output']>; learning_content_page_id?: Maybe<Scalars['ID']['output']>;
submitted_at?: Maybe<Scalars['DateTime']['output']>; submitted_at?: Maybe<Scalars['DateTime']['output']>;
updated_at: Scalars['DateTime']['output']; updated_at: Scalars['DateTime']['output'];
@ -116,7 +121,7 @@ export type AttendanceCourseUserMutation = {
export type AttendanceUserInputType = { export type AttendanceUserInputType = {
status: AttendanceUserStatus; status: AttendanceUserStatus;
user_id: Scalars['ID']['input']; user_id: Scalars['UUID']['input'];
}; };
/** An enumeration. */ /** An enumeration. */
@ -130,7 +135,7 @@ export type AttendanceUserType = {
first_name?: Maybe<Scalars['String']['output']>; first_name?: Maybe<Scalars['String']['output']>;
last_name?: Maybe<Scalars['String']['output']>; last_name?: Maybe<Scalars['String']['output']>;
status: AttendanceUserStatus; status: AttendanceUserStatus;
user_id: Scalars['ID']['output']; user_id: Scalars['UUID']['output'];
}; };
/** An enumeration. */ /** An enumeration. */
@ -242,7 +247,7 @@ export type MutationUpdateCourseSessionAttendanceCourseUsersArgs = {
export type MutationUpsertAssignmentCompletionArgs = { export type MutationUpsertAssignmentCompletionArgs = {
assignment_id: Scalars['ID']['input']; assignment_id: Scalars['ID']['input'];
assignment_user_id?: InputMaybe<Scalars['ID']['input']>; assignment_user_id?: InputMaybe<Scalars['UUID']['input']>;
completion_data_string?: InputMaybe<Scalars['String']['input']>; completion_data_string?: InputMaybe<Scalars['String']['input']>;
completion_status?: InputMaybe<AssignmentCompletionStatus>; completion_status?: InputMaybe<AssignmentCompletionStatus>;
course_session_id: Scalars['ID']['input']; course_session_id: Scalars['ID']['input'];
@ -274,7 +279,7 @@ export type QueryAssignmentArgs = {
export type QueryAssignmentCompletionArgs = { export type QueryAssignmentCompletionArgs = {
assignment_id: Scalars['ID']['input']; assignment_id: Scalars['ID']['input'];
assignment_user_id?: InputMaybe<Scalars['ID']['input']>; assignment_user_id?: InputMaybe<Scalars['UUID']['input']>;
course_session_id: Scalars['ID']['input']; course_session_id: Scalars['ID']['input'];
learning_content_page_id?: InputMaybe<Scalars['ID']['input']>; learning_content_page_id?: InputMaybe<Scalars['ID']['input']>;
}; };
@ -310,7 +315,7 @@ export type UserType = {
avatar_url: Scalars['String']['output']; avatar_url: Scalars['String']['output'];
email: Scalars['String']['output']; email: Scalars['String']['output'];
first_name: Scalars['String']['output']; first_name: Scalars['String']['output'];
id: Scalars['ID']['output']; id: Scalars['UUID']['output'];
language: CoreUserLanguageChoices; language: CoreUserLanguageChoices;
last_name: Scalars['String']['output']; last_name: Scalars['String']['output'];
/** Erforderlich. 150 Zeichen oder weniger. Nur Buchstaben, Ziffern und @/./+/-/_. */ /** Erforderlich. 150 Zeichen oder weniger. Nur Buchstaben, Ziffern und @/./+/-/_. */
@ -328,7 +333,7 @@ export type UpsertAssignmentCompletionMutationVariables = Exact<{
assignmentId: Scalars['ID']['input']; assignmentId: Scalars['ID']['input'];
courseSessionId: Scalars['ID']['input']; courseSessionId: Scalars['ID']['input'];
learningContentId?: InputMaybe<Scalars['ID']['input']>; learningContentId?: InputMaybe<Scalars['ID']['input']>;
assignmentUserId?: InputMaybe<Scalars['ID']['input']>; assignmentUserId?: InputMaybe<Scalars['UUID']['input']>;
completionStatus: AssignmentCompletionStatus; completionStatus: AssignmentCompletionStatus;
completionDataString: Scalars['String']['input']; completionDataString: Scalars['String']['input'];
evaluationGrade?: InputMaybe<Scalars['Float']['input']>; evaluationGrade?: InputMaybe<Scalars['Float']['input']>;
@ -336,17 +341,17 @@ export type UpsertAssignmentCompletionMutationVariables = Exact<{
}>; }>;
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?: 'AssignmentCompletionObjectType', id: any, 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<{ export type AssignmentCompletionQueryQueryVariables = Exact<{
assignmentId: Scalars['ID']['input']; assignmentId: Scalars['ID']['input'];
courseSessionId: Scalars['ID']['input']; courseSessionId: Scalars['ID']['input'];
learningContentId?: InputMaybe<Scalars['ID']['input']>; learningContentId?: InputMaybe<Scalars['ID']['input']>;
assignmentUserId?: InputMaybe<Scalars['ID']['input']>; assignmentUserId?: InputMaybe<Scalars['UUID']['input']>;
}>; }>;
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?: '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: any, 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: any } | null, assignment_user: { __typename?: 'UserType', id: any } } | null };
export type CourseQueryQueryVariables = Exact<{ export type CourseQueryQueryVariables = Exact<{
courseId: Scalars['Int']['input']; courseId: Scalars['Int']['input'];
@ -357,6 +362,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<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>; 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<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
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":"learningContentId"}},"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":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"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<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>; 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":"learningContentId"}},"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":"UUID"}}},{"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":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"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<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>;
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":"learningContentId"}},"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"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<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>; 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":"learningContentId"}},"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":"UUID"}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"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<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
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<CourseQueryQuery, CourseQueryQueryVariables>; 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<CourseQueryQuery, CourseQueryQueryVariables>;

19
client/src/gql/schema.graphql
View File

@ -2,7 +2,7 @@ type Query {
course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseType course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseType
course(id: Int): CourseType course(id: Int): CourseType
assignment(id: ID, slug: String): AssignmentObjectType assignment(id: ID, slug: String): AssignmentObjectType
assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: ID): AssignmentCompletionObjectType assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
} }
type CourseSessionAttendanceCourseType { type CourseSessionAttendanceCourseType {
@ -25,13 +25,19 @@ value as specified by
scalar DateTime scalar DateTime
type AttendanceUserType { type AttendanceUserType {
user_id: ID! user_id: UUID!
status: AttendanceUserStatus! status: AttendanceUserStatus!
first_name: String first_name: String
last_name: String last_name: String
email: String email: String
} }
"""
Leverages the internal Python implementation of UUID (uuid.UUID) to provide native UUID objects
in fields, resolvers and input.
"""
scalar UUID
"""An enumeration.""" """An enumeration."""
enum AttendanceUserStatus { enum AttendanceUserStatus {
PRESENT PRESENT
@ -98,14 +104,13 @@ interface CoursePageInterface {
} }
type UserType { type UserType {
id: ID!
""" """
Erforderlich. 150 Zeichen oder weniger. Nur Buchstaben, Ziffern und @/./+/-/_. Erforderlich. 150 Zeichen oder weniger. Nur Buchstaben, Ziffern und @/./+/-/_.
""" """
username: String! username: String!
first_name: String! first_name: String!
last_name: String! last_name: String!
id: UUID!
avatar_url: String! avatar_url: String!
email: String! email: String!
language: CoreUserLanguageChoices! language: CoreUserLanguageChoices!
@ -164,7 +169,7 @@ enum AssignmentAssignmentAssignmentTypeChoices {
scalar JSONStreamField scalar JSONStreamField
type AssignmentCompletionObjectType { type AssignmentCompletionObjectType {
id: ID! id: UUID!
created_at: DateTime! created_at: DateTime!
updated_at: DateTime! updated_at: DateTime!
submitted_at: DateTime submitted_at: DateTime
@ -213,7 +218,7 @@ scalar JSONString
type Mutation { type Mutation {
send_feedback(input: SendFeedbackInput!): SendFeedbackPayload send_feedback(input: SendFeedbackInput!): SendFeedbackPayload
update_course_session_attendance_course_users(attendance_user_list: [AttendanceUserInputType]!, id: ID!): AttendanceCourseUserMutation 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: AssignmentCompletionStatus, course_session_id: ID!, evaluation_grade: Float, evaluation_points: Float, learning_content_page_id: ID): AssignmentCompletionMutation upsert_assignment_completion(assignment_id: ID!, assignment_user_id: UUID, completion_data_string: String, completion_status: AssignmentCompletionStatus, course_session_id: ID!, evaluation_grade: Float, evaluation_points: Float, learning_content_page_id: ID): AssignmentCompletionMutation
} }
type SendFeedbackPayload { type SendFeedbackPayload {
@ -254,7 +259,7 @@ type AttendanceCourseUserMutation {
} }
input AttendanceUserInputType { input AttendanceUserInputType {
user_id: ID! user_id: UUID!
status: AttendanceUserStatus! status: AttendanceUserStatus!
} }

1
client/src/gql/typenames.ts
View File

@ -29,4 +29,5 @@ export const Query = "Query";
export const SendFeedbackInput = "SendFeedbackInput"; export const SendFeedbackInput = "SendFeedbackInput";
export const SendFeedbackPayload = "SendFeedbackPayload"; export const SendFeedbackPayload = "SendFeedbackPayload";
export const String = "String"; export const String = "String";
export const UUID = "UUID";
export const UserType = "UserType"; export const UserType = "UserType";

2
client/src/graphql/mutations.ts
View File

@ -5,7 +5,7 @@ export const UPSERT_ASSIGNMENT_COMPLETION_MUTATION = graphql(`
$assignmentId: ID! $assignmentId: ID!
$courseSessionId: ID! $courseSessionId: ID!
$learningContentId: ID $learningContentId: ID
$assignmentUserId: ID $assignmentUserId: UUID
$completionStatus: AssignmentCompletionStatus! $completionStatus: AssignmentCompletionStatus!
$completionDataString: String! $completionDataString: String!
$evaluationGrade: Float $evaluationGrade: Float

2
client/src/graphql/queries.ts
View File

@ -5,7 +5,7 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
$assignmentId: ID! $assignmentId: ID!
$courseSessionId: ID! $courseSessionId: ID!
$learningContentId: ID $learningContentId: ID
$assignmentUserId: ID $assignmentUserId: UUID
) { ) {
assignment(id: $assignmentId) { assignment(id: $assignmentId) {
assignment_type assignment_type

4
client/src/pages/cockpit/CockpitUserCirclePage.vue
View File

@ -19,9 +19,7 @@ onMounted(async () => {
}); });
const user = computed(() => { const user = computed(() => {
return cockpitStore.courseSessionUsers?.find( return cockpitStore.courseSessionUsers?.find((csu) => csu.user_id === props.userId);
(csu) => csu.user_id === Number(props.userId)
);
}); });
</script> </script>

4
client/src/pages/cockpit/CockpitUserProfilePage.vue
View File

@ -28,9 +28,7 @@ const learningPath = computed(() => {
}); });
const user = computed(() => { const user = computed(() => {
return cockpitStore.courseSessionUsers?.find( return cockpitStore.courseSessionUsers?.find((csu) => csu.user_id === props.userId);
(csu) => csu.user_id === Number(props.userId)
);
}); });
function setActiveClasses(isActive: boolean) { function setActiveClasses(isActive: boolean) {

2
client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
View File

@ -49,7 +49,7 @@ onMounted(async () => {
log.debug("AssignmentView mounted", props.assignmentId, props.userId); log.debug("AssignmentView mounted", props.assignmentId, props.userId);
state.assignmentUser = courseSession.value.users.find( state.assignmentUser = courseSession.value.users.find(
(user) => user.user_id === Number(props.userId) (user) => user.user_id === props.userId
); );
}); });

2
client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
View File

@ -88,7 +88,7 @@ const grade = computed(() => {
const evaluationUser = computed(() => { const evaluationUser = computed(() => {
if (props.assignmentCompletion.evaluation_user) { if (props.assignmentCompletion.evaluation_user) {
return (courseSession.value.users ?? []).find( return (courseSession.value.users ?? []).find(
(user) => user.user_id === Number(props.assignmentCompletion.evaluation_user) (user) => user.user_id === props.assignmentCompletion.evaluation_user
) as CourseSessionUser; ) as CourseSessionUser;
} }

4
client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
View File

@ -32,7 +32,7 @@ const state = reactive({
statusByUser: [] as { statusByUser: [] as {
userStatus: AssignmentCompletionStatus; userStatus: AssignmentCompletionStatus;
progressStatus: StatusCountKey; progressStatus: StatusCountKey;
userId: number; userId: string;
grade: number | null; grade: number | null;
}[], }[],
progressStatusCount: {} as StatusCount, progressStatusCount: {} as StatusCount,
@ -45,7 +45,7 @@ onMounted(async () => {
); );
}); });
function submissionStatusForUser(userId: number) { function submissionStatusForUser(userId: string) {
return state.statusByUser.find((s) => s.userId === userId); return state.statusByUser.find((s) => s.userId === userId);
} }

2
client/src/pages/cockpit/assignmentsPage/AssignmentSubmissionProgress.vue
View File

@ -26,7 +26,7 @@ const state = reactive({
statusByUser: [] as { statusByUser: [] as {
userStatus: AssignmentCompletionStatus; userStatus: AssignmentCompletionStatus;
progressStatus: StatusCountKey; progressStatus: StatusCountKey;
userId: number; userId: string;
}[], }[],
progressStatusCount: {} as StatusCount, progressStatusCount: {} as StatusCount,
}); });

2
client/src/pages/cockpit/cockpitPage/CockpitPage.vue
View File

@ -26,7 +26,7 @@ const competenceStore = useCompetenceStore();
const learningPathStore = useLearningPathStore(); const learningPathStore = useLearningPathStore();
const courseSession = useCurrentCourseSession(); const courseSession = useCurrentCourseSession();
function userCountStatusForCircle(userId: number, translationKey: string) { function userCountStatusForCircle(userId: string, translationKey: string) {
const criteria = competenceStore.flatPerformanceCriteria( const criteria = competenceStore.flatPerformanceCriteria(
userId, userId,
cockpitStore.selectedCircles cockpitStore.selectedCircles

2
client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
View File

@ -188,7 +188,7 @@ const subTitle = computed(() => {
const assignmentUser = computed(() => { const assignmentUser = computed(() => {
return courseSession.value.users.find( return courseSession.value.users.find(
(user) => user.user_id === Number(userStore.id) (user) => user.user_id === userStore.id
) as CourseSessionUser; ) as CourseSessionUser;
}); });

2
client/src/services/files.ts
View File

@ -98,6 +98,6 @@ export async function uploadCircleDocument(
return Promise.resolve(newDocument); return Promise.resolve(newDocument);
} }
export async function deleteCircleDocument(documentId: number) { export async function deleteCircleDocument(documentId: string) {
return itDelete(`/api/core/document/${documentId}/`); return itDelete(`/api/core/document/${documentId}/`);
} }

4
client/src/services/learningPath.ts
View File

@ -41,7 +41,7 @@ export class LearningPath implements WagtailLearningPath {
public static fromJson( public static fromJson(
json: WagtailLearningPath, json: WagtailLearningPath,
completionData: CourseCompletion[], completionData: CourseCompletion[],
userId: number | undefined userId: string | undefined
): LearningPath { ): LearningPath {
return new LearningPath( return new LearningPath(
json.id, json.id,
@ -64,7 +64,7 @@ export class LearningPath implements WagtailLearningPath {
public readonly frontend_url: string, public readonly frontend_url: string,
public readonly course: Course, public readonly course: Course,
public children: LearningPathChild[], public children: LearningPathChild[],
public userId: number | undefined, public userId: string | undefined,
completionData?: CourseCompletion[] completionData?: CourseCompletion[]
) { ) {
// parse children // parse children

2
client/src/stores/circle.ts
View File

@ -41,7 +41,7 @@ export const useCircleStore = defineStore({
async loadCircle( async loadCircle(
courseSlug: string, courseSlug: string,
circleSlug: string, circleSlug: string,
userId: number | undefined = undefined userId: string | undefined = undefined
): Promise<Circle> { ): Promise<Circle> {
if (!userId) { if (!userId) {
const userStore = useUserStore(); const userStore = useUserStore();

14
client/src/stores/competence.ts
View File

@ -14,7 +14,7 @@ import orderBy from "lodash/orderBy";
import { defineStore } from "pinia"; import { defineStore } from "pinia";
export type CompetenceStoreState = { export type CompetenceStoreState = {
competenceProfilePages: Map<number, CompetenceProfilePage>; competenceProfilePages: Map<string, CompetenceProfilePage>;
selectedCircle: { id: string; name: string }; selectedCircle: { id: string; name: string };
availableCircles: { id: string; name: string }[]; availableCircles: { id: string; name: string }[];
@ -24,7 +24,7 @@ export const useCompetenceStore = defineStore({
id: "competence", id: "competence",
state: () => { state: () => {
return { return {
competenceProfilePages: new Map<number, CompetenceProfilePage>(), competenceProfilePages: new Map<string, CompetenceProfilePage>(),
selectedCircle: { id: "all", name: "Circle: Alle" }, selectedCircle: { id: "all", name: "Circle: Alle" },
availableCircles: [], availableCircles: [],
} as CompetenceStoreState; } as CompetenceStoreState;
@ -56,7 +56,7 @@ export const useCompetenceStore = defineStore({
return competence.children; return competence.children;
}); });
}, },
competenceProfilePage(userId: number | undefined = undefined) { competenceProfilePage(userId: string | undefined = undefined) {
if (!userId) { if (!userId) {
const userStore = useUserStore(); const userStore = useUserStore();
userId = userStore.id; userId = userStore.id;
@ -65,7 +65,7 @@ export const useCompetenceStore = defineStore({
return this.competenceProfilePages.get(userId); return this.competenceProfilePages.get(userId);
}, },
flatPerformanceCriteria( flatPerformanceCriteria(
userId: number | undefined = undefined, userId: string | undefined = undefined,
circleTranslationKeys: string[] | undefined = undefined circleTranslationKeys: string[] | undefined = undefined
) { ) {
if (!userId) { if (!userId) {
@ -102,7 +102,7 @@ export const useCompetenceStore = defineStore({
return []; return [];
}, },
competences(userId: number | undefined = undefined) { competences(userId: string | undefined = undefined) {
if (!userId) { if (!userId) {
const userStore = useUserStore(); const userStore = useUserStore();
userId = userStore.id; userId = userStore.id;
@ -128,7 +128,7 @@ export const useCompetenceStore = defineStore({
}, },
async loadCompetenceProfilePage( async loadCompetenceProfilePage(
slug: string, slug: string,
userId: number | undefined = undefined, userId: string | undefined = undefined,
reload = false reload = false
) { ) {
if (!userId) { if (!userId) {
@ -161,7 +161,7 @@ export const useCompetenceStore = defineStore({
return this.competenceProfilePages.get(userId); return this.competenceProfilePages.get(userId);
}, },
async parseCompletionData(userId: number) { async parseCompletionData(userId: string) {
const competenceProfilePage = this.competenceProfilePages.get(userId); const competenceProfilePage = this.competenceProfilePages.get(userId);
if (competenceProfilePage) { if (competenceProfilePage) {
const completionStore = useCompletionStore(); const completionStore = useCompletionStore();

4
client/src/stores/completion.ts
View File

@ -13,7 +13,7 @@ export const useCompletionStore = defineStore({
actions: { actions: {
async loadCourseSessionCompletionData( async loadCourseSessionCompletionData(
courseSessionId: number, courseSessionId: number,
userId: number, userId: string,
reload = false reload = false
) { ) {
const userCompletionData = (await itGetCached( const userCompletionData = (await itGetCached(
@ -30,7 +30,7 @@ export const useCompletionStore = defineStore({
}, },
async markPage( async markPage(
page: BaseCourseWagtailPage, page: BaseCourseWagtailPage,
userId: number | undefined = undefined, userId: string | undefined = undefined,
courseSessionId: number | undefined = undefined courseSessionId: number | undefined = undefined
) { ) {
if (!courseSessionId) { if (!courseSessionId) {

2
client/src/stores/courseSessions.ts
View File

@ -213,7 +213,7 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
}); });
} }
async function removeDocument(documentId: number) { async function removeDocument(documentId: string) {
await deleteCircleDocument(documentId); await deleteCircleDocument(documentId);
if (currentCourseSession.value === undefined) { if (currentCourseSession.value === undefined) {

4
client/src/stores/learningPath.ts
View File

@ -43,7 +43,7 @@ export const useLearningPathStore = defineStore("learningPath", () => {
async function loadCourseSessionCompletionData( async function loadCourseSessionCompletionData(
courseSlug: string, courseSlug: string,
userId: number | undefined = undefined userId: string | undefined = undefined
) { ) {
// FIXME: should not be here anymore with VBV-305 // FIXME: should not be here anymore with VBV-305
const completionStore = useCompletionStore(); const completionStore = useCompletionStore();
@ -66,7 +66,7 @@ export const useLearningPathStore = defineStore("learningPath", () => {
async function loadLearningPath( async function loadLearningPath(
slug: string, slug: string,
userId: number | undefined = undefined, userId: string | undefined = undefined,
reload = false, reload = false,
fail = true fail = true
) { ) {

4
client/src/stores/user.ts
View File

@ -19,7 +19,7 @@ if (import.meta.env.VITE_OAUTH_API_BASE_URL) {
export type AvailableLanguages = "de" | "fr" | "it"; export type AvailableLanguages = "de" | "fr" | "it";
export type UserState = { export type UserState = {
id: number; id: string;
first_name: string; first_name: string;
last_name: string; last_name: string;
email: string; email: string;
@ -50,7 +50,7 @@ for (const language of languagesWithoutCountryCode) {
} }
const initialUserState: UserState = { const initialUserState: UserState = {
id: 0, id: "",
email: "", email: "",
first_name: "", first_name: "",
last_name: "", last_name: "",

33
client/src/types.ts
View File

@ -170,7 +170,7 @@ export interface Topic extends BaseCourseWagtailPage {
export type LearningPathChild = Topic | WagtailCircle; export type LearningPathChild = Topic | WagtailCircle;
export interface CourseCompletion { export interface CourseCompletion {
readonly id: number; readonly id: string;
created_at: string; created_at: string;
updated_at: string; updated_at: string;
readonly user: number; readonly user: number;
@ -181,17 +181,6 @@ export interface CourseCompletion {
additional_json_data: unknown; additional_json_data: unknown;
} }
export interface CircleDiagramData {
index: number;
title: string;
icon: string;
startAngle: number;
endAngle: number;
arrowStartAngle: number;
arrowEndAngle: number;
done: boolean;
}
export interface Course { export interface Course {
id: number; id: number;
title: string; title: string;
@ -394,7 +383,7 @@ export interface DropdownSelectable {
} }
export interface CircleExpert { export interface CircleExpert {
user_id: number; user_id: string;
user_email: string; user_email: string;
user_first_name: string; user_first_name: string;
user_last_name: string; user_last_name: string;
@ -404,7 +393,7 @@ export interface CircleExpert {
} }
export interface CircleDocument { export interface CircleDocument {
id: number; id: string;
name: string; name: string;
file_name: string; file_name: string;
url: string; url: string;
@ -457,7 +446,7 @@ export type Role = "MEMBER" | "EXPERT" | "TUTOR";
export interface CourseSessionUser { export interface CourseSessionUser {
session_title: string; session_title: string;
user_id: number; user_id: string;
first_name: string; first_name: string;
last_name: string; last_name: string;
email: string; email: string;
@ -491,7 +480,7 @@ export type NotificationType = "USER_INTERACTION" | "PROGRESS" | "INFORMATION";
export interface Notification { export interface Notification {
// given by AbstractNotification model // given by AbstractNotification model
id: number; id: string;
timestamp: string; timestamp: string;
unread: boolean; unread: boolean;
actor: string | null; actor: string | null;
@ -532,16 +521,16 @@ export interface AssignmentCompletionData {
} }
export interface AssignmentCompletion { export interface AssignmentCompletion {
id: number; id: string;
created_at: string; created_at: string;
updated_at: string; updated_at: string;
submitted_at: string; submitted_at: string;
evaluation_submitted_at: string | null; evaluation_submitted_at: string | null;
assignment_user: number; assignment_user: string;
assignment: number; assignment: number;
course_session: number; course_session: number;
completion_status: AssignmentCompletionStatus; completion_status: AssignmentCompletionStatus;
evaluation_user: number | null; evaluation_user: string | null;
completion_data: AssignmentCompletionData; completion_data: AssignmentCompletionData;
evaluation_grade: number | null; evaluation_grade: number | null;
} }
@ -554,14 +543,14 @@ export type UpsertUserAssignmentCompletion = {
}; };
export type EvaluationCompletionData = UpsertUserAssignmentCompletion & { export type EvaluationCompletionData = UpsertUserAssignmentCompletion & {
assignment_user_id: number; assignment_user_id: string;
evaluation_grade?: number; evaluation_grade?: number;
evaluation_points?: number; evaluation_points?: number;
}; };
export interface UserAssignmentCompletionStatus { export interface UserAssignmentCompletionStatus {
id: number; id: string;
assignment_user_id: number; assignment_user_id: string;
completion_status: AssignmentCompletionStatus; completion_status: AssignmentCompletionStatus;
evaluation_grade: number | null; evaluation_grade: number | null;
} }

8
cypress/consts.js
View File

@ -1,8 +1,8 @@
// ids for cypress test data // ids for cypress test data
export const ADMIN_USER_ID = -1; export const ADMIN_USER_ID = "872efd96-3bd7-4a1e-a239-2d72cad9f604";
export const TEST_TRAINER1_USER_ID = -11; export const TEST_TRAINER1_USER_ID = "b9e71f59-c44f-4290-b93a-9b3151e9a2fc";
export const TEST_STUDENT1_USER_ID = -21; export const TEST_STUDENT1_USER_ID = "65c73ad0-6d53-43a9-a4a4-64143f27b03a";
export const TEST_STUDENT2_USER_ID = -22; export const TEST_STUDENT2_USER_ID = "19c40d94-15cc-4198-aaad-ef707c4b0900";
export const TEST_COURSE_SESSION_BERN_ID = -1; export const TEST_COURSE_SESSION_BERN_ID = -1;
export const TEST_COURSE_SESSION_ZURICH_ID = -2; export const TEST_COURSE_SESSION_ZURICH_ID = -2;

28
cypress/support/commands.js
View File

@ -80,7 +80,13 @@ Cypress.Commands.add("manageShellCommand", (command) => {
return cy.manageCommand(`shell -c '${command}'`); return cy.manageCommand(`shell -c '${command}'`);
}); });
function loadObjectJson(key, value, djangoModelPath, serializerModelPath) { function loadObjectJson(
key,
value,
djangoModelPath,
serializerModelPath,
valueAsString = false
) {
const djangoModel = _.last(djangoModelPath.split(".")); const djangoModel = _.last(djangoModelPath.split("."));
const djangoModelImportPath = _.initial(djangoModelPath.split(".")).join("."); const djangoModelImportPath = _.initial(djangoModelPath.split(".")).join(".");
const serializerModel = _.last(serializerModelPath.split(".")); const serializerModel = _.last(serializerModelPath.split("."));
@ -89,10 +95,18 @@ function loadObjectJson(key, value, djangoModelPath, serializerModelPath) {
).join("."); ).join(".");
let filterPart = `${key}=${value}`; let filterPart = `${key}=${value}`;
if (valueAsString) {
filterPart = `${key}=\\"${value}\\"`;
}
if (_.isArray(key)) { if (_.isArray(key)) {
filterPart = _.zip(key, value) filterPart = _.zip(key, value)
.map(([k, v]) => { .map(([k, v]) => {
if (valueAsString) {
return `${k}=\\"${v}\\"`;
} else {
return `${k}=${v}`; return `${k}=${v}`;
}
}) })
.join(","); .join(",");
} }
@ -116,7 +130,8 @@ Cypress.Commands.add("loadAssignmentCompletion", (key, value) => {
key, key,
value, value,
"vbv_lernwelt.assignment.models.AssignmentCompletion", "vbv_lernwelt.assignment.models.AssignmentCompletion",
"vbv_lernwelt.assignment.serializers.AssignmentCompletionSerializer" "vbv_lernwelt.assignment.serializers.AssignmentCompletionSerializer",
true
); );
}); });
@ -136,15 +151,6 @@ Cypress.Commands.add("makeSelfEvaluation", (answers) => {
} }
}); });
// Cypress.Commands.add('loadApiClientRequestResponseLog', (key, value) => {
// return loadObjectJson(
// key,
// value,
// 'myservice.apps.apiclient.models.ApiClientRequestResponseLog',
// 'myservice.apps.apiclient.serializers.ApiClientRequestResponseLogSerializer'
// );
// });
Cypress.Commands.add("learningContentMultiLayoutNextStep", () => { Cypress.Commands.add("learningContentMultiLayoutNextStep", () => {
return cy.get('[data-cy="next-step"]').click({ force: true }); return cy.get('[data-cy="next-step"]').click({ force: true });
}); });

2
server/config/urls.py
View File

@ -109,7 +109,7 @@ urlpatterns = [
path(r"api/course/completion/<signed_int:course_session_id>/", path(r"api/course/completion/<signed_int:course_session_id>/",
request_course_completion, request_course_completion,
name="request_course_completion"), name="request_course_completion"),
path(r"api/course/completion/<signed_int:course_session_id>/<signed_int:user_id>/", path(r"api/course/completion/<signed_int:course_session_id>/<uuid:user_id>/",
request_course_completion_for_user, request_course_completion_for_user,
name="request_course_completion_for_user"), name="request_course_completion_for_user"),

2
server/vbv_lernwelt/assignment/graphql/mutations.py
View File

@ -22,7 +22,7 @@ class AssignmentCompletionMutation(graphene.Mutation):
assignment_id = graphene.ID(required=True) assignment_id = graphene.ID(required=True)
course_session_id = graphene.ID(required=True) course_session_id = graphene.ID(required=True)
learning_content_page_id = graphene.ID() learning_content_page_id = graphene.ID()
assignment_user_id = graphene.ID() assignment_user_id = graphene.UUID()
completion_status = graphene.Argument( completion_status = graphene.Argument(
graphene.Enum.from_enum(AssignmentCompletionStatus) graphene.Enum.from_enum(AssignmentCompletionStatus)

2
server/vbv_lernwelt/assignment/graphql/queries.py
View File

@ -24,7 +24,7 @@ class AssignmentQuery(object):
assignment_id=graphene.ID(required=True), assignment_id=graphene.ID(required=True),
course_session_id=graphene.ID(required=True), course_session_id=graphene.ID(required=True),
learning_content_page_id=graphene.ID(required=False), learning_content_page_id=graphene.ID(required=False),
assignment_user_id=graphene.ID(required=False), assignment_user_id=graphene.UUID(required=False),
) )
def resolve_assignment_completion( def resolve_assignment_completion(

31
server/vbv_lernwelt/assignment/migrations/0001_initial.py
View File

@ -1,4 +1,6 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import uuid
import django.db.models.deletion import django.db.models.deletion
import wagtail.blocks import wagtail.blocks
@ -7,6 +9,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
@ -28,6 +31,18 @@ class Migration(migrations.Migration):
to="wagtailcore.page", to="wagtailcore.page",
), ),
), ),
(
"assignment_type",
models.CharField(
choices=[
("CASEWORK", "CASEWORK"),
("PREP_ASSIGNMENT", "PREP_ASSIGNMENT"),
("REFLECTION", "REFLECTION"),
],
default="CASEWORK",
max_length=50,
),
),
( (
"intro_text", "intro_text",
wagtail.fields.RichTextField( wagtail.fields.RichTextField(
@ -222,11 +237,11 @@ class Migration(migrations.Migration):
fields=[ fields=[
( (
"id", "id",
models.BigAutoField( models.UUIDField(
auto_created=True, default=uuid.uuid4,
editable=False,
primary_key=True, primary_key=True,
serialize=False, serialize=False,
verbose_name="ID",
), ),
), ),
("created_at", models.DateTimeField(auto_now_add=True)), ("created_at", models.DateTimeField(auto_now_add=True)),
@ -292,10 +307,10 @@ class Migration(migrations.Migration):
"completion_status", "completion_status",
models.CharField( models.CharField(
choices=[ choices=[
(1, "IN_PROGRESS"), ("IN_PROGRESS", "IN_PROGRESS"),
(2, "SUBMITTED"), ("SUBMITTED", "SUBMITTED"),
(3, "EVALUATION_IN_PROGRESS"), ("EVALUATION_IN_PROGRESS", "EVALUATION_IN_PROGRESS"),
(4, "EVALUATION_SUBMITTED"), ("EVALUATION_SUBMITTED", "EVALUATION_SUBMITTED"),
], ],
default="IN_PROGRESS", default="IN_PROGRESS",
max_length=255, max_length=255,

4
server/vbv_lernwelt/assignment/migrations/0002_assignmentcompletionauditlog_assignment_user.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
from django.conf import settings from django.conf import settings
@ -10,8 +10,8 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("assignment", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("assignment", "0001_initial"),
] ]
operations = [ operations = [

25
server/vbv_lernwelt/assignment/migrations/0003_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
from django.conf import settings from django.conf import settings
@ -10,9 +10,10 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("course", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("assignment", "0002_assignmentcompletionauditlog_assignment_user"), ("assignment", "0002_assignmentcompletionauditlog_assignment_user"),
("course", "0001_initial"),
("wagtailcore", "0083_workflowcontenttype"),
] ]
operations = [ operations = [
@ -69,10 +70,28 @@ class Migration(migrations.Migration):
to=settings.AUTH_USER_MODEL, to=settings.AUTH_USER_MODEL,
), ),
), ),
migrations.AddField(
model_name="assignmentcompletion",
name="learning_content_page",
field=models.ForeignKey(
blank=True,
default=None,
help_text="Page reference mostly needed for 'REFLECTION' assignments",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailcore.page",
),
),
migrations.AddConstraint( migrations.AddConstraint(
model_name="assignmentcompletion", model_name="assignmentcompletion",
constraint=models.UniqueConstraint( constraint=models.UniqueConstraint(
fields=("assignment_user", "assignment", "course_session"), fields=(
"assignment_user",
"assignment",
"course_session",
"learning_content_page",
),
name="assignment_completion_unique_user_assignment_course_session", name="assignment_completion_unique_user_assignment_course_session",
), ),
), ),

26
server/vbv_lernwelt/assignment/migrations/0004_assignment_assignment_type.py
View File

@ -1,26 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-19 13:43
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("assignment", "0003_initial"),
]
operations = [
migrations.AddField(
model_name="assignment",
name="assignment_type",
field=models.CharField(
choices=[
("CASEWORK", "CASEWORK"),
("PREP_ASSIGNMENT", "PREP_ASSIGNMENT"),
("REFLECTION", "REFLECTION"),
],
default="CASEWORK",
max_length=50,
),
),
]

27
server/vbv_lernwelt/assignment/migrations/0005_alter_assignmentcompletionauditlog_completion_status.py
View File

@ -1,27 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-28 14:12
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("assignment", "0004_assignment_assignment_type"),
]
operations = [
migrations.AlterField(
model_name="assignmentcompletionauditlog",
name="completion_status",
field=models.CharField(
choices=[
("IN_PROGRESS", "IN_PROGRESS"),
("SUBMITTED", "SUBMITTED"),
("EVALUATION_IN_PROGRESS", "EVALUATION_IN_PROGRESS"),
("EVALUATION_SUBMITTED", "EVALUATION_SUBMITTED"),
],
default="IN_PROGRESS",
max_length=255,
),
),
]

37
server/vbv_lernwelt/assignment/migrations/0006_auto_20230628_1616.py
View File

@ -1,37 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-28 14:16
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("learnpath", "0007_learningunit_title_hidden"),
("assignment", "0005_alter_assignmentcompletionauditlog_completion_status"),
]
operations = [
migrations.RemoveConstraint(
model_name="assignmentcompletion",
name="assignment_completion_unique_user_assignment_course_session",
),
migrations.AddField(
model_name="assignmentcompletion",
name="circle",
field=models.ForeignKey(
blank=True,
default=None,
null=True,
on_delete=django.db.models.deletion.CASCADE,
to="learnpath.circle",
),
),
migrations.AddConstraint(
model_name="assignmentcompletion",
constraint=models.UniqueConstraint(
fields=("assignment_user", "assignment", "course_session", "circle"),
name="assignment_completion_unique_user_assignment_course_session",
),
),
]

48
server/vbv_lernwelt/assignment/migrations/0007_auto_20230712_1649.py
View File

@ -1,48 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-12 14:49
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailcore", "0083_workflowcontenttype"),
("assignment", "0006_auto_20230628_1616"),
]
operations = [
migrations.RemoveConstraint(
model_name="assignmentcompletion",
name="assignment_completion_unique_user_assignment_course_session",
),
migrations.RemoveField(
model_name="assignmentcompletion",
name="circle",
),
migrations.AddField(
model_name="assignmentcompletion",
name="learning_content_page",
field=models.ForeignKey(
blank=True,
default=None,
help_text="Page reference mostly needed for 'REFLECTION' assignments",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailcore.page",
),
),
migrations.AddConstraint(
model_name="assignmentcompletion",
constraint=models.UniqueConstraint(
fields=(
"assignment_user",
"assignment",
"course_session",
"learning_content_page",
),
name="assignment_completion_unique_user_assignment_course_session",
),
),
]

3
server/vbv_lernwelt/assignment/models.py
View File

@ -1,3 +1,4 @@
import uuid
from enum import Enum from enum import Enum
from django.db import models from django.db import models
@ -252,6 +253,8 @@ def is_valid_assignment_completion_status(
class AssignmentCompletion(models.Model): class AssignmentCompletion(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True) updated_at = models.DateTimeField(auto_now=True)

5
server/vbv_lernwelt/assignment/tests/test_graphql.py
View File

@ -224,7 +224,7 @@ class AttendanceCourseUserMutationTestCase(GraphQLTestCase):
mutation {{ mutation {{
upsert_assignment_completion( upsert_assignment_completion(
assignment_id: {self.assignment.id} assignment_id: {self.assignment.id}
assignment_user_id: {self.student.id} assignment_user_id: "{self.student.id}"
course_session_id: {self.course_session.id} course_session_id: {self.course_session.id}
completion_status: EVALUATION_IN_PROGRESS completion_status: EVALUATION_IN_PROGRESS
completion_data_string: "{completion_data_string}" completion_data_string: "{completion_data_string}"
@ -240,6 +240,7 @@ class AttendanceCourseUserMutationTestCase(GraphQLTestCase):
}} }}
""" """
print(query)
response = self.query(query) response = self.query(query)
self.assertResponseNoErrors(response) self.assertResponseNoErrors(response)
@ -289,7 +290,7 @@ class AttendanceCourseUserMutationTestCase(GraphQLTestCase):
mutation {{ mutation {{
upsert_assignment_completion( upsert_assignment_completion(
assignment_id: {self.assignment.id} assignment_id: {self.assignment.id}
assignment_user_id: {self.student.id} assignment_user_id: "{self.student.id}"
course_session_id: {self.course_session.id} course_session_id: {self.course_session.id}
completion_status: EVALUATION_SUBMITTED completion_status: EVALUATION_SUBMITTED
completion_data_string: "{completion_data_string}" completion_data_string: "{completion_data_string}"

7
server/vbv_lernwelt/competence/migrations/0001_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
import wagtail.blocks import wagtail.blocks
@ -77,6 +77,11 @@ class Migration(migrations.Migration):
), ),
), ),
("competence_id", models.TextField(default="A1.1")), ("competence_id", models.TextField(default="A1.1")),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,

2
server/vbv_lernwelt/competence/migrations/0002_performancecriteria_learning_unit.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models from django.db import migrations, models

22
server/vbv_lernwelt/competence/migrations/0003_auto_20230626_1747.py
View File

@ -1,22 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-26 15:47
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("competence", "0002_performancecriteria_learning_unit"),
]
operations = [
migrations.AddField(
model_name="performancecriteria",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="performancecriteria",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
]

26
server/vbv_lernwelt/contrib/sites/migrations/0001_initial.py
View File

@ -1,9 +1,13 @@
# Generated by Django 3.2.13 on 2023-07-14 12:28
import django.contrib.sites.models import django.contrib.sites.models
from django.contrib.sites.models import _simple_domain_name_validator
from django.db import migrations, models from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
initial = True
dependencies = [] dependencies = []
operations = [ operations = [
@ -13,29 +17,33 @@ class Migration(migrations.Migration):
( (
"id", "id",
models.AutoField( models.AutoField(
verbose_name="ID",
serialize=False,
auto_created=True, auto_created=True,
primary_key=True, primary_key=True,
serialize=False,
verbose_name="ID",
), ),
), ),
( (
"domain", "domain",
models.CharField( models.CharField(
max_length=100, max_length=100,
unique=True,
validators=[
django.contrib.sites.models._simple_domain_name_validator
],
verbose_name="domain name", verbose_name="domain name",
validators=[_simple_domain_name_validator],
), ),
), ),
("name", models.CharField(max_length=50, verbose_name="display name")), ("name", models.CharField(max_length=50, verbose_name="display name")),
], ],
options={ options={
"ordering": ("domain",),
"db_table": "django_site",
"verbose_name": "site", "verbose_name": "site",
"verbose_name_plural": "sites", "verbose_name_plural": "sites",
"db_table": "django_site",
"ordering": ["domain"],
}, },
bases=(models.Model,), managers=[
managers=[("objects", django.contrib.sites.models.SiteManager())], ("objects", django.contrib.sites.models.SiteManager()),
) ],
),
] ]

19
server/vbv_lernwelt/contrib/sites/migrations/0002_alter_domain_unique.py
View File

@ -1,19 +0,0 @@
import django.contrib.sites.models
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [("sites", "0001_initial")]
operations = [
migrations.AlterField(
model_name="site",
name="domain",
field=models.CharField(
max_length=100,
unique=True,
validators=[django.contrib.sites.models._simple_domain_name_validator],
verbose_name="domain name",
),
)
]

62
server/vbv_lernwelt/contrib/sites/migrations/0003_set_site_domain_and_name.py
View File

@ -1,62 +0,0 @@
"""
To understand why this file is here, please read:
http://cookiecutter-django.readthedocs.io/en/latest/faq.html#why-is-there-a-django-contrib-sites-directory-in-cookiecutter-django
"""
from django.conf import settings
from django.db import migrations
def _update_or_create_site_with_sequence(site_model, connection, domain, name):
"""Update or create the site with default ID and keep the DB sequence in sync."""
site, created = site_model.objects.update_or_create(
id=settings.SITE_ID,
defaults={
"domain": domain,
"name": name,
},
)
if created:
# We provided the ID explicitly when creating the Site entry, therefore the DB
# sequence to auto-generate them wasn't used and is now out of sync. If we
# don't do anything, we'll get a unique constraint violation the next time a
# site is created.
# To avoid this, we need to manually update DB sequence and make sure it's
# greater than the maximum value.
max_id = site_model.objects.order_by("-id").first().id
with connection.cursor() as cursor:
cursor.execute("SELECT last_value from django_site_id_seq")
(current_id,) = cursor.fetchone()
if current_id <= max_id:
cursor.execute(
"alter sequence django_site_id_seq restart with %s",
[max_id + 1],
)
def update_site_forward(apps, schema_editor):
"""Set site domain and name."""
Site = apps.get_model("sites", "Site")
_update_or_create_site_with_sequence(
Site,
schema_editor.connection,
"vbv-lernwelt.iterativ.ch",
"VBV Lernwelt",
)
def update_site_backward(apps, schema_editor):
"""Revert site domain and name to default."""
Site = apps.get_model("sites", "Site")
_update_or_create_site_with_sequence(
Site,
schema_editor.connection,
"example.com",
"example.com",
)
class Migration(migrations.Migration):
dependencies = [("sites", "0002_alter_domain_unique")]
operations = [migrations.RunPython(update_site_forward, update_site_backward)]

20
server/vbv_lernwelt/contrib/sites/migrations/0004_alter_options_ordering_domain.py
View File

@ -1,20 +0,0 @@
# Generated by Django 3.1.7 on 2021-02-04 14:49
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("sites", "0003_set_site_domain_and_name"),
]
operations = [
migrations.AlterModelOptions(
name="site",
options={
"ordering": ["domain"],
"verbose_name": "site",
"verbose_name_plural": "sites",
},
),
]

8
server/vbv_lernwelt/core/constants.py
View File

@ -11,10 +11,10 @@ DEFAULT_RICH_TEXT_FEATURES_WITH_HEADER = [
] ]
# ids for cypress test data # ids for cypress test data
ADMIN_USER_ID = -1 ADMIN_USER_ID = "872efd96-3bd7-4a1e-a239-2d72cad9f604"
TEST_TRAINER1_USER_ID = -11 TEST_TRAINER1_USER_ID = "b9e71f59-c44f-4290-b93a-9b3151e9a2fc"
TEST_STUDENT1_USER_ID = -21 TEST_STUDENT1_USER_ID = "65c73ad0-6d53-43a9-a4a4-64143f27b03a"
TEST_STUDENT2_USER_ID = -22 TEST_STUDENT2_USER_ID = "19c40d94-15cc-4198-aaad-ef707c4b0900"
TEST_COURSE_SESSION_BERN_ID = -1 TEST_COURSE_SESSION_BERN_ID = -1
TEST_COURSE_SESSION_ZURICH_ID = -2 TEST_COURSE_SESSION_ZURICH_ID = -2

32
server/vbv_lernwelt/core/migrations/0001_initial.py
View File

@ -1,5 +1,8 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import uuid
import django.contrib.auth.models
import django.contrib.auth.validators import django.contrib.auth.validators
import django.utils.timezone import django.utils.timezone
from django.db import migrations, models from django.db import migrations, models
@ -53,15 +56,6 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name="User", name="User",
fields=[ fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("password", models.CharField(max_length=128, verbose_name="password")), ("password", models.CharField(max_length=128, verbose_name="password")),
( (
"last_login", "last_login",
@ -126,9 +120,22 @@ class Migration(migrations.Migration):
default=django.utils.timezone.now, verbose_name="date joined" default=django.utils.timezone.now, verbose_name="date joined"
), ),
), ),
(
"id",
models.UUIDField(
default=uuid.uuid4,
editable=False,
primary_key=True,
serialize=False,
),
),
( (
"avatar_url", "avatar_url",
models.CharField(blank=True, default="", max_length=254), models.CharField(
blank=True,
default="/static/avatars/myvbv-default-avatar.png",
max_length=254,
),
), ),
( (
"email", "email",
@ -187,5 +194,8 @@ class Migration(migrations.Migration):
"verbose_name_plural": "users", "verbose_name_plural": "users",
"abstract": False, "abstract": False,
}, },
managers=[
("objects", django.contrib.auth.models.UserManager()),
],
), ),
] ]

20
server/vbv_lernwelt/core/migrations/0002_alter_user_managers.py
View File

@ -1,20 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-31 14:34
import django.contrib.auth.models
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("core", "0001_initial"),
]
operations = [
migrations.AlterModelManagers(
name="user",
managers=[
("objects", django.contrib.auth.models.UserManager()),
],
),
]

22
server/vbv_lernwelt/core/migrations/0003_alter_user_avatar_url.py
View File

@ -1,22 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-02 12:32
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("core", "0002_alter_user_managers"),
]
operations = [
migrations.AlterField(
model_name="user",
name="avatar_url",
field=models.CharField(
blank=True,
default="/static/avatars/myvbv-default-avatar.png",
max_length=254,
),
),
]

6
server/vbv_lernwelt/core/models.py
View File

@ -1,3 +1,5 @@
import uuid
from django.contrib.auth.models import AbstractUser from django.contrib.auth.models import AbstractUser
from django.db import models from django.db import models
from django.db.models import JSONField from django.db.models import JSONField
@ -15,8 +17,8 @@ class User(AbstractUser):
("it", "Italiano"), ("it", "Italiano"),
) )
# FIXME: look into it... id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
# objects = UserManager()
avatar_url = models.CharField( avatar_url = models.CharField(
max_length=254, blank=True, default="/static/avatars/myvbv-default-avatar.png" max_length=254, blank=True, default="/static/avatars/myvbv-default-avatar.png"
) )

61
server/vbv_lernwelt/course/migrations/0001_initial.py
View File

@ -1,9 +1,12 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import uuid
import django.db.models.deletion import django.db.models.deletion
import django_jsonform.models.fields
from django.db import migrations, models from django.db import migrations, models
import vbv_lernwelt.course.models
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -19,11 +22,11 @@ class Migration(migrations.Migration):
fields=[ fields=[
( (
"id", "id",
models.BigAutoField( models.UUIDField(
auto_created=True, default=uuid.uuid4,
editable=False,
primary_key=True, primary_key=True,
serialize=False, serialize=False,
verbose_name="ID",
), ),
), ),
("created_at", models.DateTimeField(auto_now_add=True)), ("created_at", models.DateTimeField(auto_now_add=True)),
@ -93,27 +96,40 @@ class Migration(migrations.Migration):
fields=[ fields=[
( (
"id", "id",
models.BigAutoField( models.UUIDField(
auto_created=True, default=uuid.uuid4,
editable=False,
primary_key=True, primary_key=True,
serialize=False, serialize=False,
verbose_name="ID",
), ),
), ),
("created_at", models.DateTimeField(auto_now_add=True)), ("created_at", models.DateTimeField(auto_now_add=True)),
("updated_at", models.DateTimeField(auto_now=True)), ("updated_at", models.DateTimeField(auto_now=True)),
("page_key", models.UUIDField()),
("page_type", models.CharField(blank=True, default="", max_length=255)), ("page_type", models.CharField(blank=True, default="", max_length=255)),
("page_slug", models.CharField(blank=True, default="", max_length=255)),
( (
"completion_status", "completion_status",
models.CharField( models.CharField(
choices=[ choices=[
("unknown", "unknown"), (
("success", "success"), vbv_lernwelt.course.models.CourseCompletionStatus[
("fail", "fail"), "SUCCESS"
], ],
default="unknown", "SUCCESS",
),
(
vbv_lernwelt.course.models.CourseCompletionStatus[
"FAIL"
],
"FAIL",
),
(
vbv_lernwelt.course.models.CourseCompletionStatus[
"UNKNOWN"
],
"UNKNOWN",
),
],
default="UNKNOWN",
max_length=255, max_length=255,
), ),
), ),
@ -154,14 +170,13 @@ class Migration(migrations.Migration):
), ),
("created_at", models.DateTimeField(auto_now_add=True)), ("created_at", models.DateTimeField(auto_now_add=True)),
("updated_at", models.DateTimeField(auto_now=True)), ("updated_at", models.DateTimeField(auto_now=True)),
("title", models.TextField()), ("title", models.TextField(unique=True)),
("import_id", models.TextField(blank=True, default="")),
("generation", models.TextField(blank=True, default="")),
("region", models.TextField(blank=True, default="")),
("group", models.TextField(blank=True, default="")),
("start_date", models.DateField(blank=True, null=True)), ("start_date", models.DateField(blank=True, null=True)),
("end_date", models.DateField(blank=True, null=True)), ("end_date", models.DateField(blank=True, null=True)),
(
"attendance_days",
django_jsonform.models.fields.JSONField(blank=True, default=list),
),
("assignment_details_list", models.JSONField(blank=True, default=list)),
("additional_json_data", models.JSONField(blank=True, default=dict)), ("additional_json_data", models.JSONField(blank=True, default=dict)),
], ],
), ),
@ -170,11 +185,11 @@ class Migration(migrations.Migration):
fields=[ fields=[
( (
"id", "id",
models.BigAutoField( models.UUIDField(
auto_created=True, default=uuid.uuid4,
editable=False,
primary_key=True, primary_key=True,
serialize=False, serialize=False,
verbose_name="ID",
), ),
), ),
("created_at", models.DateTimeField(auto_now_add=True)), ("created_at", models.DateTimeField(auto_now_add=True)),

14
server/vbv_lernwelt/course/migrations/0002_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
from django.conf import settings from django.conf import settings
@ -10,9 +10,10 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("wagtailcore", "0083_workflowcontenttype"),
("files", "0001_initial"), ("files", "0001_initial"),
("course", "0001_initial"), ("course", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("learnpath", "0001_initial"), ("learnpath", "0001_initial"),
] ]
@ -52,6 +53,13 @@ class Migration(migrations.Migration):
on_delete=django.db.models.deletion.CASCADE, to="course.coursesession" on_delete=django.db.models.deletion.CASCADE, to="course.coursesession"
), ),
), ),
migrations.AddField(
model_name="coursecompletion",
name="page",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="wagtailcore.page"
),
),
migrations.AddField( migrations.AddField(
model_name="coursecompletion", model_name="coursecompletion",
name="user", name="user",
@ -98,7 +106,7 @@ class Migration(migrations.Migration):
migrations.AddConstraint( migrations.AddConstraint(
model_name="coursecompletion", model_name="coursecompletion",
constraint=models.UniqueConstraint( constraint=models.UniqueConstraint(
fields=("user", "page_key", "course_session"), fields=("user", "page", "course_session"),
name="course_completion_unique_user_page_key", name="course_completion_unique_user_page_key",
), ),
), ),

18
server/vbv_lernwelt/course/migrations/0003_rename_attendance_days_coursesession_attendance_courses.py
View File

@ -1,18 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-23 12:49
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("course", "0002_initial"),
]
operations = [
migrations.RenameField(
model_name="coursesession",
old_name="attendance_days",
new_name="attendance_courses",
),
]

38
server/vbv_lernwelt/course/migrations/0004_import_fields.py
View File

@ -1,38 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-31 15:59
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("course", "0003_rename_attendance_days_coursesession_attendance_courses"),
]
operations = [
migrations.AddField(
model_name="coursesession",
name="generation",
field=models.TextField(blank=True, default=""),
),
migrations.AddField(
model_name="coursesession",
name="group",
field=models.TextField(blank=True, default=""),
),
migrations.AddField(
model_name="coursesession",
name="import_id",
field=models.TextField(blank=True, default=""),
),
migrations.AddField(
model_name="coursesession",
name="region",
field=models.TextField(blank=True, default=""),
),
migrations.AlterField(
model_name="coursesession",
name="title",
field=models.TextField(unique=True),
),
]

17
server/vbv_lernwelt/course/migrations/0005_remove_coursesession_attendance_courses.py
View File

@ -1,17 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-14 14:02
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("course", "0004_import_fields"),
]
operations = [
migrations.RemoveField(
model_name="coursesession",
name="attendance_courses",
),
]

65
server/vbv_lernwelt/course/migrations/0006_auto_20230626_1724.py
View File

@ -1,65 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-26 15:24
import django.db.models.deletion
from django.db import migrations, models
import vbv_lernwelt.course.models
class Migration(migrations.Migration):
dependencies = [
("wagtailcore", "0083_workflowcontenttype"),
("course", "0005_remove_coursesession_attendance_courses"),
]
operations = [
migrations.RemoveConstraint(
model_name="coursecompletion",
name="course_completion_unique_user_page_key",
),
migrations.RemoveField(
model_name="coursecompletion",
name="page_key",
),
migrations.RemoveField(
model_name="coursecompletion",
name="page_slug",
),
migrations.AddField(
model_name="coursecompletion",
name="page",
field=models.ForeignKey(
default=1,
on_delete=django.db.models.deletion.CASCADE,
to="wagtailcore.page",
),
preserve_default=False,
),
migrations.AlterField(
model_name="coursecompletion",
name="completion_status",
field=models.CharField(
choices=[
(
vbv_lernwelt.course.models.CourseCompletionStatus["SUCCESS"],
"SUCCESS",
),
(vbv_lernwelt.course.models.CourseCompletionStatus["FAIL"], "FAIL"),
(
vbv_lernwelt.course.models.CourseCompletionStatus["UNKNOWN"],
"UNKNOWN",
),
],
default="UNKNOWN",
max_length=255,
),
),
migrations.AddConstraint(
model_name="coursecompletion",
constraint=models.UniqueConstraint(
fields=("user", "page", "course_session"),
name="course_completion_unique_user_page_key",
),
),
]

17
server/vbv_lernwelt/course/migrations/0006_remove_coursesession_assignment_details_list.py
View File

@ -1,17 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-21 14:19
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("course", "0005_remove_coursesession_attendance_courses"),
]
operations = [
migrations.RemoveField(
model_name="coursesession",
name="assignment_details_list",
),
]

13
server/vbv_lernwelt/course/migrations/0007_merge_20230711_1108.py
View File

@ -1,13 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-11 09:08
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("course", "0006_auto_20230626_1724"),
("course", "0006_remove_coursesession_assignment_details_list"),
]
operations = []

9
server/vbv_lernwelt/course/models.py
View File

@ -1,4 +1,5 @@
import enum import enum
import uuid
from django.db import models from django.db import models
from django.db.models import UniqueConstraint from django.db.models import UniqueConstraint
@ -161,6 +162,8 @@ class CourseCompletionStatus(enum.Enum):
class CourseCompletion(models.Model): class CourseCompletion(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True) updated_at = models.DateTimeField(auto_now=True)
@ -220,9 +223,11 @@ class CourseSession(models.Model):
class CourseSessionUser(models.Model): class CourseSessionUser(models.Model):
""" """
Ein Benutzer der an einer CourseSession teilnimmt Ein Benutzer der an einer Durchführung teilnimmt
""" """
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True) updated_at = models.DateTimeField(auto_now=True)
@ -268,6 +273,8 @@ class CourseSessionUser(models.Model):
class CircleDocument(models.Model): class CircleDocument(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
file = models.OneToOneField(UploadFile, on_delete=models.CASCADE) file = models.OneToOneField(UploadFile, on_delete=models.CASCADE)
name = models.CharField(max_length=100) name = models.CharField(max_length=100)

2
server/vbv_lernwelt/course/serializers.py
View File

@ -146,4 +146,4 @@ class DocumentUploadStartInputSerializer(serializers.Serializer):
class DocumentUploadFinishInputSerializer(serializers.Serializer): class DocumentUploadFinishInputSerializer(serializers.Serializer):
file_id = serializers.IntegerField() file_id = serializers.UUIDField()

2
server/vbv_lernwelt/course_session/graphql/mutations.py
View File

@ -14,7 +14,7 @@ logger = structlog.get_logger(__name__)
class AttendanceUserInputType(graphene.InputObjectType): class AttendanceUserInputType(graphene.InputObjectType):
user_id = graphene.ID(required=True) user_id = graphene.UUID(required=True)
status = graphene.Field( status = graphene.Field(
graphene.Enum.from_enum(AttendanceUserStatus), required=True graphene.Enum.from_enum(AttendanceUserStatus), required=True
) )

2
server/vbv_lernwelt/course_session/graphql/types.py
View File

@ -6,7 +6,7 @@ from vbv_lernwelt.course_session.services.attendance import AttendanceUserStatus
class AttendanceUserType(graphene.ObjectType): class AttendanceUserType(graphene.ObjectType):
user_id = graphene.ID(required=True) user_id = graphene.UUID(required=True)
status = graphene.Field( status = graphene.Field(
graphene.Enum.from_enum(AttendanceUserStatus), required=True graphene.Enum.from_enum(AttendanceUserStatus), required=True
) )

40
server/vbv_lernwelt/course_session/migrations/0001_initial.py
View File

@ -1,6 +1,7 @@
# Generated by Django 3.2.13 on 2023-06-14 15:01 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
import django_jsonform.models.fields
from django.db import migrations, models from django.db import migrations, models
@ -9,12 +10,24 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("learnpath", "0007_learningunit_title_hidden"), ("course", "0001_initial"),
("course", "0005_remove_coursesession_attendance_courses"),
("duedate", "0002_auto_20230614_1500"),
] ]
operations = [ operations = [
migrations.CreateModel(
name="CourseSessionAssignment",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
],
),
migrations.CreateModel( migrations.CreateModel(
name="CourseSessionAttendanceCourse", name="CourseSessionAttendanceCourse",
fields=[ fields=[
@ -29,6 +42,10 @@ class Migration(migrations.Migration):
), ),
("location", models.CharField(blank=True, default="", max_length=255)), ("location", models.CharField(blank=True, default="", max_length=255)),
("trainer", models.CharField(blank=True, default="", max_length=255)), ("trainer", models.CharField(blank=True, default="", max_length=255)),
(
"attendance_user_list",
django_jsonform.models.fields.JSONField(default=list),
),
( (
"course_session", "course_session",
models.ForeignKey( models.ForeignKey(
@ -36,21 +53,6 @@ class Migration(migrations.Migration):
to="course.coursesession", to="course.coursesession",
), ),
), ),
(
"due_date",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="attendance_course_due_date",
to="duedate.duedate",
),
),
(
"learning_content",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="learnpath.learningcontentattendancecourse",
),
),
], ],
), ),
] ]

61
server/vbv_lernwelt/course_session/migrations/0002_coursesessionassignment.py
View File

@ -1,61 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-21 14:19
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("course", "0006_remove_coursesession_assignment_details_list"),
("learnpath", "0007_learningunit_title_hidden"),
("duedate", "0003_alter_duedate_course_session"),
("course_session", "0001_initial"),
]
operations = [
migrations.CreateModel(
name="CourseSessionAssignment",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"course_session",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="course.coursesession",
),
),
(
"evaluation_deadline",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="assignment_evaluation_deadline",
to="duedate.duedate",
),
),
(
"learning_content",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="learnpath.learningcontentassignment",
),
),
(
"submission_deadline",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="assignment_submission_deadline",
to="duedate.duedate",
),
),
],
),
]

18
server/vbv_lernwelt/course_session/migrations/0002_coursesessionattendancecourse_attendance_user_list.py
View File

@ -1,18 +0,0 @@
# 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),
),
]

26
server/vbv_lernwelt/course_session/migrations/0002_coursesessionattendancecourse_due_date.py Normal file
View File

@ -0,0 +1,26 @@
# Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
("duedate", "0001_initial"),
("course_session", "0001_initial"),
]
operations = [
migrations.AddField(
model_name="coursesessionattendancecourse",
name="due_date",
field=models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="attendance_course_due_date",
to="duedate.duedate",
),
),
]

35
server/vbv_lernwelt/course_session/migrations/0003_auto_20230628_1321.py
View File

@ -1,35 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-28 11:21
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("duedate", "0006_auto_20230627_1553"),
("course_session", "0002_coursesessionassignment"),
]
operations = [
migrations.AlterField(
model_name="coursesessionassignment",
name="evaluation_deadline",
field=models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="assignment_evaluation_deadline",
to="duedate.duedate",
),
),
migrations.AlterField(
model_name="coursesessionassignment",
name="submission_deadline",
field=models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="assignment_submission_deadline",
to="duedate.duedate",
),
),
]

62
server/vbv_lernwelt/course_session/migrations/0003_initial.py Normal file
View File

@ -0,0 +1,62 @@
# Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
("course_session", "0002_coursesessionattendancecourse_due_date"),
("course", "0001_initial"),
("duedate", "0001_initial"),
("learnpath", "0001_initial"),
]
operations = [
migrations.AddField(
model_name="coursesessionattendancecourse",
name="learning_content",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="learnpath.learningcontentattendancecourse",
),
),
migrations.AddField(
model_name="coursesessionassignment",
name="course_session",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="course.coursesession"
),
),
migrations.AddField(
model_name="coursesessionassignment",
name="evaluation_deadline",
field=models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="assignment_evaluation_deadline",
to="duedate.duedate",
),
),
migrations.AddField(
model_name="coursesessionassignment",
name="learning_content",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="learnpath.learningcontentassignment",
),
),
migrations.AddField(
model_name="coursesessionassignment",
name="submission_deadline",
field=models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="assignment_submission_deadline",
to="duedate.duedate",
),
),
]

13
server/vbv_lernwelt/course_session/migrations/0004_merge_20230711_1108.py
View File

@ -1,13 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-11 09:08
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("course_session", "0002_coursesessionattendancecourse_attendance_user_list"),
("course_session", "0003_auto_20230628_1321"),
]
operations = []

19
server/vbv_lernwelt/course_session/migrations/0005_alter_coursesessionattendancecourse_attendance_user_list.py
View File

@ -1,19 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-12 14:49
import django_jsonform.models.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("course_session", "0004_merge_20230711_1108"),
]
operations = [
migrations.AlterField(
model_name="coursesessionattendancecourse",
name="attendance_user_list",
field=django_jsonform.models.fields.JSONField(default=list),
),
]

2
server/vbv_lernwelt/course_session/services/attendance.py
View File

@ -30,7 +30,7 @@ def update_attendance_list(
if u is not None: if u is not None:
result_user_list.append( result_user_list.append(
{ {
"user_id": u.id, "user_id": str(u.id),
"status": attendance_user.get( "status": attendance_user.get(
"status", AttendanceUserStatus.PRESENT "status", AttendanceUserStatus.PRESENT
).value, ).value,

7
server/vbv_lernwelt/course_session/tests/test_attendance.py
View File

@ -1,5 +1,6 @@
from django.test import TestCase from django.test import TestCase
from vbv_lernwelt.core.constants import TEST_STUDENT1_USER_ID
from vbv_lernwelt.core.create_default_users import create_default_users from vbv_lernwelt.core.create_default_users import create_default_users
from vbv_lernwelt.core.models import User from vbv_lernwelt.core.models import User
from vbv_lernwelt.course.creators.test_course import create_test_course from vbv_lernwelt.course.creators.test_course import create_test_course
@ -35,7 +36,7 @@ class AttendanceServicesTestCase(TestCase):
id=self.attendance_course.id id=self.attendance_course.id
) )
self.assertEqual( self.assertEqual(
attendance_course.attendance_user_list[0]["user_id"], student.id attendance_course.attendance_user_list[0]["user_id"], str(student.id)
) )
self.assertEqual( self.assertEqual(
attendance_course.attendance_user_list, attendance_course.attendance_user_list,
@ -43,7 +44,7 @@ class AttendanceServicesTestCase(TestCase):
{ {
"email": "test-student1@example.com", "email": "test-student1@example.com",
"status": "PRESENT", "status": "PRESENT",
"user_id": -21, "user_id": TEST_STUDENT1_USER_ID,
"last_name": "Student1", "last_name": "Student1",
"first_name": "Test", "first_name": "Test",
} }
@ -68,7 +69,7 @@ class AttendanceServicesTestCase(TestCase):
{ {
"email": "test-student1@example.com", "email": "test-student1@example.com",
"status": "PRESENT", "status": "PRESENT",
"user_id": "-21", "user_id": TEST_STUDENT1_USER_ID,
"last_name": "Student1", "last_name": "Student1",
"first_name": "Test", "first_name": "Test",
} }

4
server/vbv_lernwelt/course_session/tests/test_graphql.py
View File

@ -49,8 +49,8 @@ class AttendanceCourseUserMutationTestCase(GraphQLTestCase):
update_course_session_attendance_course_users( update_course_session_attendance_course_users(
id:{self.attendance_course.id}, id:{self.attendance_course.id},
attendance_user_list:[ attendance_user_list:[
{{user_id: {student.id}, status: PRESENT}}, {{user_id: "{student.id}", status: PRESENT}},
{{user_id: "123123123", status: PRESENT}}, {{user_id: "3372836c-1c95-4721-881d-5342a60a3bfe", status: PRESENT}},
] ]
) {{ ) {{
course_session_attendance_course {{ course_session_attendance_course {{

30
server/vbv_lernwelt/duedate/migrations/0001_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-06-14 09:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models from django.db import migrations, models
@ -9,7 +9,8 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("course", "0004_import_fields"), ("course", "0001_initial"),
("wagtailcore", "0083_workflowcontenttype"),
] ]
operations = [ operations = [
@ -26,23 +27,34 @@ class Migration(migrations.Migration):
), ),
), ),
("start", models.DateTimeField(db_index=True, null=True)), ("start", models.DateTimeField(db_index=True, null=True)),
("end", models.DateTimeField(db_index=True, null=True)), ("end", models.DateTimeField(blank=True, db_index=True, null=True)),
("title", models.CharField(default="Termin", max_length=1024)), ("title", models.CharField(default="", max_length=1024)),
("url", models.URLField(blank=True, max_length=1024, null=True)),
( (
"learning_content_id", "learning_content_description",
models.CharField(blank=True, max_length=255, null=True), models.CharField(blank=True, default="", max_length=1024),
), ),
(
"description",
models.CharField(blank=True, default="", max_length=1024),
),
("url", models.CharField(blank=True, default="", max_length=1024)),
( (
"course_session", "course_session",
models.ForeignKey( models.ForeignKey(
blank=True, blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE, on_delete=django.db.models.deletion.CASCADE,
related_name="events",
to="course.coursesession", to="course.coursesession",
), ),
), ),
(
"page",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="wagtailcore.page",
),
),
], ],
), ),
] ]

29
server/vbv_lernwelt/duedate/migrations/0002_auto_20230614_1500.py
View File

@ -1,29 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-14 13:00
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailcore", "0083_workflowcontenttype"),
("duedate", "0001_initial"),
]
operations = [
migrations.RemoveField(
model_name="duedate",
name="learning_content_id",
),
migrations.AddField(
model_name="duedate",
name="page",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="wagtailcore.page",
),
),
]

26
server/vbv_lernwelt/duedate/migrations/0003_alter_duedate_course_session.py
View File

@ -1,26 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-21 14:19
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("course", "0006_remove_coursesession_assignment_details_list"),
("duedate", "0002_auto_20230614_1500"),
]
operations = [
migrations.AlterField(
model_name="duedate",
name="course_session",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="duedates",
to="course.coursesession",
),
),
]

29
server/vbv_lernwelt/duedate/migrations/0004_auto_20230621_1703.py
View File

@ -1,29 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-21 15:03
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("contenttypes", "0002_remove_content_type_name"),
("duedate", "0003_alter_duedate_course_session"),
]
operations = [
migrations.AddField(
model_name="duedate",
name="content_type",
field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.CASCADE,
to="contenttypes.contenttype",
),
),
migrations.AddField(
model_name="duedate",
name="object_id",
field=models.PositiveIntegerField(null=True),
),
]

21
server/vbv_lernwelt/duedate/migrations/0005_auto_20230622_1138.py
View File

@ -1,21 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-22 09:38
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("duedate", "0004_auto_20230621_1703"),
]
operations = [
migrations.RemoveField(
model_name="duedate",
name="content_type",
),
migrations.RemoveField(
model_name="duedate",
name="object_id",
),
]

23
server/vbv_lernwelt/duedate/migrations/0006_auto_20230627_1553.py
View File

@ -1,23 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-27 13:53
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("duedate", "0005_auto_20230622_1138"),
]
operations = [
migrations.AddField(
model_name="duedate",
name="description",
field=models.CharField(default="Abgabetermin", max_length=1024),
),
migrations.AddField(
model_name="duedate",
name="learning_content_description",
field=models.CharField(default="GeleiteteFallarbeit", max_length=1024),
),
]

42
server/vbv_lernwelt/duedate/migrations/0007_auto_20230703_1741.py
View File

@ -1,42 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-03 15:41
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("course", "0006_remove_coursesession_assignment_details_list"),
("duedate", "0006_auto_20230627_1553"),
]
operations = [
migrations.AlterField(
model_name="duedate",
name="course_session",
field=models.ForeignKey(
blank=True,
default=1,
on_delete=django.db.models.deletion.CASCADE,
related_name="duedates",
to="course.coursesession",
),
preserve_default=False,
),
migrations.AlterField(
model_name="duedate",
name="description",
field=models.CharField(default="", max_length=1024),
),
migrations.AlterField(
model_name="duedate",
name="learning_content_description",
field=models.CharField(default="", max_length=1024),
),
migrations.AlterField(
model_name="duedate",
name="url",
field=models.URLField(blank=True, default="", max_length=1024),
),
]

23
server/vbv_lernwelt/duedate/migrations/0008_auto_20230711_1116.py
View File

@ -1,23 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-11 09:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("duedate", "0007_auto_20230703_1741"),
]
operations = [
migrations.AlterField(
model_name="duedate",
name="start",
field=models.DateTimeField(blank=True, db_index=True, null=True),
),
migrations.AlterField(
model_name="duedate",
name="url",
field=models.CharField(blank=True, default="", max_length=1024),
),
]

24
server/vbv_lernwelt/duedate/migrations/0009_alter_duedate_course_session.py
View File

@ -1,24 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-12 07:05
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("course", "0006_remove_coursesession_assignment_details_list"),
("duedate", "0008_auto_20230711_1116"),
]
operations = [
migrations.AlterField(
model_name="duedate",
name="course_session",
field=models.ForeignKey(
blank=True,
on_delete=django.db.models.deletion.CASCADE,
to="course.coursesession",
),
),
]

38
server/vbv_lernwelt/duedate/migrations/0010_auto_20230712_0920.py
View File

@ -1,38 +0,0 @@
# Generated by Django 3.2.13 on 2023-07-12 07:20
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("duedate", "0009_alter_duedate_course_session"),
]
operations = [
migrations.AlterField(
model_name="duedate",
name="description",
field=models.CharField(blank=True, default="", max_length=1024),
),
migrations.AlterField(
model_name="duedate",
name="end",
field=models.DateTimeField(blank=True, db_index=True, null=True),
),
migrations.AlterField(
model_name="duedate",
name="learning_content_description",
field=models.CharField(blank=True, default="", max_length=1024),
),
migrations.AlterField(
model_name="duedate",
name="start",
field=models.DateTimeField(db_index=True, null=True),
),
migrations.AlterField(
model_name="duedate",
name="title",
field=models.CharField(default="", max_length=1024),
),
]

4
server/vbv_lernwelt/feedback/creators/create_demo_feedback.py
View File

@ -1,8 +1,8 @@
from vbv_lernwelt.course.models import CourseSession from vbv_lernwelt.course.models import CourseSession
from vbv_lernwelt.feedback.factories import FeedbackFactory from vbv_lernwelt.feedback.factories import FeedbackResponseFactory
from vbv_lernwelt.learnpath.models import Circle from vbv_lernwelt.learnpath.models import Circle
def create_feedback(circle: Circle, course_session: CourseSession, amount: int): def create_feedback(circle: Circle, course_session: CourseSession, amount: int):
for _i in range(amount): for _i in range(amount):
FeedbackFactory(circle=circle, course_session=course_session).save() FeedbackResponseFactory(circle=circle, course_session=course_session).save()

2
server/vbv_lernwelt/feedback/factories.py
View File

@ -5,7 +5,7 @@ from factory.fuzzy import FuzzyChoice, FuzzyInteger
from vbv_lernwelt.feedback.models import FeedbackResponse from vbv_lernwelt.feedback.models import FeedbackResponse
class FeedbackFactory(DjangoModelFactory): class FeedbackResponseFactory(DjangoModelFactory):
data = Dict( data = Dict(
{ {
"satisfaction": FuzzyInteger(2, 4), "satisfaction": FuzzyInteger(2, 4),

10
server/vbv_lernwelt/feedback/migrations/0001_initial.py
View File

@ -1,4 +1,6 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import uuid
from django.db import migrations, models from django.db import migrations, models
@ -15,11 +17,11 @@ class Migration(migrations.Migration):
fields=[ fields=[
( (
"id", "id",
models.BigAutoField( models.UUIDField(
auto_created=True, default=uuid.uuid4,
editable=False,
primary_key=True, primary_key=True,
serialize=False, serialize=False,
verbose_name="ID",
), ),
), ),
("data", models.JSONField(default=dict)), ("data", models.JSONField(default=dict)),

4
server/vbv_lernwelt/feedback/migrations/0002_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models from django.db import migrations, models
@ -9,9 +9,9 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("feedback", "0001_initial"),
("course", "0001_initial"), ("course", "0001_initial"),
("learnpath", "0001_initial"), ("learnpath", "0001_initial"),
("feedback", "0001_initial"),
] ]
operations = [ operations = [

7
server/vbv_lernwelt/feedback/models.py
View File

@ -1,3 +1,5 @@
import uuid
from django.core.validators import MaxValueValidator, MinValueValidator from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
@ -19,6 +21,8 @@ class FeedbackIntegerField(models.IntegerField):
class FeedbackResponse(models.Model): class FeedbackResponse(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
class DiscoveredChoices(models.TextChoices): class DiscoveredChoices(models.TextChoices):
INTERNET = "I", _("Internet") INTERNET = "I", _("Internet")
LEAFLET = "L", _("Leaflet") LEAFLET = "L", _("Leaflet")
@ -41,7 +45,8 @@ class FeedbackResponse(models.Model):
HUNDRED = 100, "100%" HUNDRED = 100, "100%"
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.id: if self._state.adding:
# with `id=UUIDField` it is always set...
course_session_users = CourseSessionUser.objects.filter( course_session_users = CourseSessionUser.objects.filter(
role="EXPERT", course_session=self.course_session, expert=self.circle role="EXPERT", course_session=self.course_session, expert=self.circle
) )

25
server/vbv_lernwelt/feedback/tests/test_feedback_api.py
View File

@ -5,7 +5,8 @@ from vbv_lernwelt.core.models import User
from vbv_lernwelt.course.consts import COURSE_TEST_ID from vbv_lernwelt.course.consts import COURSE_TEST_ID
from vbv_lernwelt.course.creators.test_course import create_test_course from vbv_lernwelt.course.creators.test_course import create_test_course
from vbv_lernwelt.course.models import CourseSession, CourseSessionUser from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
from vbv_lernwelt.feedback.factories import FeedbackFactory from vbv_lernwelt.feedback.factories import FeedbackResponseFactory
from vbv_lernwelt.feedback.models import FeedbackResponse
from vbv_lernwelt.learnpath.models import Circle from vbv_lernwelt.learnpath.models import Circle
from vbv_lernwelt.notify.models import Notification from vbv_lernwelt.notify.models import Notification
@ -61,7 +62,9 @@ class FeedbackSummaryApiTestCase(FeedbackApiBaseTestCase):
basis_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen") basis_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen")
csu.expert.add(basis_circle) csu.expert.add(basis_circle)
FeedbackFactory(circle=basis_circle, course_session=csu.course_session).save() FeedbackResponse.objects.create(
circle=basis_circle, course_session=csu.course_session
)
notifications = Notification.objects.all() notifications = Notification.objects.all()
self.assertEqual(len(notifications), 1) self.assertEqual(len(notifications), 1)
@ -84,7 +87,7 @@ class FeedbackSummaryApiTestCase(FeedbackApiBaseTestCase):
basis_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen") basis_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen")
csu.expert.add(basis_circle) csu.expert.add(basis_circle)
feedback = FeedbackFactory( feedback = FeedbackResponseFactory(
circle=basis_circle, course_session=csu.course_session circle=basis_circle, course_session=csu.course_session
) )
feedback.save() feedback.save()
@ -113,12 +116,12 @@ class FeedbackSummaryApiTestCase(FeedbackApiBaseTestCase):
csu.expert.add(reisen_circle) csu.expert.add(reisen_circle)
for i in range(number_reisen_feedback): for i in range(number_reisen_feedback):
FeedbackFactory( FeedbackResponseFactory(
circle=reisen_circle, course_session=csu.course_session circle=reisen_circle, course_session=csu.course_session
).save() ).save()
for i in range(number_fahrzeug_feedback): for i in range(number_fahrzeug_feedback):
FeedbackFactory( FeedbackResponseFactory(
circle=fahrzeug_circle, course_session=csu.course_session circle=fahrzeug_circle, course_session=csu.course_session
).save() ).save()
@ -146,12 +149,12 @@ class FeedbackSummaryApiTestCase(FeedbackApiBaseTestCase):
reisen_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen") reisen_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen")
for i in range(number_basis_feedback): for i in range(number_basis_feedback):
FeedbackFactory( FeedbackResponseFactory(
circle=reisen_circle, course_session=csu.course_session circle=reisen_circle, course_session=csu.course_session
).save() ).save()
for i in range(number_analyse_feedback): for i in range(number_analyse_feedback):
FeedbackFactory( FeedbackResponseFactory(
circle=fahrzeug_circle, course_session=csu.course_session circle=fahrzeug_circle, course_session=csu.course_session
).save() ).save()
@ -172,7 +175,7 @@ class FeedbackSummaryApiTestCase(FeedbackApiBaseTestCase):
user=self.user, user=self.user,
) )
fahrzeug_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug") fahrzeug_circle = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug")
FeedbackFactory( FeedbackResponseFactory(
circle=fahrzeug_circle, course_session=csu.course_session circle=fahrzeug_circle, course_session=csu.course_session
).save() ).save()
@ -206,7 +209,7 @@ class FeedbackDetailApiTestCase(FeedbackApiBaseTestCase):
circle = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug") circle = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug")
for i in range(3): for i in range(3):
FeedbackFactory( FeedbackResponseFactory(
circle=circle, circle=circle,
course_session=csu.course_session, course_session=csu.course_session,
data={ data={
@ -252,7 +255,7 @@ class FeedbackDetailApiTestCase(FeedbackApiBaseTestCase):
) )
circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen") circle = Circle.objects.get(slug="test-lehrgang-lp-circle-reisen")
FeedbackFactory(circle=circle, course_session=csu.course_session).save() FeedbackResponseFactory(circle=circle, course_session=csu.course_session).save()
response = self.client.get( response = self.client.get(
f"/api/core/feedback/{csu.course_session.course.id}/{circle.id}/" f"/api/core/feedback/{csu.course_session.course.id}/{circle.id}/"
@ -268,7 +271,7 @@ class FeedbackDetailApiTestCase(FeedbackApiBaseTestCase):
user=self.user, user=self.user,
) )
circle = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug") circle = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug")
FeedbackFactory(circle=circle, course_session=csu.course_session).save() FeedbackResponseFactory(circle=circle, course_session=csu.course_session).save()
response = self.client.get( response = self.client.get(
f"/api/core/feedback/{csu.course_session.course.id}/{circle.id}/" f"/api/core/feedback/{csu.course_session.course.id}/{circle.id}/"

10
server/vbv_lernwelt/files/migrations/0001_initial.py
View File

@ -1,4 +1,6 @@
# Generated by Django 3.2.13 on 2023-05-11 20:06 # Generated by Django 3.2.13 on 2023-07-14 12:28
import uuid
import django.db.models.deletion import django.db.models.deletion
from django.conf import settings from django.conf import settings
@ -21,11 +23,11 @@ class Migration(migrations.Migration):
fields=[ fields=[
( (
"id", "id",
models.BigAutoField( models.UUIDField(
auto_created=True, default=uuid.uuid4,
editable=False,
primary_key=True, primary_key=True,
serialize=False, serialize=False,
verbose_name="ID",
), ),
), ),
( (

4
server/vbv_lernwelt/files/models.py
View File

@ -1,3 +1,5 @@
import uuid
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
@ -12,6 +14,8 @@ from vbv_lernwelt.files.utils import file_generate_upload_path
class UploadFile(models.Model): class UploadFile(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
file = models.FileField(upload_to=file_generate_upload_path, blank=True, null=True) file = models.FileField(upload_to=file_generate_upload_path, blank=True, null=True)
original_file_name = models.TextField() original_file_name = models.TextField()

141
server/vbv_lernwelt/learnpath/migrations/0001_initial.py
View File

@ -1,6 +1,7 @@
# Generated by Django 3.2.13 on 2023-05-12 15:29 # Generated by Django 3.2.13 on 2023-07-14 12:28
import django.db.models.deletion import django.db.models.deletion
import wagtail.blocks
import wagtail.fields import wagtail.fields
from django.db import migrations, models from django.db import migrations, models
@ -10,8 +11,8 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("course", "0001_initial"),
("assignment", "0003_initial"), ("assignment", "0003_initial"),
("course", "0001_initial"),
("wagtailcore", "0083_workflowcontenttype"), ("wagtailcore", "0083_workflowcontenttype"),
] ]
@ -39,7 +40,7 @@ class Migration(migrations.Migration):
bases=("wagtailcore.page",), bases=("wagtailcore.page",),
), ),
migrations.CreateModel( migrations.CreateModel(
name="LearningContentAttendanceDay", name="LearningContentAttendanceCourse",
fields=[ fields=[
( (
"page_ptr", "page_ptr",
@ -55,6 +56,84 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=False),
),
],
options={
"abstract": False,
},
bases=("wagtailcore.page",),
),
migrations.CreateModel(
name="LearningContentDocumentList",
fields=[
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
(
"documents",
wagtail.fields.StreamField(
[
(
"document",
wagtail.blocks.StructBlock(
[
("title", wagtail.blocks.TextBlock()),
(
"description",
wagtail.blocks.TextBlock(
default="", required=False
),
),
(
"icon_url",
wagtail.blocks.TextBlock(
default="", required=False
),
),
(
"link_display_text",
wagtail.blocks.CharBlock(
default="Link öffnen", max_length=255
),
),
(
"url",
wagtail.blocks.TextBlock(
default="", required=False
),
),
(
"open_window",
wagtail.blocks.BooleanBlock(default=False),
),
]
),
)
],
blank=True,
use_json_field=True,
),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -78,6 +157,11 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -101,6 +185,11 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -124,6 +213,11 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -147,6 +241,11 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -170,6 +269,12 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
("text", wagtail.fields.RichTextField(blank=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -193,6 +298,12 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=False),
),
("checkbox_text", models.TextField(blank=True)),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -216,6 +327,11 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=True),
),
], ],
options={ options={
"abstract": False, "abstract": False,
@ -298,6 +414,7 @@ class Migration(migrations.Migration):
to="wagtailcore.page", to="wagtailcore.page",
), ),
), ),
("title_hidden", models.BooleanField(default=False)),
( (
"course_category", "course_category",
models.ForeignKey( models.ForeignKey(
@ -330,11 +447,27 @@ class Migration(migrations.Migration):
("minutes", models.PositiveIntegerField(default=15)), ("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)), ("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)), ("content_url", models.TextField(blank=True)),
("has_course_completion_status", models.BooleanField(default=True)),
(
"can_user_self_toggle_course_completion",
models.BooleanField(default=False),
),
(
"assignment_type",
models.CharField(
choices=[
("CASEWORK", "CASEWORK"),
("PREP_ASSIGNMENT", "PREP_ASSIGNMENT"),
("REFLECTION", "REFLECTION"),
],
default="CASEWORK",
max_length=50,
),
),
( (
"content_assignment", "content_assignment",
models.ForeignKey( models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT, on_delete=django.db.models.deletion.PROTECT,
related_name="+",
to="assignment.assignment", to="assignment.assignment",
), ),
), ),

19
server/vbv_lernwelt/learnpath/migrations/0002_learningcontentrichtext_text.py
View File

@ -1,19 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-17 09:00
import wagtail.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("learnpath", "0001_initial"),
]
operations = [
migrations.AddField(
model_name="learningcontentrichtext",
name="text",
field=wagtail.fields.RichTextField(blank=True),
),
]

23
server/vbv_lernwelt/learnpath/migrations/0003_rename_learningcontentattendanceday_learningcontentattendancecourse.py
View File

@ -1,23 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-23 12:49
from django.conf import settings
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("wagtailcore", "0083_workflowcontenttype"),
("wagtailforms", "0005_alter_formsubmission_form_data"),
("wagtailredirects", "0008_add_verbose_name_plural"),
("contenttypes", "0002_remove_content_type_name"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("learnpath", "0002_learningcontentrichtext_text"),
]
operations = [
migrations.RenameModel(
old_name="LearningContentAttendanceDay",
new_name="LearningContentAttendanceCourse",
),
]

28
server/vbv_lernwelt/learnpath/migrations/0004_learningcontentassignment_assignment_type.py
View File

@ -1,28 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-19 15:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
(
"learnpath",
"0003_rename_learningcontentattendanceday_learningcontentattendancecourse",
),
]
operations = [
migrations.AddField(
model_name="learningcontentassignment",
name="assignment_type",
field=models.CharField(
choices=[
("CASEWORK", "CASEWORK"),
("PREP_ASSIGNMENT", "PREP_ASSIGNMENT"),
("REFLECTION", "REFLECTION"),
],
default="CASEWORK",
max_length=50,
),
),
]

85
server/vbv_lernwelt/learnpath/migrations/0005_learningcontentdocumentlist.py
View File

@ -1,85 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-26 10:34
import django.db.models.deletion
import wagtail.blocks
import wagtail.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailcore", "0083_workflowcontenttype"),
("learnpath", "0004_learningcontentassignment_assignment_type"),
]
operations = [
migrations.CreateModel(
name="LearningContentDocumentList",
fields=[
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
("minutes", models.PositiveIntegerField(default=15)),
("description", wagtail.fields.RichTextField(blank=True)),
("content_url", models.TextField(blank=True)),
(
"documents",
wagtail.fields.StreamField(
[
(
"document",
wagtail.blocks.StructBlock(
[
("title", wagtail.blocks.TextBlock()),
(
"description",
wagtail.blocks.TextBlock(
default="", required=False
),
),
(
"icon_url",
wagtail.blocks.TextBlock(
default="", required=False
),
),
(
"link_display_text",
wagtail.blocks.CharBlock(
default="Link öffnen", max_length=255
),
),
(
"url",
wagtail.blocks.TextBlock(
default="", required=False
),
),
(
"open_window",
wagtail.blocks.BooleanBlock(default=False),
),
]
),
)
],
blank=True,
use_json_field=True,
),
),
],
options={
"abstract": False,
},
bases=("wagtailcore.page",),
),
]

18
server/vbv_lernwelt/learnpath/migrations/0006_learningcontenttest_checkbox_text.py
View File

@ -1,18 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-26 14:31
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("learnpath", "0005_learningcontentdocumentlist"),
]
operations = [
migrations.AddField(
model_name="learningcontenttest",
name="checkbox_text",
field=models.TextField(blank=True),
),
]

18
server/vbv_lernwelt/learnpath/migrations/0007_learningunit_title_hidden.py
View File

@ -1,18 +0,0 @@
# Generated by Django 3.2.13 on 2023-05-30 09:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("learnpath", "0006_learningcontenttest_checkbox_text"),
]
operations = [
migrations.AddField(
model_name="learningunit",
name="title_hidden",
field=models.BooleanField(default=False),
),
]

22
server/vbv_lernwelt/learnpath/migrations/0008_alter_learningcontentassignment_content_assignment.py
View File

@ -1,22 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-28 11:21
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("assignment", "0004_assignment_assignment_type"),
("learnpath", "0007_learningunit_title_hidden"),
]
operations = [
migrations.AlterField(
model_name="learningcontentassignment",
name="content_assignment",
field=models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT, to="assignment.assignment"
),
),
]

112
server/vbv_lernwelt/learnpath/migrations/0008_auto_20230626_1747.py
View File

@ -1,112 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-26 15:47
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("learnpath", "0007_learningunit_title_hidden"),
]
operations = [
migrations.AddField(
model_name="learningcontentassignment",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name="learningcontentassignment",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentattendancecourse",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name="learningcontentattendancecourse",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentdocumentlist",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentdocumentlist",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentfeedback",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentfeedback",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentlearningmodule",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentlearningmodule",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentmedialibrary",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentmedialibrary",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentplaceholder",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentplaceholder",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentrichtext",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentrichtext",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontenttest",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name="learningcontenttest",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentvideo",
name="can_user_self_toggle_course_completion",
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name="learningcontentvideo",
name="has_course_completion_status",
field=models.BooleanField(default=True),
),
]

22
server/vbv_lernwelt/learnpath/migrations/0009_alter_learningcontentassignment_content_assignment.py
View File

@ -1,22 +0,0 @@
# Generated by Django 3.2.13 on 2023-06-26 16:30
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("assignment", "0004_assignment_assignment_type"),
("learnpath", "0008_auto_20230626_1747"),
]
operations = [
migrations.AlterField(
model_name="learningcontentassignment",
name="content_assignment",
field=models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT, to="assignment.assignment"
),
),
]

Some files were not shown because too many files have changed in this diff Show More