Skip to content

T
Tia-dev
Commit 958ac199 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents dc2cbc4b fdf781c9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 259 deletions
src/container/Laporan/SubHolding.js
View file @ 958ac199
......@@ -34,7 +34,7 @@ export default class SubHolding extends Component {
{ value: 4, label: 'DB Ratio' },
{ value: 5, label: 'DB Tax Planning' },
{ value: 21, label: 'DB Operating Indicator' },
{ value: 6, label: 'Cash FLow - Summary' },
{ value: 6, label: 'Cash Flow - Summary' },
{ value: 7, label: 'Balance Sheet - Summary' },
{ value: 8, label: 'Profit Loss - Summary' },
{ value: 9, label: 'financial Ratio - Summary' },
......@@ -1866,86 +1866,6 @@ export default class SubHolding extends Component {
})
}
getTaxPlanMR(payload) {
api.create().getReportTPMR(payload).then(response => {
console.log(payload);
console.log(response);
let dataTable = this.state.dataTable
console.log(dataTable)
let dataTable2 = []
if (response.data) {
let res = response.data.data
res.map((item, index) => {
let indexID = dataTable.findIndex((val) => val[4] == item.id)
if (indexID != -1) {
const handlePushChild = (items) => {
let indexIDzz = dataTable.findIndex((val) => val[4] === items.id)
// console.log(indexIDzz)
if (indexIDzz != -1) {
dataTable2.push([...dataTable[indexIDzz],
Number(items.tax_planning_report.january).toFixed(1),
Number(items.tax_planning_report.february).toFixed(1),
Number(items.tax_planning_report.march).toFixed(1),
Number(items.tax_planning_report.april).toFixed(1),
Number(items.tax_planning_report.may).toFixed(1),
Number(items.tax_planning_report.june).toFixed(1),
Number(items.tax_planning_report.july).toFixed(1),
Number(items.tax_planning_report.august).toFixed(1),
Number(items.tax_planning_report.september).toFixed(1),
Number(items.tax_planning_report.october).toFixed(1),
Number(items.tax_planning_report.november).toFixed(1),
Number(items.tax_planning_report.december).toFixed(1),
Number(items.tax_planning_report.total_actual_before).toFixed(1),
])
}
if (items.children !== null) {
if (items.children.length > 0) {
items.children.map((itemss, indexss) => {
handlePushChild(itemss)
})
}
}
}
dataTable2.push([...dataTable[indexID],
Number(item.tax_planning_report.january).toFixed(1),
Number(item.tax_planning_report.february).toFixed(1),
Number(item.tax_planning_report.march).toFixed(1),
Number(item.tax_planning_report.april).toFixed(1),
Number(item.tax_planning_report.may).toFixed(1),
Number(item.tax_planning_report.june).toFixed(1),
Number(item.tax_planning_report.july).toFixed(1),
Number(item.tax_planning_report.august).toFixed(1),
Number(item.tax_planning_report.september).toFixed(1),
Number(item.tax_planning_report.october).toFixed(1),
Number(item.tax_planning_report.november).toFixed(1),
Number(item.tax_planning_report.december).toFixed(1),
Number(item.tax_planning_report.total_actual_before).toFixed(1),
])
if (item.children !== null) {
if (item.children.length > 0) {
item.children.map((items, indexs) => {
handlePushChild(items)
})
}
}
}
})
console.log(dataTable2)
this.setState({ dataTable: dataTable2, previewTable: true, loading: false, previewDownload: true })
// this.setState({ dataTable2 }, () => {
// // console.log(this.state.dataTable2)
// this.getTaxPlanLastMR(payloadLast)
// })
} else {
this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
}
})
}
getReportPLMR(payload) {
let payloadLast = {
"report_id": this.state.report.value,
......@@ -2484,7 +2404,7 @@ export default class SubHolding extends Component {
this.getReportType()
})}
disableClearable
style={{ width: 250, marginLeft: 10 }}
style={{ width: 250 }}
renderInput={(params) => <TextField {...params} label="Months" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.month}
/>
......
src/container/MonthlyReport.js
View file @ 958ac199
......@@ -1079,7 +1079,7 @@ export default class MonthlyReport extends Component {
}
})
console.log(dataTable)
this.setState({ dbCF: dataTable, loading: false }, () => {
this.setState({ dbCF: dataTable }, () => {
this.olahDataCashFlow(this.state.dbCF, type)
})
}
......@@ -1797,7 +1797,7 @@ export default class MonthlyReport extends Component {
getOptionLabel={(option) => option.name}
style={{ width: 250 }}
onChange={(event, newInputValue) => {
this.setState({selectedStatus: newInputValue}, () => {
this.setState({selectedStatus: newInputValue, loading: true}, () => {
console.log(newInputValue);
this.getCompanySubmitted()
})
......@@ -1823,7 +1823,7 @@ export default class MonthlyReport extends Component {
{...this.state.listCompany}
id="company"
disabled={this.state.listCompany === null ? true : false}
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true }, () => {
this.getMonthlyReportID()
})}
disableClearable
......
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 958ac199
......@@ -289,7 +289,7 @@ export default class BalanceSheetMR extends Component {
downloadTemplate = async () => {
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&months=${this.props.month.month_id}`
)
res = await res.blob()
// console.log(res)
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 958ac199
......@@ -232,7 +232,7 @@ export default class FixedAssetsMovementMR extends Component {
downloadTemplate = async () => {
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/fam/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/fam/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&months=${this.props.month.month_id}`
)
res = await res.blob()
console.log(res);
......
src/container/SummaryTriputra/TableSummaryTriputra.js
View file @ 958ac199
......@@ -920,7 +920,7 @@ export default class TableSummaryTriputra extends Component {
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<span>{"2019"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"2020"}</span>
</div>
{/* <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
......@@ -1049,7 +1049,7 @@ export default class TableSummaryTriputra extends Component {
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<span>{"2019"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"2020"}</span>
</div>
{/* <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
......@@ -1178,7 +1178,7 @@ export default class TableSummaryTriputra extends Component {
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<span>{"2019"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"2020"}</span>
</div>
{/* <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
......@@ -1307,7 +1307,7 @@ export default class TableSummaryTriputra extends Component {
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<span>{"2019"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"2020"}</span>
</div>
{/* <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
......@@ -1436,7 +1436,7 @@ export default class TableSummaryTriputra extends Component {
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<span>{"2019"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"2020"}</span>
</div>
{/* <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
......@@ -1565,7 +1565,7 @@ export default class TableSummaryTriputra extends Component {
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<span>{"2019"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid" }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"2020"}</span>
</div>
{/* <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
......
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