stuff

client/components/EventList/DurationDisplay/types.tsx

@@ -4,4 +4,4 @@ import { EventObject, TimeEntry } from 'types'
 export interface IDurationDisplayProps extends HTMLProps<HTMLDivElement> {
   displayFormat?: string
   event: TimeEntry | EventObject
-}
+}

client/components/ProjectTag/ProjectTag.tsx

@@ -19,14 +19,16 @@ import { useProjectTag } from './useProjectTag'
 import ReactMarkdown from 'react-markdown'
 
 /**
+ * A tag for a project. The tag can be copied to the clipboard and favorited.
+ * 
  * @category Reusable Component
  */
 export const ProjectTag: ReusableComponent<IProjectTagProps> = (props) => {
   const { t } = useTranslation()
   const { hasOutlookCategory, addOutlookCategory, onTagCopied, colorPresets } =
     useProjectTag(props)
   return (
-    <InteractionTag className={ProjectTag.className}>
+    <InteractionTag className={ProjectTag.className} size={props.size}>
       <CopyToClipboard text={props.project?.tag} onCopy={onTagCopied}>
         <InteractionTagPrimary
           hasSecondaryAction={props.enableFavoriting}
@@ -82,6 +84,7 @@ export const ProjectTag: ReusableComponent<IProjectTagProps> = (props) => {
 ProjectTag.displayName = 'ProjectLink'
 ProjectTag.className = styles.projectTag
 ProjectTag.defaultProps = {
+  size: 'medium',
   outlookCategoriesHref:
     'https://outlook.office.com/mail/options/general/categories'
 }

client/components/ProjectTag/types.tsx

@@ -1,10 +1,11 @@
+import { InteractionTagProps } from '@fluentui/react-tags-preview'
 import { HTMLProps } from 'react'
 import { Project } from 'types'
 
 /**
  * Props for the ProjectLink component.
  */
-export interface IProjectTagProps extends HTMLProps<HTMLDivElement> {
+export interface IProjectTagProps extends Omit<HTMLProps<HTMLDivElement>, 'size'>, Pick<InteractionTagProps, 'size'> {
   /**
    * The project to link to.
    */

client/graphql-client/fragments/timeentry-fragment.gql

@@ -18,4 +18,8 @@ fragment TimeEntryFragment on TimeEntry {
   resource {
     id
   }
+  role {
+    name
+    hourlyRate
+  }
 }

server/graphql/resolvers/reports/types.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import 'reflect-metadata'
 import { Field, Float, ID, InputType, ObjectType } from 'type-graphql'
-import { Customer, Project, User } from '../types'
+import { Customer, Project, ProjectRole, User } from '../types'
 
 /**
  * @category GraphQL ObjectType
@@ -61,6 +61,9 @@ export class TimeEntry {
 
   @Field(() => User)
   resource: User
+
+  @Field(() => ProjectRole)
+  role: ProjectRole
 }
 
 /**