Commit d3105fa1 authored by faisalhamdi's avatar faisalhamdi

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

parents 9b7b973d 56a6e542
...@@ -168,6 +168,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') => ...@@ -168,6 +168,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body) const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body)
const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body) const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body)
const getSubmission = (body) => api.post('transaction/get_submission_id', body) const getSubmission = (body) => api.post('transaction/get_submission_id', body)
const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body)
//Template //Template
const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`) const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
...@@ -291,7 +292,8 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') => ...@@ -291,7 +292,8 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
updateDocument, updateDocument,
downloadDocument, downloadDocument,
createSubmitReport, createSubmitReport,
getSubmission getSubmission,
checkUploadMB
} }
} }
......
This diff is collapsed.
...@@ -777,6 +777,21 @@ export default class ProfitLoss extends Component { ...@@ -777,6 +777,21 @@ export default class ProfitLoss extends Component {
this.props.onClickClose() this.props.onClickClose()
} }
downloadTemplate = async () => {
let res = await fetch(
`https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
)
res = await res.blob()
console.log(res)
if (res.size > 0) {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Template Profit Loss.xlsx';
a.click();
}
}
render() { render() {
let dataTable2 = this.state.dataTable let dataTable2 = this.state.dataTable
const handleChange = (value, tableMeta) => { const handleChange = (value, tableMeta) => {
...@@ -2357,7 +2372,7 @@ export default class ProfitLoss extends Component { ...@@ -2357,7 +2372,7 @@ export default class ProfitLoss extends Component {
borderColor: 'transparent', borderColor: 'transparent',
margin: 5 margin: 5
}} }}
onClick={() => null} onClick={() => this.downloadTemplate()}
> >
<img src={Images.template} /> <img src={Images.template} />
</button> </button>
......
This diff is collapsed.
...@@ -168,11 +168,11 @@ export default class CreateManagementDoc extends Component { ...@@ -168,11 +168,11 @@ export default class CreateManagementDoc extends Component {
validasi() { validasi() {
if (R.isNil(this.state.getPerusahaan)) { if (R.isNil(this.state.getPerusahaan)) {
this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty.' }) this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' })
} else if (R.isNil(this.state.getDocument)) { } else if (R.isNil(this.state.getDocument)) {
this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty.' }) this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' })
} else if (R.isNil(this.state.file)) { } else if (R.isNil(this.state.file)) {
this.setState({ alert: true, messageAlert: 'File Cannot be Empty.', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' })
} else { } else {
const formData = new FormData(); const formData = new FormData();
formData.append("file", this.state.file); formData.append("file", this.state.file);
......
...@@ -162,9 +162,7 @@ export default class DocumentManagement extends Component { ...@@ -162,9 +162,7 @@ export default class DocumentManagement extends Component {
onClick={() => this.setState({ visibleCreate: true, refresh: '' })} onClick={() => this.setState({ visibleCreate: true, refresh: '' })}
style={{ marginRight: 25 }} style={{ marginRight: 25 }}
> >
<div style={{ width: 150, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}> <img src={Images.add} />
<span style={{ color: '#fff', fontSize: 11 }}>Add</span>
</div>
</button> </button>
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
......
...@@ -15,7 +15,8 @@ export default class ManualBookTia extends Component { ...@@ -15,7 +15,8 @@ export default class ManualBookTia extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleCreate: false, visibleCreate: false,
refresh: '' refresh: '',
alert: false,
} }
} }
......
...@@ -23,7 +23,8 @@ export default class QReview extends Component { ...@@ -23,7 +23,8 @@ export default class QReview extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleCreate: false, visibleCreate: false,
refresh: '' refresh: '',
alert: false,
} }
} }
...@@ -47,9 +48,6 @@ export default class QReview extends Component { ...@@ -47,9 +48,6 @@ export default class QReview extends Component {
api.create().getAllDocument(payload).then((response) => { api.create().getAllDocument(payload).then((response) => {
console.log(response) console.log(response)
if (response.problem){
alert(response.problem)
}
if (response.data) { if (response.data) {
if (response.ok) { if (response.ok) {
if (response.data.status == 'success') { if (response.data.status == 'success') {
...@@ -94,7 +92,6 @@ export default class QReview extends Component { ...@@ -94,7 +92,6 @@ export default class QReview extends Component {
openPopUp = async (index, val, type) =>{ openPopUp = async (index, val, type) =>{
if (type === 'download') { if (type === 'download') {
console.log(this.state.docPath[val])
let res = await fetch( let res = await fetch(
"https://tia.eksad.com/tia-reporting-dev/public/document/download_document?documentName="+this.state.docPath[val]+"&&fileType="+index[5] "https://tia.eksad.com/tia-reporting-dev/public/document/download_document?documentName="+this.state.docPath[val]+"&&fileType="+index[5]
) )
...@@ -110,6 +107,10 @@ export default class QReview extends Component { ...@@ -110,6 +107,10 @@ export default class QReview extends Component {
} }
} }
closeAlert() {
this.setState({ alert: false })
}
render() { render() {
let columns = [{ let columns = [{
name: "Action", name: "Action",
...@@ -117,7 +118,6 @@ export default class QReview extends Component { ...@@ -117,7 +118,6 @@ export default class QReview extends Component {
filter: false, filter: false,
sort: false, sort: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
console.log(tableMeta)
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{/* {this.state.btnedit && <span> */} {/* {this.state.btnedit && <span> */}
......
...@@ -70,7 +70,7 @@ class Upload extends Component { ...@@ -70,7 +70,7 @@ class Upload extends Component {
// alert('File Tidak Boleh Lebih Dari 1MB') // alert('File Tidak Boleh Lebih Dari 1MB')
} }
} else { } else {
this.setState({ alertMessage: 'File extension not allowed.', alert: true }) this.setState({ alertMessage: 'File extension not allowed', alert: true })
// alert('File Tidak Mendukung') // alert('File Tidak Mendukung')
} }
} }
...@@ -81,7 +81,7 @@ class Upload extends Component { ...@@ -81,7 +81,7 @@ class Upload extends Component {
uploadProgress: false, uploadProgress: false,
percentage: '0' percentage: '0'
}) })
this.setState({ alertMessage: "File extension not allowed.", alert: true }) this.setState({ alertMessage: "File extension not allowed", alert: true })
// alert("Unsupported Media Type") // alert("Unsupported Media Type")
} }
} else { } else {
...@@ -105,7 +105,7 @@ class Upload extends Component { ...@@ -105,7 +105,7 @@ class Upload extends Component {
uploadProgress: false, uploadProgress: false,
percentage: '0' percentage: '0'
}) })
this.setState({ alertMessage: "File extension not allowed.", alert: true }) this.setState({ alertMessage: "File extension not allowed", alert: true })
// alert("Unsupported Media Type") // alert("Unsupported Media Type")
} }
} }
...@@ -154,7 +154,7 @@ class Upload extends Component { ...@@ -154,7 +154,7 @@ class Upload extends Component {
} }
} }
} else { } else {
this.setState({ alertMessage: 'File extension not allowed.', alert: true }) this.setState({ alertMessage: 'File extension not allowed', alert: true })
// alert('File Tidak Mendukung') // alert('File Tidak Mendukung')
} }
} }
......
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