Skip to content

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

Merge branch 'didam' into 'master' 

Didam

See merge request !1065
parents f90b2a09 b5e2949d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 408 additions and 46 deletions
src/api/index.js
View file @ ebb784fa
...@@ -256,7 +256,7 @@ const create = (type = "") => { ...@@ -256,7 +256,7 @@ const create = (type = "") => {
const getReportFRMR = (body) => api.post('/transaction/summary_ratio/monthly_report/get_report_hierarki', body) const getReportFRMR = (body) => api.post('/transaction/summary_ratio/monthly_report/get_report_hierarki', body)
const getReportFRLastMR = (body) => api.post('/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki', body) const getReportFRLastMR = (body) => api.post('/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki', body)
const getReportBSSuma = (body) => api.post('/transaction/summary/balance_sheet/get_report_hierarki', body) const getReportBSSuma = (body) => api.post('/transaction/summary/balance_sheet/get_report_hierarki', body)
const getDashboardCAT = (body) => api.post('/dashboard/cat', body)
//CASH FLOW //CASH FLOW
const getDetailReportCF = (body) => api.post('/transaction/cash_flow/master_budget/get_report_hierarki', body) const getDetailReportCF = (body) => api.post('/transaction/cash_flow/master_budget/get_report_hierarki', body)
...@@ -621,7 +621,8 @@ const create = (type = "") => { ...@@ -621,7 +621,8 @@ const create = (type = "") => {
getReportFRMB, getReportFRMB,
getReportFRMR, getReportFRMR,
getReportFRLastMR, getReportFRLastMR,
getReportBSSuma getReportBSSuma,
getDashboardCAT
} }
} }
......
src/container/BudgetTahunan.js
View file @ ebb784fa
...@@ -1458,7 +1458,7 @@ export default class BudgetTahunan extends Component { ...@@ -1458,7 +1458,7 @@ export default class BudgetTahunan extends Component {
<span>INCOMPLETE</span> : <span>INCOMPLETE</span> :
val === "revision" ? val === "revision" ?
<span>REVISION</span> : <span>REVISION</span> :
val === "approval_proccess" ? val === "approval_process" ?
<span>APPROVAL PROCCESS</span> : <span>APPROVAL PROCCESS</span> :
val === "approval_review" ? val === "approval_review" ?
<span>APPROVAL REVIEW</span> : <span>APPROVAL REVIEW</span> :
......
src/container/Laporan/DashboardCAT.js
View file @ ebb784fa
This diff is collapsed.
src/container/Laporan/ExceutiveScoreboard.js
View file @ ebb784fa
import React, { Component } from 'react' import React, { Component } from 'react'
import ReactSpeedometer from "react-d3-speedometer" import ReactSpeedometer from "react-d3-speedometer"
import { Paper, Typography } from '@material-ui/core' import { GridList, Paper, Typography, GridListTile } from '@material-ui/core'
import Images from '../../assets/Images' import Images from '../../assets/Images'
import LineChart from 'react-linechart'; import LineChart from 'react-linechart';
...@@ -15,11 +15,83 @@ export default class ExceutiveScoreboard extends Component { ...@@ -15,11 +15,83 @@ export default class ExceutiveScoreboard extends Component {
{ judul: "Internal Perspective", kpi: 5, rank: 'C', value: 2.61, status: 'down' }, { judul: "Internal Perspective", kpi: 5, rank: 'C', value: 2.61, status: 'down' },
{ judul: "Financial", kpi: 5, rank: 'B+', value: 3.52, status: 'up' }, { judul: "Financial", kpi: 5, rank: 'B+', value: 3.52, status: 'up' },
], ],
data: this.props.data,
dataPayload: this.props.dataPayload,
selectIndex: null selectIndex: null
} }
} }
componentDidMount() {
console.log(this.props.data)
console.log(this.state.dataPayload)
let arrOverAll = []
let totalOverAll = 0
if (this.state.data.length > 0) {
this.state.data.map((item,index) => {
if(item.parent == null || item.parent == 'null') {
arrOverAll.push(item)
} else {
totalOverAll +=
this.state.dataPayload.month.month_id == 1? Number(item.month1 == null? 0 : item.month1) :
this.state.dataPayload.month.month_id == 2? Number(item.month2 == null? 0 : item.month2) :
this.state.dataPayload.month.month_id == 3? Number(item.month3 == null? 0 : item.month3) :
this.state.dataPayload.month.month_id == 4? Number(item.month4 == null? 0 : item.month4) :
this.state.dataPayload.month.month_id == 5? Number(item.month5 == null? 0 : item.month5) :
this.state.dataPayload.month.month_id == 6? Number(item.month6 == null? 0 : item.month6) :
this.state.dataPayload.month.month_id == 7? Number(item.month7 == null? 0 : item.month7) :
this.state.dataPayload.month.month_id == 8? Number(item.month8 == null? 0 : item.month8) :
this.state.dataPayload.month.month_id == 9? Number(item.month9 == null? 0 : item.month9) :
this.state.dataPayload.month.month_id == 10? Number(item.month10 == null? 0 : item.month10) :
this.state.dataPayload.month.month_id == 11? Number(item.month11 == null? 0 : item.month11) :
Number(item.month12 == null? 0 : item.month12)
}
})
let indexFinancial = arrOverAll.findIndex((val) => String(val.item_name).toLocaleLowerCase().includes('financial'))
let indexCust = arrOverAll.findIndex((val) => String(val.item_name).toLocaleLowerCase().includes('customer'))
let indexInternal = arrOverAll.findIndex((val) => String(val.item_name).toLocaleLowerCase().includes('internal'))
let indexLearn = arrOverAll.findIndex((val) => String(val.item_name).toLocaleLowerCase().includes('learn'))
let arrFinancial = []
let arrCust = []
let arrInternal = []
let arrLearn = []
console.log(indexFinancial)
console.log(indexCust)
console.log(indexInternal)
console.log(indexLearn)
if (indexFinancial != -1) {
arrFinancial = this.state.data.filter((val) => val.parent == arrOverAll[indexFinancial].item_report_id)
}
if (indexCust != -1) {
arrCust = this.state.data.filter((val) => val.parent == arrOverAll[indexCust].item_report_id)
}
if (indexInternal != -1) {
arrInternal = this.state.data.filter((val) => val.parent == arrOverAll[indexInternal].item_report_id)
}
if (indexLearn != -1) {
arrLearn = this.state.data.filter((val) => val.parent == arrOverAll[indexLearn].item_report_id)
}
console.log(totalOverAll)
console.log(arrOverAll)
console.log(arrFinancial)
console.log(arrCust)
console.log(arrInternal)
console.log(arrLearn)
}
}
render() { render() {
let { selectIndex } = this.state let { selectIndex } = this.state
let yuk = [1,2,3]
const data = [ const data = [
{ {
color: "steelblue", color: "steelblue",
...@@ -39,7 +111,7 @@ export default class ExceutiveScoreboard extends Component { ...@@ -39,7 +111,7 @@ export default class ExceutiveScoreboard extends Component {
<div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', flexFlow: 'wrap' }}> <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', flexFlow: 'wrap' }}>
{this.state.listDummy.map((item, index) => { {this.state.listDummy.map((item, index) => {
return ( return (
<div style={{ padding: 10, backgroundColor: this.state.selectIndex === index ? '#6885a6' : '#fff', borderRadius: 6, paddingBottom: 20, margin: 10, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)' }} onClick={() => this.setState({ selectIndex: index })}> <div style={{ padding: 10, backgroundColor: this.state.selectIndex === index ? '#6885a6' : '#fff', borderRadius: 6, paddingBottom: 20, margin: 10, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)' }} onClick={() => this.setState({ selectIndex: index }, () => console.log(this.state.data))}>
<span style={{ fontSize: '17px', color: this.state.selectIndex === index ? '#fff' : '#7e8085' }}>{item.judul}</span> <span style={{ fontSize: '17px', color: this.state.selectIndex === index ? '#fff' : '#7e8085' }}>{item.judul}</span>
<div style={{ backgroundColor: 'transparent', display: 'flex', marginTop: index === 0 ? 54 : 30, placeContent: 'center' }}> <div style={{ backgroundColor: 'transparent', display: 'flex', marginTop: index === 0 ? 54 : 30, placeContent: 'center' }}>
<div> <div>
...@@ -78,7 +150,11 @@ export default class ExceutiveScoreboard extends Component { ...@@ -78,7 +150,11 @@ export default class ExceutiveScoreboard extends Component {
) )
})} })}
</div> </div>
<div style={{ width: 566, height: 233, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', padding: 20, justifyContent: 'space-between', display: 'grid', margin: 10 }}> <div style={{padding: 10, marginTop: 10, display: 'flex', width: '100%' }}>
<GridList cellHeight={250} cols={3}>
{yuk.map((tile) => (
<GridListTile key={tile} cols={1} style={{}}>
<div style={{ maxWidth: 566, height: 233, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', padding: 20, marginLeft: 5, marginTop: 5, marginRight: 5, display: 'inline-grid'}}>
<div> <div>
<span style={{ fontSize: 17 }}>YTD Revenue</span> <span style={{ fontSize: 17 }}>YTD Revenue</span>
<Typography style={{ fontSize: 24, fontWeight: 'bold' }}>1,016,489.78</Typography> <Typography style={{ fontSize: 24, fontWeight: 'bold' }}>1,016,489.78</Typography>
...@@ -96,6 +172,29 @@ export default class ExceutiveScoreboard extends Component { ...@@ -96,6 +172,29 @@ export default class ExceutiveScoreboard extends Component {
hideYLabel={true} hideYLabel={true}
/> />
</div> </div>
</GridListTile>
))}
</GridList>
</div>
{/* <div style={{ width: 566, height: 233, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', padding: 20, justifyContent: 'space-between', display: 'grid', margin: 10 }}>
<div>
<span style={{ fontSize: 17 }}>YTD Revenue</span>
<Typography style={{ fontSize: 24, fontWeight: 'bold' }}>1,016,489.78</Typography>
<Typography style={{ fontSize: 16, fontWeight: 'bold' }}>In IDR mn</Typography>
</div>
<LineChart
width={400}
height={50}
data={data}
yMin={0}
yMax={10}
hideXAxis={true}
hideYAxis={true}
hideXLabel={true}
hideYLabel={true}
/>
</div> */}
</div> </div>
) )
} }
......
src/container/MonthlyReport.js
View file @ ebb784fa
...@@ -692,6 +692,7 @@ export default class MonthlyReport extends Component { ...@@ -692,6 +692,7 @@ export default class MonthlyReport extends Component {
saveToMonthlyReport(type) { saveToMonthlyReport(type) {
this.setState({ this.setState({
visibleMonthlyReport: true, visibleMonthlyReport: true,
loading: true,
visibleBS: false, visibleBS: false,
visiblePL: false, visiblePL: false,
visibleCAT: false, visibleCAT: false,
...@@ -1428,7 +1429,7 @@ export default class MonthlyReport extends Component { ...@@ -1428,7 +1429,7 @@ export default class MonthlyReport extends Component {
<span>INCOMPLETE</span> : <span>INCOMPLETE</span> :
val === "revision" ? val === "revision" ?
<span>REVISION</span> : <span>REVISION</span> :
val === "approval_proccess" ? val === "approval_process" ?
<span>APPROVAL PROCCESS</span> : <span>APPROVAL PROCCESS</span> :
val === "approval_review" ? val === "approval_review" ?
<span>APPROVAL REVIEW</span> : <span>APPROVAL REVIEW</span> :
......
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