Skip to content

T
Tia-dev
Commit 31628d6e authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'GGMAC' into 'master' 

update euy

See merge request !1193
parents 74de00e5 d9f85fb3
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 26 deletions
src/container/BudgetTahunan.js
View file @ 31628d6e
...@@ -538,7 +538,7 @@ export default class BudgetTahunan extends Component { ...@@ -538,7 +538,7 @@ export default class BudgetTahunan extends Component {
this.getCashFlow(type) this.getCashFlow(type)
this.getPL(type) this.getPL(type)
} }
this.getFR(type) // this.getFR(type)
api.create().checkApprover().then(response => { api.create().checkApprover().then(response => {
// // console.log(this.state.btncreate); // // console.log(this.state.btncreate);
// // console.log(this.state.btnedit) // // console.log(this.state.btnedit)
...@@ -1066,12 +1066,12 @@ export default class BudgetTahunan extends Component { ...@@ -1066,12 +1066,12 @@ export default class BudgetTahunan extends Component {
// if (this.state.submissionID != null) { // if (this.state.submissionID != null) {
// this.createCashFlow() // this.createCashFlow()
// } // }
if (type != undefined) { // if (type != undefined) {
if (type == 'BS' || type == 'FAM' || type == 'PL') { // if (type == 'BS' || type == 'FAM' || type == 'PL') {
console.log('tarik sis') console.log('tarik sis')
this.createCashFlow() this.createCashFlow()
} // }
} // }
}) })
} }
...@@ -1563,12 +1563,12 @@ export default class BudgetTahunan extends Component { ...@@ -1563,12 +1563,12 @@ export default class BudgetTahunan extends Component {
// if (this.state.submissionID != null) { // if (this.state.submissionID != null) {
// this.createDBPL() // this.createDBPL()
// } // }
if (type != undefined) { // if (type != undefined) {
if (type == 'PL') { // if (type == 'PL') {
console.log('tarik sis') console.log('tarik sis')
this.createDBPL() this.createDBPL()
} // }
} // }
}) })
} }
......
src/container/Laporan/DashboardFinancial.js
View file @ 31628d6e
...@@ -11,6 +11,7 @@ import Constant from '../../library/Constant'; ...@@ -11,6 +11,7 @@ import Constant from '../../library/Constant';
import { format } from 'date-fns'; import { format } from 'date-fns';
import { PropagateLoader } from 'react-spinners'; import { PropagateLoader } from 'react-spinners';
import ReactECharts from 'echarts-for-react'; import ReactECharts from 'echarts-for-react';
import { FormatListNumberedRtlOutlined } from '@material-ui/icons';
const Alert = withStyles({ const Alert = withStyles({
})((props) => <MuiAlert elevation={6} variant="filled" {...props} />); })((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
...@@ -64,16 +65,19 @@ export default class DashboardFinancial extends React.Component { ...@@ -64,16 +65,19 @@ export default class DashboardFinancial extends React.Component {
mrRev: [], mrRev: [],
minRev: 0, minRev: 0,
maxRev: 0, maxRev: 0,
intervalRev: 0,
companyTPAT: [], companyTPAT: [],
mbTPAT: [], mbTPAT: [],
mrTPAT: [], mrTPAT: [],
minTPAT: 0, minTPAT: 0,
maxTPAT: 0, maxTPAT: 0,
intervalTPAT: 0,
companyEBITDA: [], companyEBITDA: [],
mbEBITDA: [], mbEBITDA: [],
mrEBITDA: [], mrEBITDA: [],
minEBITDA: 0, minEBITDA: 0,
maxEBITDA: 0, maxEBITDA: 0,
intervalEBITDA: 0,
data: [ data: [
], ],
}; };
...@@ -394,18 +398,21 @@ export default class DashboardFinancial extends React.Component { ...@@ -394,18 +398,21 @@ export default class DashboardFinancial extends React.Component {
let mrRev = [] let mrRev = []
let maxRev = response.revenue.vertical_pointing[0] let maxRev = response.revenue.vertical_pointing[0]
let minRev = response.revenue.vertical_pointing[1] let minRev = response.revenue.vertical_pointing[1]
let intervalRev = Number(response.revenue.interval)
let companyTPAT = [] let companyTPAT = []
let mbTPAT = [] let mbTPAT = []
let mrTPAT = [] let mrTPAT = []
let maxTPAT = response.tpat.vertical_pointing[0] let maxTPAT = response.tpat.vertical_pointing[0]
let minTPAT = response.tpat.vertical_pointing[1] let minTPAT = response.tpat.vertical_pointing[1]
let intervalTPAT = Number(response.tpat.interval)
let companyEBITDA = [] let companyEBITDA = []
let mbEBITDA = [] let mbEBITDA = []
let mrEBITDA = [] let mrEBITDA = []
let maxEBITDA = response.ebitda.vertical_pointing[0] let maxEBITDA = response.ebitda.vertical_pointing[0]
let minEBITDA = response.ebitda.vertical_pointing[1] let minEBITDA = response.ebitda.vertical_pointing[1]
let intervalEBITDA = Number(response.ebitda.interval)
response.revenue.nodes.map((item,index) => { response.revenue.nodes.map((item,index) => {
if (this.state.report.value == 'summary') { if (this.state.report.value == 'summary') {
...@@ -452,11 +459,10 @@ export default class DashboardFinancial extends React.Component { ...@@ -452,11 +459,10 @@ export default class DashboardFinancial extends React.Component {
"MBColor": "hsl(212, 64%, 46%)", "MBColor": "hsl(212, 64%, 46%)",
"MR": item.value_mr, "MR": item.value_mr,
"MRColor": "hsl(212, 78%, 62%)", "MRColor": "hsl(212, 78%, 62%)",
}) })
}) })
} }
this.setState({companyRev, mbRev, mrRev, minRev, maxRev, companyTPAT, mbTPAT, mrTPAT, minTPAT, maxTPAT, companyEBITDA, mbEBITDA, mrEBITDA, minEBITDA, maxEBITDA}, () => { this.setState({companyRev, mbRev, mrRev, minRev, maxRev, intervalRev, companyTPAT, mbTPAT, mrTPAT, minTPAT, maxTPAT, intervalTPAT, companyEBITDA, mbEBITDA, mrEBITDA, minEBITDA, maxEBITDA, intervalEBITDA}, () => {
console.log(companyTPAT) console.log(companyTPAT)
this.setState({loading: false}) this.setState({loading: false})
}) })
...@@ -675,7 +681,7 @@ export default class DashboardFinancial extends React.Component { ...@@ -675,7 +681,7 @@ export default class DashboardFinancial extends React.Component {
name: '(Rp bn)', name: '(Rp bn)',
min: this.state.minRev, min: this.state.minRev,
max: this.state.maxRev, max: this.state.maxRev,
interval: 1000 interval: this.state.intervalRev
} }
] : ] :
[ [
...@@ -684,7 +690,7 @@ export default class DashboardFinancial extends React.Component { ...@@ -684,7 +690,7 @@ export default class DashboardFinancial extends React.Component {
name: '(Rp bn)', name: '(Rp bn)',
min: this.state.minRev, min: this.state.minRev,
max: this.state.maxRev, max: this.state.maxRev,
interval: 1000 interval: this.state.intervalRev
}, },
{ {
type: 'value', type: 'value',
...@@ -767,7 +773,7 @@ export default class DashboardFinancial extends React.Component { ...@@ -767,7 +773,7 @@ export default class DashboardFinancial extends React.Component {
name: '(Rp bn)', name: '(Rp bn)',
min: this.state.minTPAT, min: this.state.minTPAT,
max: this.state.maxTPAT, max: this.state.maxTPAT,
interval: 1000 interval: this.state.intervalTPAT
} }
] : ] :
[ [
...@@ -776,7 +782,7 @@ export default class DashboardFinancial extends React.Component { ...@@ -776,7 +782,7 @@ export default class DashboardFinancial extends React.Component {
name: '(Rp bn)', name: '(Rp bn)',
min: this.state.minTPAT, min: this.state.minTPAT,
max: this.state.maxTPAT, max: this.state.maxTPAT,
interval: 1000 interval: this.state.intervalTPAT
}, },
{ {
type: 'value', type: 'value',
...@@ -933,7 +939,7 @@ export default class DashboardFinancial extends React.Component { ...@@ -933,7 +939,7 @@ export default class DashboardFinancial extends React.Component {
name: '(Rp bn)', name: '(Rp bn)',
min: this.state.minEBITDA, min: this.state.minEBITDA,
max: this.state.maxEBITDA, max: this.state.maxEBITDA,
interval: 1000 interval: this.state.intervalEBITDA
} }
] : ] :
[ [
...@@ -942,7 +948,7 @@ export default class DashboardFinancial extends React.Component { ...@@ -942,7 +948,7 @@ export default class DashboardFinancial extends React.Component {
name: '(Rp bn)', name: '(Rp bn)',
min: this.state.minEBITDA, min: this.state.minEBITDA,
max: this.state.maxEBITDA, max: this.state.maxEBITDA,
interval: 1000 interval: this.state.intervalEBITDA
}, },
{ {
type: 'value', type: 'value',
......
src/container/MonthlyReport.js
View file @ 31628d6e
...@@ -627,7 +627,7 @@ export default class MonthlyReport extends Component { ...@@ -627,7 +627,7 @@ export default class MonthlyReport extends Component {
this.getLatestPeriodSubmit() this.getLatestPeriodSubmit()
this.getCashFlow(type) this.getCashFlow(type)
this.getPL(type) this.getPL(type)
this.getFR(type) // this.getFR(type)
// this.getReport() // this.getReport()
// this.getReportAttachment() // this.getReportAttachment()
api.create().checkApproverMonthly().then(response => { api.create().checkApproverMonthly().then(response => {
...@@ -1361,12 +1361,12 @@ export default class MonthlyReport extends Component { ...@@ -1361,12 +1361,12 @@ export default class MonthlyReport extends Component {
// console.log(listCF) // console.log(listCF)
this.setState({dbCF: listCF} , () => { this.setState({dbCF: listCF} , () => {
if (type != undefined) { // if (type != undefined) {
if (type == 'BS' || type == 'FAM' || type == 'PL') { // if (type == 'BS' || type == 'FAM' || type == 'PL') {
console.log('tarik sis') console.log('tarik sis')
this.createCashFlow() this.createCashFlow()
} // }
} // }
}) })
} }
...@@ -1785,12 +1785,12 @@ export default class MonthlyReport extends Component { ...@@ -1785,12 +1785,12 @@ export default class MonthlyReport extends Component {
console.log(listPL) console.log(listPL)
this.setState({dbPL: listPL} , () => { this.setState({dbPL: listPL} , () => {
if (type != undefined) { // if (type != undefined) {
if ( type == 'PL') { // if ( type == 'PL') {
console.log('tarik sis') console.log('tarik sis')
this.createPL() this.createPL()
} // }
} // }
}) })
} }
......
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