mirror of
https://github.com/IT4Change/gradido.git
synced 2026-04-06 01:25:28 +00:00
Merge pull request #3589 from gradido/admin_add_registerdAt_on_usersearch
feat(admin): show user registered at in admin
This commit is contained in:
commit
4ace9bc5a6
@ -16,6 +16,10 @@
|
|||||||
<div v-html="data.value" />
|
<div v-html="data.value" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<template #cell(createdAt)="data">
|
||||||
|
{{ $d(new Date(data.value), 'long') }}
|
||||||
|
</template>
|
||||||
|
|
||||||
<template #cell(status)="row">
|
<template #cell(status)="row">
|
||||||
<div class="d-flex gap-3 justify-content-end align-items-center">
|
<div class="d-flex gap-3 justify-content-end align-items-center">
|
||||||
<div
|
<div
|
||||||
|
|||||||
@ -26,6 +26,7 @@ export const searchUsers = gql`
|
|||||||
hasElopage
|
hasElopage
|
||||||
emailConfirmationSend
|
emailConfirmationSend
|
||||||
deletedAt
|
deletedAt
|
||||||
|
createdAt
|
||||||
roles
|
roles
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -244,6 +244,7 @@
|
|||||||
},
|
},
|
||||||
"redeemed": "eingelöst",
|
"redeemed": "eingelöst",
|
||||||
"registered": "Registriert",
|
"registered": "Registriert",
|
||||||
|
"registered_at": "Registriert am",
|
||||||
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
|
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
|
||||||
"reset": "Zurücksetzen",
|
"reset": "Zurücksetzen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
|
|||||||
@ -244,6 +244,7 @@
|
|||||||
},
|
},
|
||||||
"redeemed": "redeemed",
|
"redeemed": "redeemed",
|
||||||
"registered": "Registered",
|
"registered": "Registered",
|
||||||
|
"registered_at": "Registered at",
|
||||||
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
|
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
|
||||||
"reset": "Reset",
|
"reset": "Reset",
|
||||||
"save": "Save",
|
"save": "Save",
|
||||||
|
|||||||
@ -125,6 +125,7 @@ const fields = computed(() => [
|
|||||||
return value.join(' | ')
|
return value.join(' | ')
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{ key: 'createdAt', label: t('registered_at') },
|
||||||
// { key: 'show_details', label: t('details') },
|
// { key: 'show_details', label: t('details') },
|
||||||
// { key: 'confirm_mail', label: t('confirmed') },
|
// { key: 'confirm_mail', label: t('confirmed') },
|
||||||
// { key: 'has_elopage', label: 'elopage' },
|
// { key: 'has_elopage', label: 'elopage' },
|
||||||
|
|||||||
@ -13,6 +13,7 @@ export class UserAdmin {
|
|||||||
this.emailChecked = user.emailContact?.emailChecked
|
this.emailChecked = user.emailContact?.emailChecked
|
||||||
this.hasElopage = hasElopage
|
this.hasElopage = hasElopage
|
||||||
this.deletedAt = user.deletedAt
|
this.deletedAt = user.deletedAt
|
||||||
|
this.createdAt = user.createdAt
|
||||||
this.emailConfirmationSend = emailConfirmationSend
|
this.emailConfirmationSend = emailConfirmationSend
|
||||||
this.roles = user.userRoles?.map((userRole) => userRole.role) ?? []
|
this.roles = user.userRoles?.map((userRole) => userRole.role) ?? []
|
||||||
}
|
}
|
||||||
@ -41,6 +42,9 @@ export class UserAdmin {
|
|||||||
@Field(() => Date, { nullable: true })
|
@Field(() => Date, { nullable: true })
|
||||||
deletedAt: Date | null
|
deletedAt: Date | null
|
||||||
|
|
||||||
|
@Field(() => Date)
|
||||||
|
createdAt: Date
|
||||||
|
|
||||||
@Field(() => String, { nullable: true })
|
@Field(() => String, { nullable: true })
|
||||||
emailConfirmationSend: string | null
|
emailConfirmationSend: string | null
|
||||||
|
|
||||||
|
|||||||
@ -976,7 +976,7 @@ export class UserResolver {
|
|||||||
@Ctx() context: Context,
|
@Ctx() context: Context,
|
||||||
): Promise<SearchUsersResult> {
|
): Promise<SearchUsersResult> {
|
||||||
const clientTimezoneOffset = getClientTimezoneOffset(context)
|
const clientTimezoneOffset = getClientTimezoneOffset(context)
|
||||||
const userFields = ['id', 'firstName', 'lastName', 'emailId', 'emailContact', 'deletedAt']
|
const userFields = ['id', 'firstName', 'lastName', 'emailId', 'emailContact', 'deletedAt', 'createdAt']
|
||||||
const [users, count] = await findUsers(
|
const [users, count] = await findUsers(
|
||||||
userFields,
|
userFields,
|
||||||
query,
|
query,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user