senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add door lock charges screen #8

Merged
bilal.catic merged 9 commits from add-door-lock-charges-screen into master 2019-06-10 06:13:05 +02:00
Conversation 4 Commits 9 Files Changed 28 +13 -9
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c528296ec - Show all commits

15
client/src/scenes/UploadDLockData/components/FileUpload.js
View File

@@ -9,7 +9,7 @@ class FileUpload extends Component {
super(props); super(props);
this.state = { this.state = {
file: null, files: null,
}; };
this.onFileChange = this.onFileChange.bind(this); this.onFileChange = this.onFileChange.bind(this);
@@ -17,16 +17,16 @@ class FileUpload extends Component {
} }
onFileChange(event) { onFileChange(event) {
const file = event.target.files[0]; const files = event.target.files;
this.setState({file}); this.setState({files});
}; };
onUploadClick() { onUploadClick() {
const { uploadDoorLockData } = this.props; const { uploadDoorLockData } = this.props;
const { file } = this.state; const { files } = this.state;
if (file) { if (files) {
uploadDoorLockData(file); uploadDoorLockData(files);
} }
}; };
@@ -39,6 +39,7 @@ class FileUpload extends Component {
required required
label="Select DLock file" label="Select DLock file"
type="file" type="file"
multiple
accept=".csv" accept=".csv"
onChange={this.onFileChange} onChange={this.onFileChange}
/> />
@@ -53,7 +54,7 @@ const mapStateToProps = (state) => ({
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
uploadDoorLockData: (doorLockDataFile) => uploadDoorLockData(dispatch, doorLockDataFile) uploadDoorLockData: (doorLockDataFiles) => uploadDoorLockData(dispatch, doorLockDataFiles)
}); });
export default connect(mapStateToProps, mapDispatchToProps)(FileUpload); export default connect(mapStateToProps, mapDispatchToProps)(FileUpload);

7
client/src/store/actions/doorLockActions.js
View File

@@ -6,9 +6,12 @@ import {
import API from '../../utilities/api'; import API from '../../utilities/api';
export const uploadDoorLockData = (dispatch, doorLockDataFile) => { export const uploadDoorLockData = (dispatch, doorLockDataFiles) => {
const formData = new FormData(); const formData = new FormData();
formData.append('doorLockDataFile', doorLockDataFile); const filesArray = Array.from(doorLockDataFiles) || [];
filesArray.forEach((file, index) => {
formData.append(`doorLockDataFile-${index}`, file);
});
const additionalConfig = { const additionalConfig = {
headers: {'content-type': 'multipart/form-data'} headers: {'content-type': 'multipart/form-data'}
}; };