From fd807dd1ebcddb0d0dae2ee780c76d335507596e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janis=20Daniel=20Da=CC=88hne?= <janis.daehne@informatik.uni-halle.de> Date: Fri, 29 Jan 2021 12:46:38 +0100 Subject: [PATCH] - own/group exercises now display the created at column --- .../listView.tsx | 48 +++++++++++++++++++ src/constants.ts | 2 +- src/types/exercisePreview.ts | 5 ++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/components/sites/manageOwnOrGroupExerciseComponents/listView.tsx b/src/components/sites/manageOwnOrGroupExerciseComponents/listView.tsx index fa379443..1531633d 100644 --- a/src/components/sites/manageOwnOrGroupExerciseComponents/listView.tsx +++ b/src/components/sites/manageOwnOrGroupExerciseComponents/listView.tsx @@ -275,6 +275,47 @@ class TableView extends React.Component<Props, any> { } </span> </Table.HeaderCell> + <Table.HeaderCell sorted={ + isCurrentSortingColumnPaginated<EditableExercisePreviewFromBackend>(this.props.sortByKey, + 'createdAt', + this.props.sortDirection + ) + } + > + <span className="clickable" + onClick={() => { + if (this.props.groupId === null) { + const func = this.props.setSortByKey as (sortByKey: keyof EditableExercisePreviewFromBackend, + sortDirection: boolean | null + ) => void + func('createdAt', + rotateSorting<EditableExercisePreviewFromBackend>( + this.props.sortDirection, + this.props.sortByKey, + 'createdAt' + ) + ) + return + } + + const func = this.props.setSortByKey as (sortByKey: keyof EditableExercisePreviewFromBackend, + sortDirection: boolean | null, groupId: number + ) => void + func('createdAt', + rotateSorting<EditableExercisePreviewFromBackend>( + this.props.sortDirection, + this.props.sortByKey, + 'createdAt', + ), + this.props.groupId + ) + }} + > + { + getI18n(this.props.langId, 'Created at') + } + </span> + </Table.HeaderCell> <Table.HeaderCell sorted={ isCurrentSortingColumnPaginated<EditableExercisePreviewFromBackend>(this.props.sortByKey, 'solutions', @@ -621,6 +662,13 @@ class TableView extends React.Component<Props, any> { } </span> </Table.Cell> + <Table.Cell> + <span> + { + displayDateAndTime(exercisePreview.createdAt, -1) + } + </span> + </Table.Cell> <Table.Cell> <span>{exercisePreview.solutions}</span> diff --git a/src/constants.ts b/src/constants.ts index 7bafd5ce..31fa023f 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -13,7 +13,7 @@ import Logger from './helpers/logger' * y - breaking changes / new features * z - fixes, small changes */ -export const versionString = '2.9.13' +export const versionString = '2.9.14' export const supportMail = 'yapex@informatik.uni-halle.de' diff --git a/src/types/exercisePreview.ts b/src/types/exercisePreview.ts index 4056a45f..ac704e8c 100644 --- a/src/types/exercisePreview.ts +++ b/src/types/exercisePreview.ts @@ -140,6 +140,11 @@ export interface EditableExercisePreviewFromBackend { */ readonly isPermanentlyLocked: boolean + /** + * when the exercise was created + */ + readonly createdAt: Moment + /** * when the exercise was last updated */ -- GitLab