Commit d99ff583 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '787-bugfixes-5' into 'main' 

Bugfixes #5

Closes #787

See merge request inject/frontend!686
parents 8492d671 4654a7e3

frontend/src/components/ExerciseList/index.tsx

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ export const ExerciseList: FC<ExerciseListProps> = ({ 
      columns={columns}

      className={className}

      rows={rows}

      defaultSortByColumnId='createdAt'

      loading={loading}

      noDataStateProps={{

        title: 'No exercises',

frontend/src/components/Questionnaire/index.tsx

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ const Questionnaire: FC<QuestionnaireProps> = ({ 
          ))}

        </div>

        {!answersAccepted && (

          <p>

          <p className={Classes.TEXT_MUTED}>

            {maxAttempts === undefined

              ? 'Unlimited attempts: submit is available until all answers are correct'

              : maxAttempts > 1 &&

shared/utils/formatTimestamp.ts

+1 −1
Original line number Diff line number Diff line 
export const formatTimestamp = (timestamp: string | null) => {

  const date = new Date(timestamp || 0)

  return `${date.toLocaleDateString()} ${date.toLocaleTimeString()}`

  return `${date.toLocaleDateString('en-US')} ${date.toLocaleTimeString('en-US')}`

}



export const formatTimestampRelative = (