From 4af5dfdd782cb831dc3e5e18f4e884e72d169f86 Mon Sep 17 00:00:00 2001 From: Victor Ilyushchenko Date: Tue, 18 Feb 2025 16:44:15 +0300 Subject: [PATCH] EQMS-1437: use different label to display trainees' results "owner". (#8046) * EQMS-1437: use different column to display trainees' results "owner". Signed-off-by: Victor Ilyushchenko * ff Signed-off-by: Victor Ilyushchenko --------- Signed-off-by: Victor Ilyushchenko --- models/training/src/index.ts | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/models/training/src/index.ts b/models/training/src/index.ts index fc25f209de..dcd9c2e091 100644 --- a/models/training/src/index.ts +++ b/models/training/src/index.ts @@ -16,7 +16,7 @@ import activity from '@hcengineering/activity' import notification, { type NotificationType } from '@hcengineering/notification' import { type Asset, type IntlString } from '@hcengineering/platform' -import type { BuildModelKey, Viewlet, ViewletDescriptor } from '@hcengineering/view' +import type { BuildModelKey, KeyFilterPreset, Viewlet, ViewletDescriptor } from '@hcengineering/view' import questions from '@hcengineering/model-questions' import contact from '@hcengineering/contact' import tracker from '@hcengineering/model-tracker' @@ -659,9 +659,19 @@ function defineTrainingAttempt (builder: Builder): void { sortingKey: 'state', displayProps: { align: 'center' } } - const columnOwner: BuildModelKey = { - ...columns.owner, - key: 'owner' + const columnTrainee: BuildModelKey = { + key: 'owner', + label: training.string.TrainingRequestTrainee, + presenter: contacts.component.EmployeePresenter, + props: { shouldShowName: true }, + displayProps: { align: 'center' } + } + + const columnTraineeFilter: KeyFilterPreset = { + _class: training.class.TrainingAttempt, + component: contacts.component.EmployeeFilter, + key: 'owner', + label: training.string.TrainingRequestTrainee } defineTableBrowserViewletDescriptor( @@ -693,7 +703,7 @@ function defineTrainingAttempt (builder: Builder): void { columnScore, 'createdOn', 'submittedOn', - columnOwner + columnTrainee ], configOptions: { strict: true, @@ -720,7 +730,7 @@ function defineTrainingAttempt (builder: Builder): void { }) builder.mixin(training.class.TrainingAttempt, core.class.Class, view.mixin.ClassFilters, { - filters: ['state', 'owner', 'submittedOn'] as Array, + filters: ['state', 'submittedOn', columnTraineeFilter] as Array, strict: true })