Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Commit

Permalink
Merge branch 'Feature_MORE2-1_dynamic-study-start' into TT-109-smf-re…
Browse files Browse the repository at this point in the history
…lative-scheduler-sents-wrong-time
  • Loading branch information
AdPat-Redlink committed Dec 21, 2023
2 parents 4b600e3 + 6b16631 commit b98b09c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions openapi/StudyManagerAPI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,10 @@ components:
readOnly: true
status:
$ref: '#/components/schemas/ParticipantStatus'
start:
type: string
format: date-time
readOnly: true
created:
type: string
format: date-time
Expand Down
8 changes: 8 additions & 0 deletions src/components/ParticipantList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,14 @@ Licensed under the Elastic License 2.0. */
placeholder: t('global.placeholder.noGroup'),
columnWidth: '15vw',
},
{
field: 'start',
header: t('participants.props.individualStart'),
type: MoreTableFieldType.datetime,
sortable: true,
placeholder: '-',
columnWidth: '10vw',
},
];
const rowActions: MoreTableAction[] = [
Expand Down
3 changes: 2 additions & 1 deletion src/components/shared/MoreTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ Licensed under the Elastic License 2.0. */
{{ dayjs(data['__internalValue_' + field]).format('DD/MM/YYYY') }}
</span>
<span v-if="column.type === MoreTableFieldType.datetime">
<span v-if="data[field] !== '-'">
<span v-if="!data[field]"> - </span>
<span v-else-if="data[field] && data[field] !== '-'">
{{ dayjs(data[field]).format('DD/MM/YYYY, HH:mm') }}
</span>
<span v-else>
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@
"participantId": "Teilnehmer ID",
"alias": "Alias",
"token": "Token",
"registrationToken": "Registrierungstoken"
"registrationToken": "Registrierungstoken",
"individualStart": "Gestartet am"
},
"dialog": {
"header": {
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@
"participantId": "Participant ID",
"alias": "Alias",
"token": "Token",
"registrationToken": "Registration token"
"registrationToken": "Registration token",
"individualStart": "Started on"
},
"dialog": {
"header": {
Expand Down

0 comments on commit b98b09c

Please sign in to comment.