Skip to content

T
Tia-dev
Commit 4cb685d5 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'rifka' into 'master' 

upload all extension

See merge request !420
parents 9f7680c2 e0eb4e0d
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 58 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ 4cb685d5
......@@ -5008,8 +5008,10 @@ export default class TaxPlanning extends Component {
// }
onClick={() =>
this.state.handleTekTekTek == 1? null :
this.setState({handleTekTekTek: 1}, () => {
this.backToMasterBudget('draft')
this.setState({handleTekTekTek: 1, loading: true}, () => {
setTimeout(() => {
this.backToMasterBudget('draft')
}, 100);
})
}
style={{
......@@ -5043,8 +5045,10 @@ export default class TaxPlanning extends Component {
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
:
this.state.handleTekTekTek == 1? null :
this.setState({handleTekTekTek: 1}, () => {
this.backToMasterBudget('submitted')
this.setState({handleTekTekTek: 1, loading: true}, () => {
setTimeout(() => {
this.backToMasterBudget('submitted')
}, 100);
})}
style={{
backgroundColor: 'transparent',
......@@ -5133,17 +5137,26 @@ export default class TaxPlanning extends Component {
outline: 'none',
marginRight: 20
}}
onClick={() =>
this.state.editable === true ?
null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => {
this.uploadTP('draft')
}, 100);
})
)
}
// onClick={() =>
// this.state.editable === true ?
// null : this.setState({ loading: true}, () =>
// this.state.handleTekTekTek == 1 ? null :
// this.setState({ handleTekTekTek: 1 }, () => {
// setTimeout(() => {
// this.uploadTP('draft')
// }, 100);
// })
// )
// }
onClick={() => this.state.editable === true ?
null
:
this.state.handleTekTekTek == 1 ? null :
this.setState({handleTekTekTek: 1, loading: true}, () => {
setTimeout(() => {
this.uploadTP('draft')
}, 100);
})}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
......@@ -5158,17 +5171,26 @@ export default class TaxPlanning extends Component {
borderColor: 'transparent',
outline: 'none',
}}
onClick={() =>
this.state.editable === true ?
null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => {
this.uploadTP('submitted')
}, 100);
})
)
}
// onClick={() =>
// this.state.editable === true ?
// null : this.setState({ loading: true}, () =>
// this.state.handleTekTekTek == 1 ? null :
// this.setState({ handleTekTekTek: 1 }, () => {
// setTimeout(() => {
// this.uploadTP('submitted')
// }, 100);
// })
// )
// }
onClick={() => this.state.editable === true ?
null
:
this.state.handleTekTekTek == 1 ? null :
this.setState({handleTekTekTek: 1, loading: true}, () => {
setTimeout(() => {
this.uploadTP('submitted')
}, 100);
})}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
......
src/container/DocumentManagement/CreateManagementDoc.js
View file @ 4cb685d5
......@@ -56,7 +56,6 @@ export default class CreateManagementDoc extends Component {
this.getPeriode()
this.getMonth()
this.getFileSize()
console.log(this.props.name)
}
getFileSize() {
......@@ -79,7 +78,6 @@ export default class CreateManagementDoc extends Component {
})
}
// sizeUpload: response.data.data[0] ? response.data.data[0].value === undefined ? "1" : response.data.data[0].value : "1"
console.log(this.state.sizeUpload)
}
}
})
......@@ -226,8 +224,8 @@ export default class CreateManagementDoc extends Component {
let fileObj = event
let length = event.name.split(".").length
let fileType = event.name.split(".")[length - 1]
console.log(fileType)
if (fileType === 'zip') {
// console.log(fileType)
if (fileType === 'zip' || 'rar') {
this.setState({ file: event, fileType: String(fileType) })
} else {
ExcelRenderer(fileObj, (err, resp) => {
......@@ -267,7 +265,7 @@ export default class CreateManagementDoc extends Component {
object[key] = value;
});
var json = JSON.stringify(object);
console.log(object)
// console.log(object)
}
} else {
......@@ -426,7 +424,7 @@ export default class CreateManagementDoc extends Component {
type={this.state.uploadStatus}
percentage={this.state.percentage}
result={this.state.result}
acceptedFiles={["xls", "xlsx", "pdf", "PDF", "docx", "doc", "pptx", "ppt", "ods", "odf", "zip"]}
acceptedFiles={["xls", "xlsx", "pdf", "PDF", "docx", "doc", "pptx", "ppt", "ods", "odf", "txt", "csv", "zip", "rar"]}
intent={"management"}
onHandle={(dt) => {
this.fileHandler(dt)
......
src/container/DocumentManagement/DocumentManagement.js
View file @ 4cb685d5
......@@ -101,7 +101,7 @@ export default class DocumentManagement extends Component {
if (response.data) {
if (response.ok) {
if (response.data.message === "The Document Already Exists in The System, Do You Want to Overwrite It?") {
this.setState({ formData: payload, docId: response.data.data.document_id }, () => {
this.setState({ formData: payload, docId: response.data.data.document_id, settingID, menuName }, () => {
this.setState({ konfirmasi: true })
})
}
......@@ -131,16 +131,7 @@ export default class DocumentManagement extends Component {
createUploadDocument() {
const formData = this.state.formData
formData.append("documentId", this.state.docId)
// const docuID = Object.values(payload)
// const formDatas = new FormData();
// formDatas.append("file", this.state.file);
// formDatas.append("companyId", this.state.getPerusahaan.company_id);
// formDatas.append("settingId", this.state.getDocument.document_category_id);
// formDatas.append("documentPeriode", this.state.periode.periode);
// formDatas.append("description", this.state.description);
// formDatas.append("extension", this.state.fileType);
// // formDatas.append("documentId", docuID[0]);
// console.log(payload);
formData.append("updated", 1)
api.create().updateDocument(formData).then(response => {
console.log(response)
if (response.data) {
......
src/container/DocumentManagement/EditManagementDoc.js
View file @ 4cb685d5
......@@ -58,7 +58,6 @@ export default class EditManagementDoc extends Component {
this.getFileSize()
if (this.props.type === 'edit') {
this.getDetailDoc()
console.log(this.props)
}
}
......@@ -270,15 +269,19 @@ export default class EditManagementDoc extends Component {
let fileObj = event
let length = event.name.split(".").length
let fileType = event.name.split(".")[length - 1]
ExcelRenderer(fileObj, (err, resp) => {
// console.log(fileType)
if (err) {
console.log(err);
}
else {
this.setState({ file: event, fileType: String(fileType) })
}
})
if (fileType === 'zip' || 'rar') {
this.setState({ file: event, fileType: String(fileType) })
} else {
ExcelRenderer(fileObj, (err, resp) => {
// console.log(fileType)
if (err) {
console.log(err);
}
else {
this.setState({ file: event, fileType: String(fileType) })
}
})
}
}
validasi() {
......
src/library/Upload.js
View file @ 4cb685d5
......@@ -60,7 +60,7 @@ class Upload extends Component {
// console.log(sizeFile);
if (this.props.intent === 'management') {
if (acceptedFiles) {
if (this.props.acceptedFiles.includes(fileType)) {
// if (this.props.acceptedFiles.includes(fileType)) {
if ((acceptedFiles[0].size / 1000).toFixed(0) < (this.props.sizeUpload * 1000)) {
this.setState({
file: acceptedFiles[0],
......@@ -77,10 +77,10 @@ class Upload extends Component {
this.setState({ alertMessage: `The file is too large. Allowed maximum size is ${this.props.sizeUpload} MB`, alert: true })
// alert('File Tidak Boleh Lebih Dari 1MB')
}
} else {
this.setState({ alertMessage: 'File extension not allowed', alert: true })
// alert('File Tidak Mendukung')
}
// } else {
// this.setState({ alertMessage: 'File extension not allowed', alert: true })
// // alert('File Tidak Mendukung')
// }
}
else {
this.setState({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment