Skip to content

T
Tia-dev
Commit ed486934 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 91e17fa4 02c8577f
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
src/container/Laporan/SubHolding.js
View file @ ed486934
...@@ -1336,10 +1336,11 @@ export default class SubHolding extends Component { ...@@ -1336,10 +1336,11 @@ export default class SubHolding extends Component {
let res = response.data.data let res = response.data.data
console.log(res) console.log(res)
const handlePushChild = (item) => { const handlePushChild = (item) => {
let indexIDzz = dbSumaCF.findIndex((val) => val[1] === item.id) let indexIDzz = dbSumaCF.findIndex((val) => val[0] === item.id)
if (indexIDzz === -1) { if (indexIDzz === -1) {
let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : Number(item.cash_flow.mtd_actual) let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : Number(item.cash_flow.mtd_actual)
let mtd = item.cash_flow.mtd == '' ? 0 : Number(item.cash_flow.mtd) let mtd = item.cash_flow.mtd == '' ? 0 : Number(item.cash_flow.mtd)
console.log(mtd)
// let persenMtd = Number(mtd_actual / mtd) // let persenMtd = Number(mtd_actual / mtd)
let persenMtd = 0 let persenMtd = 0
if (mtd < 0) { if (mtd < 0) {
...@@ -1369,8 +1370,8 @@ export default class SubHolding extends Component { ...@@ -1369,8 +1370,8 @@ export default class SubHolding extends Component {
persenYtd = Number(ytd_actual/ytd) persenYtd = Number(ytd_actual/ytd)
} }
let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : Number(item.cash_flow.quarter_actual)
let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter let quarter = item.cash_flow.quarter == '' ? 0 : Number(item.cash_flow.quarter)
// let persenQuarter = Number(quarter_actual / quarter) // let persenQuarter = Number(quarter_actual / quarter)
let persenQuarter = 0 let persenQuarter = 0
if (quarter < 0) { if (quarter < 0) {
...@@ -1384,8 +1385,8 @@ export default class SubHolding extends Component { ...@@ -1384,8 +1385,8 @@ export default class SubHolding extends Component {
persenQuarter = quarter_actual / quarter persenQuarter = quarter_actual / quarter
} }
let fy_actual = item.cash_flow.fy_actual == '' ? 0 : item.cash_flow.fy_actual let fy_actual = item.cash_flow.fy_actual == '' ? 0 : Number(item.cash_flow.fy_actual)
let fy = item.cash_flow.fy == '' ? 0 : item.cash_flow.fy let fy = item.cash_flow.fy == '' ? 0 : Number(item.cash_flow.fy)
// let persenFy = Number(fy_actual / fy) // let persenFy = Number(fy_actual / fy)
let persenFy = 0 let persenFy = 0
if (fy < 0) { if (fy < 0) {
...@@ -1431,8 +1432,9 @@ export default class SubHolding extends Component { ...@@ -1431,8 +1432,9 @@ export default class SubHolding extends Component {
} }
} }
res.map((item, index) => { res.map((item, index) => {
let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : item.cash_flow.mtd_actual let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : Number(item.cash_flow.mtd_actual)
let mtd = item.cash_flow.mtd == '' ? 0 : item.cash_flow.mtd let mtd = item.cash_flow.mtd == '' ? 0 : Number(item.cash_flow.mtd)
console.log(mtd)
// let persenMtd = Number(mtd_actual / mtd) // let persenMtd = Number(mtd_actual / mtd)
let persenMtd = 0 let persenMtd = 0
if (mtd < 0) { if (mtd < 0) {
...@@ -1461,8 +1463,8 @@ export default class SubHolding extends Component { ...@@ -1461,8 +1463,8 @@ export default class SubHolding extends Component {
persenYtd = Number(ytd_actual/ytd) persenYtd = Number(ytd_actual/ytd)
} }
let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : Number(item.cash_flow.quarter_actual)
let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter let quarter = item.cash_flow.quarter == '' ? 0 : Number(item.cash_flow.quarter)
// let persenQuarter = Number(quarter_actual / quarter) // let persenQuarter = Number(quarter_actual / quarter)
let persenQuarter = 0 let persenQuarter = 0
if (quarter < 0) { if (quarter < 0) {
...@@ -1476,8 +1478,8 @@ export default class SubHolding extends Component { ...@@ -1476,8 +1478,8 @@ export default class SubHolding extends Component {
persenQuarter = quarter_actual / quarter persenQuarter = quarter_actual / quarter
} }
let fy_actual = item.cash_flow.fy_actual == '' ? 0 : item.cash_flow.fy_actual let fy_actual = item.cash_flow.fy_actual == '' ? 0 : Number(item.cash_flow.fy_actual)
let fy = item.cash_flow.fy == '' ? 0 : item.cash_flow.fy let fy = item.cash_flow.fy == '' ? 0 : Number(item.cash_flow.fy)
// let persenFy = Number(fy_actual / fy) // let persenFy = Number(fy_actual / fy)
let persenFy = 0 let persenFy = 0
if (fy < 0) { if (fy < 0) {
...@@ -2548,6 +2550,7 @@ export default class SubHolding extends Component { ...@@ -2548,6 +2550,7 @@ export default class SubHolding extends Component {
} }
}) })
console.log(dbSumaCF)
console.log(dataTable3) console.log(dataTable3)
this.setState({ dataTable: dataTable3, previewTable: true, loading: false, previewDownload: true }) this.setState({ dataTable: dataTable3, previewTable: true, loading: false, previewDownload: true })
} else { } else {
...@@ -3026,6 +3029,8 @@ export default class SubHolding extends Component { ...@@ -3026,6 +3029,8 @@ export default class SubHolding extends Component {
a.click(); a.click();
} }
} else if (this.state.report.value === 6) { } else if (this.state.report.value === 6) {
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
console.log(url);
let res = await fetch( let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1` `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_cash_flow/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=6&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
) )
......
src/container/Laporan/TableSubHolding.js
View file @ ed486934
...@@ -9386,7 +9386,7 @@ export default class TableSubHolding extends Component { ...@@ -9386,7 +9386,7 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
...@@ -9519,7 +9519,7 @@ export default class TableSubHolding extends Component { ...@@ -9519,7 +9519,7 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
...@@ -9653,7 +9653,7 @@ export default class TableSubHolding extends Component { ...@@ -9653,7 +9653,7 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
...@@ -9786,7 +9786,7 @@ export default class TableSubHolding extends Component { ...@@ -9786,7 +9786,7 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
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