Skip to content
Snippets Groups Projects
Commit a3f10ddc authored by Albin Henriksson's avatar Albin Henriksson Committed by Victor Löfgren
Browse files

Improve correcting instructions

parent e642ca0b
No related branches found
No related tags found
1 merge request!120Improve correcting instructions
Pipeline #43147 passed with warnings
...@@ -54,6 +54,7 @@ const Instructions = ({ activeSlide, competitionId }: InstructionsProps) => { ...@@ -54,6 +54,7 @@ const Instructions = ({ activeSlide, competitionId }: InstructionsProps) => {
<ListItem divider> <ListItem divider>
<Center> <Center>
<TextField <TextField
multiline
id="outlined-basic" id="outlined-basic"
defaultValue={activeSlide.questions[0].correcting_instructions} defaultValue={activeSlide.questions[0].correcting_instructions}
onChange={updateInstructionsText} onChange={updateInstructionsText}
......
import { Box, Card, Typography } from '@material-ui/core' import { Typography } from '@material-ui/core'
import axios from 'axios'
import React from 'react' import React from 'react'
import { getPresentationCompetition } from '../../../actions/presentation'
import { useAppDispatch, useAppSelector } from '../../../hooks'
import { RichQuestion } from '../../../interfaces/ApiRichModels' import { RichQuestion } from '../../../interfaces/ApiRichModels'
import { import { JudgeScoringInstructionsContainer, ScoringInstructionsInner } from './styled'
AnswerContainer,
JudgeScoringInstructionsContainer,
ScoreDisplayContainer,
ScoreDisplayHeader,
ScoreInput,
} from './styled'
type JudgeScoringInstructionsProps = { type JudgeScoringInstructionsProps = {
question: RichQuestion question: RichQuestion
} }
const JudgeScoringInstructions = ({ question }: JudgeScoringInstructionsProps) => { const JudgeScoringInstructions = ({ question }: JudgeScoringInstructionsProps) => {
console.log(question)
return ( return (
<JudgeScoringInstructionsContainer elevation={3}> <JudgeScoringInstructionsContainer elevation={3}>
<Typography variant="h4">Rättningsinstruktioner</Typography> <ScoringInstructionsInner>
<Typography variant="body1">{question?.correcting_instructions}</Typography> <Typography variant="h4">Rättningsinstruktioner</Typography>
<Typography variant="body1">
{question?.correcting_instructions !== null
? question?.correcting_instructions
: 'Det finns inga rättningsinstruktioner för denna fråga'}
</Typography>
</ScoringInstructionsInner>
</JudgeScoringInstructionsContainer> </JudgeScoringInstructionsContainer>
) )
} }
......
import { Card, Paper, TextField } from '@material-ui/core' import { Paper, TextField } from '@material-ui/core'
import styled from 'styled-components' import styled from 'styled-components'
export const SlideContainer = styled.div` export const SlideContainer = styled.div`
...@@ -38,6 +38,11 @@ export const JudgeScoringInstructionsContainer = styled(Paper)` ...@@ -38,6 +38,11 @@ export const JudgeScoringInstructionsContainer = styled(Paper)`
bottom: 0; bottom: 0;
height: 250px; height: 250px;
width: 100%; width: 100%;
`
export const ScoringInstructionsInner = styled.div`
margin-left: 15px;
margin-right: 15px;
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment