Date formatting per workspace member settings (#6408)
Implement date formatting per workspace member settings We'll need another round to maybe initialize all workspaces on the default settings. For now the default behavior is to take system settings if nothing is found in DB. --------- Co-authored-by: Weiko <corentin@twenty.com>
This commit is contained in:
@ -3,6 +3,10 @@ import { Field, ObjectType } from '@nestjs/graphql';
|
||||
import { IDField } from '@ptc-org/nestjs-query-graphql';
|
||||
|
||||
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
|
||||
import {
|
||||
WorkspaceMemberDateFormatEnum,
|
||||
WorkspaceMemberTimeFormatEnum,
|
||||
} from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
|
||||
|
||||
@ObjectType('FullName')
|
||||
export class FullName {
|
||||
@ -27,6 +31,15 @@ export class WorkspaceMember {
|
||||
@Field({ nullable: true })
|
||||
avatarUrl: string;
|
||||
|
||||
@Field({ nullable: false })
|
||||
@Field({ nullable: true })
|
||||
locale: string;
|
||||
|
||||
@Field({ nullable: true })
|
||||
timeZone: string;
|
||||
|
||||
@Field(() => WorkspaceMemberDateFormatEnum, { nullable: true })
|
||||
dateFormat: WorkspaceMemberDateFormatEnum;
|
||||
|
||||
@Field(() => WorkspaceMemberTimeFormatEnum, { nullable: true })
|
||||
timeFormat: WorkspaceMemberTimeFormatEnum;
|
||||
}
|
||||
|
||||
@ -70,6 +70,9 @@ export class UserService extends TypeOrmQueryService<User> {
|
||||
firstName: workspaceMembers[0].nameFirstName,
|
||||
lastName: workspaceMembers[0].nameLastName,
|
||||
};
|
||||
userWorkspaceMember.timeZone = workspaceMembers[0].timeZone;
|
||||
userWorkspaceMember.dateFormat = workspaceMembers[0].dateFormat;
|
||||
userWorkspaceMember.timeFormat = workspaceMembers[0].timeFormat;
|
||||
|
||||
return userWorkspaceMember;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user