Skip to content

T
Tia-dev
Commit 3aa796cb authored by EKSAD's avatar EKSAD
Browse files
Options

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

parents bbbad0b4 e1084a51
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 720 deletions
src/container/BudgetTahunan.js
View file @ 3aa796cb
...@@ -312,7 +312,7 @@ export default class BudgetTahunan extends Component { ...@@ -312,7 +312,7 @@ export default class BudgetTahunan extends Component {
saveToMasterBudget(data) { saveToMasterBudget(data) {
this.setState({ loading: true }) this.setState({ loading: true })
// console.log(JSON.stringify(data)); // console.log(JSON.stringify(data));
api.create().createSubmitReport(data).then(response => { api.create('UPLOAD').createSubmitReport(data).then(response => {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
...@@ -674,6 +674,7 @@ export default class BudgetTahunan extends Component { ...@@ -674,6 +674,7 @@ export default class BudgetTahunan extends Component {
)} )}
{this.state.visibleTP && ( {this.state.visibleTP && (
<TaxPlanning <TaxPlanning
open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
height={this.props.height} height={this.props.height}
width={this.props.width} width={this.props.width}
...@@ -683,6 +684,8 @@ export default class BudgetTahunan extends Component { ...@@ -683,6 +684,8 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID} submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })} onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
getReport={this.getReport.bind(this)}
getReportAttachment={this.getReportAttachment.bind(this)}
/> />
)} )}
{this.state.visibleFAM && ( {this.state.visibleFAM && (
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 3aa796cb
This diff is collapsed.
src/container/DocumentManagement/AuditTahunan.js
View file @ 3aa796cb
...@@ -9,6 +9,7 @@ import ReactTooltip from 'react-tooltip'; ...@@ -9,6 +9,7 @@ import ReactTooltip from 'react-tooltip';
import PopUpDelete from "./PopUpDelete"; import PopUpDelete from "./PopUpDelete";
import api from '../../api'; import api from '../../api';
import CreateManagementDoc from './CreateManagementDoc'; import CreateManagementDoc from './CreateManagementDoc';
import EditManagementDoc from './EditManagementDoc';
var ct = require("../../library/CustomTable"); var ct = require("../../library/CustomTable");
...@@ -24,6 +25,7 @@ export default class AuditTahunan extends Component { ...@@ -24,6 +25,7 @@ export default class AuditTahunan extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleCreate: false, visibleCreate: false,
visibleEdit: false,
refresh: '', refresh: '',
alert: false, alert: false,
popupDel: false, popupDel: false,
...@@ -122,7 +124,11 @@ export default class AuditTahunan extends Component { ...@@ -122,7 +124,11 @@ export default class AuditTahunan extends Component {
}) })
} }
if (type === 'edit') { if (type === 'edit') {
alert("edit") this.setState({
id: this.state.docId[val],
rowData: index,
visibleEdit: true
})
} }
} }
...@@ -153,7 +159,33 @@ export default class AuditTahunan extends Component { ...@@ -153,7 +159,33 @@ export default class AuditTahunan extends Component {
} }
}) })
} }
updateDocument(payload) {
api.create().updateDocument(payload).then(response => {
console.log(response)
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
this.getData()
this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleEdit: false })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
closeAlert() { closeAlert() {
this.setState({ alert: false }) this.setState({ alert: false })
...@@ -252,6 +284,15 @@ export default class AuditTahunan extends Component { ...@@ -252,6 +284,15 @@ export default class AuditTahunan extends Component {
deleteDoc={this.deleteDoc.bind(this)} deleteDoc={this.deleteDoc.bind(this)}
/> />
)} )}
{this.state.visibleEdit && (
<EditManagementDoc
type={"edit"}
onClickClose={() => this.setState({ visibleEdit: false })}
data={this.state.rowData}
idoc={this.state.id}
updateDocument={this.updateDocument.bind(this)}
/>
)}
</div> </div>
) )
} }
......
src/container/DocumentManagement/BOD.js
View file @ 3aa796cb
...@@ -9,6 +9,7 @@ import Images from '../../assets/Images'; ...@@ -9,6 +9,7 @@ import Images from '../../assets/Images';
import ReactTooltip from 'react-tooltip'; import ReactTooltip from 'react-tooltip';
import PopUpDelete from "./PopUpDelete"; import PopUpDelete from "./PopUpDelete";
import CreateManagementDoc from './CreateManagementDoc'; import CreateManagementDoc from './CreateManagementDoc';
import EditManagementDoc from './EditManagementDoc';
var ct = require("../../library/CustomTable"); var ct = require("../../library/CustomTable");
...@@ -24,6 +25,7 @@ export default class BOD extends Component { ...@@ -24,6 +25,7 @@ export default class BOD extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleCreate: false, visibleCreate: false,
visibleEdit: false,
refresh: '', refresh: '',
alert: false, alert: false,
popupDel: false, popupDel: false,
...@@ -125,10 +127,41 @@ export default class BOD extends Component { ...@@ -125,10 +127,41 @@ export default class BOD extends Component {
}) })
} }
if (type === 'edit') { if (type === 'edit') {
alert("edit") this.setState({
id: this.state.docId[val],
rowData: index,
visibleEdit: true
})
} }
} }
updateDocument(payload) {
api.create().updateDocument(payload).then(response => {
console.log(response)
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
this.getData()
this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleEdit: false })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
closeAlert() { closeAlert() {
this.setState({ alert: false }) this.setState({ alert: false })
} }
...@@ -255,6 +288,15 @@ export default class BOD extends Component { ...@@ -255,6 +288,15 @@ export default class BOD extends Component {
deleteDoc={this.deleteDoc.bind(this)} deleteDoc={this.deleteDoc.bind(this)}
/> />
)} )}
{this.state.visibleEdit && (
<EditManagementDoc
type={"edit"}
onClickClose={() => this.setState({ visibleEdit: false })}
data={this.state.rowData}
idoc={this.state.id}
updateDocument={this.updateDocument.bind(this)}
/>
)}
</div> </div>
) )
} }
......
src/container/DocumentManagement/DocumentManagement.js
View file @ 3aa796cb
...@@ -186,14 +186,21 @@ export default class DocumentManagement extends Component { ...@@ -186,14 +186,21 @@ export default class DocumentManagement extends Component {
</div> </div>
<div style={{ padding: 20 }}> <div style={{ padding: 20 }}>
<Paper style={{ padding: 20 }}> <Paper style={{ padding: 20 }}>
<div style={{ display: 'grid', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<button {this.state.btncreate && <span>
type="button" <a data-tip={'Add'} data-for="add">
onClick={() => this.setState({ visibleCreate: true, refresh: '' })} <div style={{ display: 'grid', justifyContent: 'flex-end' }}>
style={{ marginRight: 25, background: 'transparent' }} <button
> type="button"
<img src={Images.add} /> onClick={() => this.setState({ visibleCreate: true, refresh: '' })}
</button> style={{ marginRight: 25, background: 'transparent' }}
>
<img src={Images.add} />
</button>
</div>
</a>
<ReactTooltip border={true} id="add" place="bottom" type="light" effect="solid" />
</span>}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Tabs <Tabs
...@@ -275,7 +282,6 @@ export default class DocumentManagement extends Component { ...@@ -275,7 +282,6 @@ export default class DocumentManagement extends Component {
// getDataDocument={this.getDataDocument.bind(this)} // getDataDocument={this.getDataDocument.bind(this)}
createDocument={this.createDocument.bind(this)} createDocument={this.createDocument.bind(this)}
setting_id={this.state.id} setting_id={this.state.id}
btncreate={this.state.btncreate}
/> />
)} )}
</div> </div>
......
src/container/DocumentManagement/EditManagementDoc.js
View file @ 3aa796cb
import React, { Component } from 'react' import React, { Component } from 'react'
import Images from '../../assets/Images' import Images from '../../assets/Images'
import { TextField, withStyles, Snackbar } from '@material-ui/core' import { TextField, withStyles, Snackbar, Typography } from '@material-ui/core'
import MuiAlert from '@material-ui/lab/Alert'; import MuiAlert from '@material-ui/lab/Alert';
import api from '../../api' import api from '../../api'
import Autocomplete from '@material-ui/lab/Autocomplete' import Autocomplete from '@material-ui/lab/Autocomplete'
...@@ -61,11 +61,11 @@ export default class EditManagementDoc extends Component { ...@@ -61,11 +61,11 @@ export default class EditManagementDoc extends Component {
categoryId: data.setting_id, categoryId: data.setting_id,
categoryName: data.values, categoryName: data.values,
period: data.document_periode, period: data.document_periode,
description: data.description description: data.description,
// id: data.approval_matrix_id, // id: data.approval_matrix_id,
// status: data.status, // status: data.status,
// created: data.created, created: data.created,
// updated: data.updated === null ? "" : data.updated updated: data.updated === null ? "" : data.updated
}, () => { }, () => {
this.getDataCompany() this.getDataCompany()
this.getDataDocument() this.getDataDocument()
...@@ -225,8 +225,9 @@ export default class EditManagementDoc extends Component { ...@@ -225,8 +225,9 @@ export default class EditManagementDoc extends Component {
formData.append("documentPeriode", this.state.periode.periode); formData.append("documentPeriode", this.state.periode.periode);
formData.append("description", this.state.description); formData.append("description", this.state.description);
formData.append("extension", this.state.fileType); formData.append("extension", this.state.fileType);
formData.append("documentId", this.props.idoc);
this.setState({ formData }, ()=> { this.setState({ formData }, ()=> {
this.props.createDocument(this.state.formData, this.props.setting_id) this.props.updateDocument(this.state.formData)
}) })
} }
} }
...@@ -368,6 +369,16 @@ export default class EditManagementDoc extends Component { ...@@ -368,6 +369,16 @@ export default class EditManagementDoc extends Component {
> >
</TextField> </TextField>
</div> </div>
<div className="margin-top-10px" style={{ paddingLeft: 30, paddingRight: 30, borderRadius: 5, paddingBottom: 20 }}>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>Created By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
</div>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '12%' }}>Updated By</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated == - null ? "" : this.state.updated}</Typography>
</div>
</div>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}> <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="column-1" style={{ alignSelf: 'center' }}> <div className="column-1" style={{ alignSelf: 'center' }}>
<button <button
......
src/container/DocumentManagement/ManualBookTia.js
View file @ 3aa796cb
...@@ -161,6 +161,33 @@ export default class ManualBookTia extends Component { ...@@ -161,6 +161,33 @@ export default class ManualBookTia extends Component {
}) })
} }
updateDocument(payload) {
api.create().updateDocument(payload).then(response => {
console.log(response)
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
this.getData()
this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleEdit: false })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
render() { render() {
let columns = [{ let columns = [{
name: "Action", name: "Action",
...@@ -260,7 +287,7 @@ export default class ManualBookTia extends Component { ...@@ -260,7 +287,7 @@ export default class ManualBookTia extends Component {
onClickClose={() => this.setState({ visibleEdit: false })} onClickClose={() => this.setState({ visibleEdit: false })}
data={this.state.rowData} data={this.state.rowData}
idoc={this.state.id} idoc={this.state.id}
// updateAM={this.updateAM.bind(this)} updateDocument={this.updateDocument.bind(this)}
/> />
)} )}
</div> </div>
......
src/container/DocumentManagement/QReview.js
View file @ 3aa796cb
...@@ -9,6 +9,7 @@ import ReactTooltip from 'react-tooltip'; ...@@ -9,6 +9,7 @@ import ReactTooltip from 'react-tooltip';
import api from '../../api'; import api from '../../api';
import PopUpDelete from "./PopUpDelete"; import PopUpDelete from "./PopUpDelete";
import CreateManagementDoc from './CreateManagementDoc'; import CreateManagementDoc from './CreateManagementDoc';
import EditManagementDoc from './EditManagementDoc';
var ct = require("../../library/CustomTable"); var ct = require("../../library/CustomTable");
...@@ -24,6 +25,7 @@ export default class QReview extends Component { ...@@ -24,6 +25,7 @@ export default class QReview extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleCreate: false, visibleCreate: false,
visibleEdit: false,
refresh: '', refresh: '',
alert: false, alert: false,
popupDel: false, popupDel: false,
...@@ -121,7 +123,11 @@ export default class QReview extends Component { ...@@ -121,7 +123,11 @@ export default class QReview extends Component {
}) })
} }
if (type === 'edit') { if (type === 'edit') {
alert("edit") this.setState({
id: this.state.docId[val],
rowData: index,
visibleEdit: true
})
} }
} }
...@@ -157,6 +163,33 @@ export default class QReview extends Component { ...@@ -157,6 +163,33 @@ export default class QReview extends Component {
}) })
} }
updateDocument(payload) {
api.create().updateDocument(payload).then(response => {
console.log(response)
if (response.data) {
if (response.ok) {
if (response.data.status === "success") {
this.getData()
this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleEdit: false })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
render() { render() {
let columns = [{ let columns = [{
name: "Action", name: "Action",
...@@ -247,6 +280,15 @@ export default class QReview extends Component { ...@@ -247,6 +280,15 @@ export default class QReview extends Component {
deleteDoc={this.deleteDoc.bind(this)} deleteDoc={this.deleteDoc.bind(this)}
/> />
)} )}
{this.state.visibleEdit && (
<EditManagementDoc
type={"edit"}
onClickClose={() => this.setState({ visibleEdit: false })}
data={this.state.rowData}
idoc={this.state.id}
updateDocument={this.updateDocument.bind(this)}
/>
)}
</div> </div>
) )
} }
......
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