Skip to content

T
Tia-dev
Commit bb2541b4 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

parents 88be97c6 5339593b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1552 additions and 703 deletions
src/api/index.js
View file @ bb2541b4
...@@ -271,6 +271,7 @@ const create = (type = "") => { ...@@ -271,6 +271,7 @@ const create = (type = "") => {
const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body) const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body)
const deleteAttachmentMonthly = (id) => api.post(`transaction/monthly_report/delete_attachment/${id}`) const deleteAttachmentMonthly = (id) => api.post(`transaction/monthly_report/delete_attachment/${id}`)
const createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body) const createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body)
const createMonthlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/create_monthly_report', body)
const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body) const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
const createMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/create_monthly_report', body) const createMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/create_monthly_report', body)
const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body) const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body)
...@@ -419,6 +420,7 @@ const create = (type = "") => { ...@@ -419,6 +420,7 @@ const create = (type = "") => {
deleteDocument, deleteDocument,
createSubmitReport, createSubmitReport,
createMonthlyReportBS, createMonthlyReportBS,
createMonthlyReportLOCF,
createMonthlyReportTP, createMonthlyReportTP,
createMonthlyReportPL, createMonthlyReportPL,
createMonthlyReportFAM, createMonthlyReportFAM,
......
src/container/MonthlyReport.js
View file @ bb2541b4
...@@ -1159,6 +1159,7 @@ export default class MonthlyReport extends Component { ...@@ -1159,6 +1159,7 @@ export default class MonthlyReport extends Component {
onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })} onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
btnCreate={this.state.btnCreate} btnCreate={this.state.btnCreate}
loadview={this.state.loadview} loadview={this.state.loadview}
isApprover={this.state.isApprover}
// getReport={this.getCompanyActive.bind(this)} // getReport={this.getCompanyActive.bind(this)}
/> />
)} )}
...@@ -1175,6 +1176,7 @@ export default class MonthlyReport extends Component { ...@@ -1175,6 +1176,7 @@ export default class MonthlyReport extends Component {
month={this.state.month} month={this.state.month}
saveToMonthlyReport={this.saveToMonthlyReport.bind(this)} saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })} onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })}
isApprover={this.state.isApprover}
/> />
)} )}
{this.state.visibleCAT && ( {this.state.visibleCAT && (
......
src/container/MonthlyReport/BalanceSheetMR.js
View file @ bb2541b4
...@@ -360,7 +360,7 @@ export default class BalanceSheetMR extends Component { ...@@ -360,7 +360,7 @@ export default class BalanceSheetMR extends Component {
}) })
}) })
let body = { let body = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -415,7 +415,7 @@ export default class BalanceSheetMR extends Component { ...@@ -415,7 +415,7 @@ export default class BalanceSheetMR extends Component {
}) })
}) })
let payload = { let payload = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -434,10 +434,7 @@ export default class BalanceSheetMR extends Component { ...@@ -434,10 +434,7 @@ export default class BalanceSheetMR extends Component {
}) })
} }
} else { } else {
this.setState({ loading: false }, () => { this.setState({ loading: false })
this.getSubmission()
document.body.style.overflow = 'unset';
})
} }
}) })
} }
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ bb2541b4
...@@ -45,7 +45,8 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -45,7 +45,8 @@ export default class FixedAssetsMovementMR extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
loading: true, loading: true,
visibleFAMMR: true visibleFAMMR: true,
updateBy: '-'
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
} }
...@@ -96,8 +97,8 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -96,8 +97,8 @@ export default class FixedAssetsMovementMR extends Component {
"months": this.props.month.month_id "months": this.props.month.month_id
} }
api.create().getHierarkiMontlyReportFAM(payload).then(response => { api.create().getHierarkiMontlyReportFAM(payload).then(response => {
console.log(payload); // console.log(payload);
console.log(response); // console.log(response);
let dataTable = [] let dataTable = []
if (response.data) { if (response.data) {
if (response.data.status === 'success') { if (response.data.status === 'success') {
...@@ -311,7 +312,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -311,7 +312,7 @@ export default class FixedAssetsMovementMR extends Component {
}) })
}) })
let body = { let body = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -321,7 +322,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -321,7 +322,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
console.log(data); console.log(data);
api.create('UPLOAD').uploadMonthlyReportFAM(body).then(response => { api.create('UPLOAD').uploadMonthlyReportFAM(body).then(response => {
console.log(response); // console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.props.onClickClose() this.props.onClickClose()
...@@ -344,7 +345,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -344,7 +345,7 @@ export default class FixedAssetsMovementMR extends Component {
backToMonthlyReport(type) { backToMonthlyReport(type) {
this.setState({ loading: true }) this.setState({ loading: true })
console.log(this.state.dataTable); // console.log(this.state.dataTable);
let data = [] let data = []
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
...@@ -362,7 +363,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -362,7 +363,7 @@ export default class FixedAssetsMovementMR extends Component {
}) })
}) })
let payload = { let payload = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -373,7 +374,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -373,7 +374,7 @@ export default class FixedAssetsMovementMR extends Component {
// console.log(JSON.stringify(payload)); // console.log(JSON.stringify(payload));
api.create('UPLOAD').createMonthlyReportFAM(payload).then(response => { api.create('UPLOAD').createMonthlyReportFAM(payload).then(response => {
console.log(response); // console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.props.saveToMonthlyReport() this.props.saveToMonthlyReport()
...@@ -862,10 +863,11 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -862,10 +863,11 @@ export default class FixedAssetsMovementMR extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ color: this.props.isApprover ? 'black' : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={false} disabled={this.props.isApprover}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]).toFixed(1)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 8) handleChange(event.target.value, tableMeta, 8)
...@@ -1262,6 +1264,28 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1262,6 +1264,28 @@ export default class FixedAssetsMovementMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
{this.props.isApprover === true ?
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download'} data-for="download">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
margin: 5
}}
onClick={() =>
this.setState({ loading: true }, () => {
setTimeout(() => {
this.downloadAllData()
}, 100);
})}
>
<img src={Images.download} />
</button>
</a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
</div> :
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template"> <a data-tip={'Download Template'} data-for="template">
<button <button
...@@ -1311,6 +1335,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1311,6 +1335,7 @@ export default class FixedAssetsMovementMR extends Component {
</a> </a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
</div> </div>
}
</div> </div>
</div> </div>
...@@ -1348,8 +1373,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1348,8 +1373,9 @@ export default class FixedAssetsMovementMR extends Component {
</div> </div>
</button> </button>
</div> </div>
{/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null : {this.props.isApprover === true ?
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === "draft" || this.props.status === 'submitted') ? */} <div className="col-2"></div>
:
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}> <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button <button
className="button" className="button"
...@@ -1420,8 +1446,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1420,8 +1446,7 @@ export default class FixedAssetsMovementMR extends Component {
</div> </div>
</button> </button>
</div> </div>
{/* : null }
} */}
</div> </div>
</Paper> : </Paper> :
<Paper style={{ paddingTop: 10 }}> <Paper style={{ paddingTop: 10 }}>
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ bb2541b4
This source diff could not be displayed because it is too large. You can view the blob instead.
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