Commit dbf6d4ce authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

ytd

See merge request !1083
parents 6dfdcdd4 c767d45f
...@@ -264,6 +264,7 @@ const create = (type = "") => { ...@@ -264,6 +264,7 @@ const create = (type = "") => {
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/summary/get_report_hierarki', body) const getReportBSSuma = (body) => api.post('/transaction/summary_balance_sheet/summary/get_report_hierarki', body)
const getDashboardCAT = (body) => api.post('/dashboard/cat', body) const getDashboardCAT = (body) => api.post('/dashboard/cat', body)
const getHierarkiReportYtd = (body) => api.post('/transaction/summary/ytd/get_report_hierarki', body)
const getHierarkiReportHistorical = (body) => api.post('/transaction/historical/get_historical_hierarki', body) const getHierarkiReportHistorical = (body) => api.post('/transaction/historical/get_historical_hierarki', body)
const getHierarkiReportMTD = (body) => api.post('/transaction/summary/mtd/get_report_hierarki', body) const getHierarkiReportMTD = (body) => api.post('/transaction/summary/mtd/get_report_hierarki', body)
...@@ -639,7 +640,8 @@ const create = (type = "") => { ...@@ -639,7 +640,8 @@ const create = (type = "") => {
createReportPLMR, createReportPLMR,
getPLID, getPLID,
getHierarkiReportHistorical, getHierarkiReportHistorical,
getHierarkiReportMTD getHierarkiReportMTD,
getHierarkiReportYtd
} }
} }
......
...@@ -411,6 +411,24 @@ export default class TableSummaryTriputra extends Component { ...@@ -411,6 +411,24 @@ export default class TableSummaryTriputra extends Component {
] ]
const columnYTD = [ const columnYTD = [
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
},
{ {
name: "Company", name: "Company",
options: { options: {
...@@ -423,7 +441,14 @@ export default class TableSummaryTriputra extends Component { ...@@ -423,7 +441,14 @@ export default class TableSummaryTriputra extends Component {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ width: 300 }}> <div style={{ width: 300 }}>
{ val } {
tableMeta.rowData[2] == 0 ?
<span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(val).toUpperCase()}</span>
:
<div style={{ paddingLeft: 20 * Number(tableMeta.rowData[2]) }}>
<span style={{ fontSize: 12 }}>{val}</span>
</div>
}
</div> </div>
) )
} }
...@@ -495,11 +520,37 @@ export default class TableSummaryTriputra extends Component { ...@@ -495,11 +520,37 @@ export default class TableSummaryTriputra extends Component {
<div> <div>
<div style={{ display: 'flex', justifyContent: 'space-between'}}> <div style={{ display: 'flex', justifyContent: 'space-between'}}>
<div style={{ display: 'flex', width: 640, justifyContent: 'space-between'}}> <div style={{ display: 'flex', width: 640, justifyContent: 'space-between'}}>
<div style={{ textAlign: 'right', width: '20%' }}> <div style={{ flex: 1 }}>
111 <FormControlLabel
</div> style={{ margin: 0 }}
<div style={{ textAlign: 'right', width: '20%' }}> value={val}
112 control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[4]).toFixed(1)}
/>
}
/>
</div>
<div style={{ flex: 1}}>
<FormControlLabel
style={{ margin: 0 }}
value={val}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[5]).toFixed(1)}
/>
}
/>
</div> </div>
<div style={{ textAlign: 'right', width: '20%' }}> <div style={{ textAlign: 'right', width: '20%' }}>
113 113
...@@ -2297,7 +2348,7 @@ export default class TableSummaryTriputra extends Component { ...@@ -2297,7 +2348,7 @@ export default class TableSummaryTriputra extends Component {
<div style={{ padding: '0px 20px 20px 20px', width: this.props.width - (this.props.open === true ? 350 : 100) }}> <div style={{ padding: '0px 20px 20px 20px', width: this.props.width - (this.props.open === true ? 350 : 100) }}>
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={this.props.type === 4 ? datasHistorical : this.props.type === 1 ? datasMTD : this.props.type === 2 ? datasYTD : this.props.type === 3 ? datas : datas} data={this.props.type === 4 ? datasHistorical : this.props.type === 1 ? datasMTD : this.props.type === 2 ? dataTable2 : this.props.type === 3 ? datas : datas}
columns={this.props.type === 1 ? columnMTD : this.props.type === 2 ? columnYTD : this.props.type === 3 ? columnCPSM : this.props.type === 4 ? columnHistorical : columns} columns={this.props.type === 1 ? columnMTD : this.props.type === 2 ? columnYTD : this.props.type === 3 ? columnCPSM : this.props.type === 4 ? columnHistorical : columns}
options={options} options={options}
/> />
......
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