schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add workspace functions to assessment

Browse Source
This commit is contained in:
Delucse 2020-09-15 17:21:02 +02:00
parent 1c29dd2109
commit 427467eb8a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Tutorial/Assessment.js
View File

@ -5,6 +5,7 @@ import { connect } from 'react-redux';
import BlocklyWindow from '../Blockly/BlocklyWindow'; import BlocklyWindow from '../Blockly/BlocklyWindow';
import SolutionCheck from './SolutionCheck'; import SolutionCheck from './SolutionCheck';
import CodeViewer from '../CodeViewer'; import CodeViewer from '../CodeViewer';
import WorkspaceFunc from '../WorkspaceFunc';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import Card from '@material-ui/core/Card'; import Card from '@material-ui/core/Card';
@ -21,10 +22,10 @@ class Assessment extends Component {
return ( return (
<div style={{width: '100%'}}> <div style={{width: '100%'}}>
<Typography variant='h4' style={{marginBottom: '5px'}}>{currentTask.headline}</Typography> <Typography variant='h4' style={{float: 'left', marginBottom: '5px', height: '40px', display: 'table'}}>{currentTask.headline}</Typography>
<div style={{float: 'right', height: '40px'}}><WorkspaceFunc solutionCheck/></div>
<Grid container spacing={2} style={{marginBottom: '5px'}}> <Grid container spacing={2} style={{marginBottom: '5px'}}>
<Grid item xs={12} md={6} lg={8} style={{ position: 'relative' }}> <Grid item xs={12} md={6} lg={8}>
<SolutionCheck />
<BlocklyWindow initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null}/> <BlocklyWindow initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null}/>
</Grid> </Grid>
<Grid item xs={12} md={6} lg={4}> <Grid item xs={12} md={6} lg={4}>

2
src/components/Tutorial/SolutionCheck.js
View File

@ -63,7 +63,7 @@ class SolutionCheck extends Component {
<Tooltip title='Lösung kontrollieren'> <Tooltip title='Lösung kontrollieren'>
<IconButton <IconButton
className={this.props.classes.compile} className={this.props.classes.compile}
style={{width: '40px', height: '40px', position: 'absolute', top: 8, right: 8, zIndex: 21 }} style={{width: '40px', height: '40px', marginRight: '5px'}}
onClick={() => this.check()} onClick={() => this.check()}
> >
<FontAwesomeIcon icon={faPlay} size="xs"/> <FontAwesomeIcon icon={faPlay} size="xs"/>

3
src/components/WorkspaceFunc.js
View File

@ -10,6 +10,7 @@ import { saveAs } from 'file-saver';
import { initialXml } from './Blockly/initialXml.js'; import { initialXml } from './Blockly/initialXml.js';
import Compile from './Compile'; import Compile from './Compile';
import SolutionCheck from './Tutorial/SolutionCheck';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
@ -103,7 +104,7 @@ class WorkspaceFunc extends Component {
render() { render() {
return ( return (
<div style={{width: 'max-content', display: 'flex'}}> <div style={{width: 'max-content', display: 'flex'}}>
<Compile iconButton /> {this.props.solutionCheck ? <SolutionCheck /> : <Compile iconButton />}
<Tooltip title='Blöcke speichern' arrow style={{marginRight: '5px'}}> <Tooltip title='Blöcke speichern' arrow style={{marginRight: '5px'}}>
<IconButton <IconButton
className={this.props.classes.button} className={this.props.classes.button}