Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

make upload button in edit files dialog fully clickable; close #289

Browse source
This commit is contained in:
Sonja Happ 2021-03-18 14:41:02 +01:00
parent 31e1da9ee1
commit 0cf3294816
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dashboard/dashboard.js
View file

@ -21,7 +21,7 @@ import Fullscreenable from 'react-fullscreenable';
import classNames from 'classnames';
import EditWidget from '../widget/edit-widget/edit-widget';
import EditFiles from '../file/edit-files';
import EditFilesDialog from '../file/edit-files';
import EditSignalMappingDialog from "../signal/edit-signal-mapping";
import WidgetContextMenu from '../widget/widget-context-menu';
import WidgetToolbox from '../widget/widget-toolbox';
@ -560,7 +560,7 @@ class Dashboard extends Component {
ics={this.state.ics}
/>
<EditFiles
<EditFilesDialog
sessionToken={this.state.sessionToken}
show={this.state.filesEditModal}
onClose={this.closeEditFiles.bind(this)}

27
src/file/edit-files.js
View file

@ -16,7 +16,7 @@
******************************************************************************/
import React from 'react';
import { Form, Button, Col, ProgressBar } from 'react-bootstrap';
import {Form, Button, Col, ProgressBar, Row} from 'react-bootstrap';
import Dialog from '../common/dialogs/dialog';
import AppDispatcher from "../common/app-dispatcher";
import Table from "../common/table";
@ -142,24 +142,26 @@ class EditFilesDialog extends React.Component {
/>
</Table>
<Form.Group as={Col} >
<Form.Control
disabled={this.props.disabled}
type='file'
onChange={(event) => this.selectUploadFile(event)}
/>
</Form.Group>
<Form.Group as={Col} >
<div style={{ float: 'center' }}>
<h5>Add file</h5>
<Row>
<Col xs lg="4">
<Form.Control type='file' onChange={(event) => this.selectUploadFile(event)} />
</Col>
<Col xs lg="2">
<span className='solid-button'>
<Button
variant='secondary'
disabled={this.state.uploadFile === null}
onClick={() => this.startFileUpload()}>
Upload
</Button>
</Button>
</span>
</Form.Group>
</Col>
</Row>
</div>
<br />
<Form.Group as={Col} >
<ProgressBar
@ -167,7 +169,6 @@ class EditFilesDialog extends React.Component {
animated={true}
now={this.state.uploadProgress}
label={this.state.uploadProgress + '%'}
style={progressBarStyle}
/>
</Form.Group>

4
src/scenario/scenario.js
View file

@ -36,7 +36,7 @@ import ImportConfigDialog from '../componentconfig/import-config';
import ImportDashboardDialog from "../dashboard/import-dashboard";
import NewDashboardDialog from "../dashboard/new-dashboard";
import EditDashboardDialog from '../dashboard/edit-dashboard';
import EditFiles from '../file/edit-files'
import EditFilesDialog from '../file/edit-files'
import NewResultDialog from '../result/new-result';
import EditResultDialog from '../result/edit-result';
import ResultConfigDialog from '../result/result-configs-dialog';
@ -746,7 +746,7 @@ class Scenario extends React.Component {
</div>
<h1>{this.state.scenario.name}</h1>
<EditFiles
<EditFilesDialog
sessionToken={this.state.sessionToken}
show={this.state.filesEditModal}
onClose={this.closeEditFiles.bind(this)}