Commit a5d3bc56 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

issue kecil oi

See merge request !833
parents 962bbc45 2a443764
...@@ -324,7 +324,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -324,7 +324,7 @@ export default class OperatingIndicatorMR extends Component {
monthly_report: payload monthly_report: payload
} }
console.log(body) console.log(body)
this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0] }) this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
} }
}); });
} }
...@@ -730,7 +730,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -730,7 +730,7 @@ export default class OperatingIndicatorMR extends Component {
} }
} }
}, { }, {
name: `Rolling Outlook (FY ${this.props.periode})`, name: `Rolling Outlook (FY${this.props.data.periode})`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>
...@@ -1354,18 +1354,18 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1354,18 +1354,18 @@ export default class OperatingIndicatorMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>
Period : { Period : {
this.props.data.report_id === 22 ? 'Jan' : this.props.data.report_id === 22 ? 'JAN' :
this.props.data.report_id === 23 ? 'Feb' : this.props.data.report_id === 23 ? 'FEB' :
this.props.data.report_id === 24 ? 'Mar' : this.props.data.report_id === 24 ? 'MAR' :
this.props.data.report_id === 25 ? 'Apr' : this.props.data.report_id === 25 ? 'APR' :
this.props.data.report_id === 26 ? 'May' : this.props.data.report_id === 26 ? 'MAY' :
this.props.data.report_id === 27 ? 'Jun' : this.props.data.report_id === 27 ? 'JUN' :
this.props.data.report_id === 28 ? 'Jul' : this.props.data.report_id === 28 ? 'JUL' :
this.props.data.report_id === 29 ? 'Aug' : this.props.data.report_id === 29 ? 'AUG' :
this.props.data.report_id === 30 ? 'Sep' : this.props.data.report_id === 30 ? 'SEP' :
this.props.data.report_id === 31 ? 'Oct' : this.props.data.report_id === 31 ? 'OCT' :
this.props.data.report_id === 32 ? 'Nov' : this.props.data.report_id === 32 ? 'NOV' :
this.props.data.report_id === 33 ? 'Dec' : "" } {this.props.data.periode} this.props.data.report_id === 33 ? 'DEC' : "" } {this.props.data.periode}
</Typography> </Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
...@@ -1521,18 +1521,18 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1521,18 +1521,18 @@ export default class OperatingIndicatorMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>
Period : { Period : {
this.props.data.report_id === 22 ? 'Jan' : this.props.data.report_id === 22 ? 'JAN' :
this.props.data.report_id === 23 ? 'Feb' : this.props.data.report_id === 23 ? 'FEB' :
this.props.data.report_id === 24 ? 'Mar' : this.props.data.report_id === 24 ? 'MAR' :
this.props.data.report_id === 25 ? 'Apr' : this.props.data.report_id === 25 ? 'APR' :
this.props.data.report_id === 26 ? 'May' : this.props.data.report_id === 26 ? 'MAY' :
this.props.data.report_id === 27 ? 'Jun' : this.props.data.report_id === 27 ? 'JUN' :
this.props.data.report_id === 28 ? 'Jul' : this.props.data.report_id === 28 ? 'JUL' :
this.props.data.report_id === 29 ? 'Aug' : this.props.data.report_id === 29 ? 'AUG' :
this.props.data.report_id === 30 ? 'Sep' : this.props.data.report_id === 30 ? 'SEP' :
this.props.data.report_id === 31 ? 'Oct' : this.props.data.report_id === 31 ? 'OCT' :
this.props.data.report_id === 32 ? 'Nov' : this.props.data.report_id === 32 ? 'NOV' :
this.props.data.report_id === 33 ? 'Dec' : "" } {this.props.data.periode} this.props.data.report_id === 33 ? 'DEC' : "" } {this.props.data.periode}
</Typography> </Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
...@@ -1549,7 +1549,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1549,7 +1549,7 @@ export default class OperatingIndicatorMR extends Component {
</div> </div>
)} )}
</div> </div>
<div className="grid grid-2x"> <div className="grid grid-2x" style={{ marginLeft: 10 }}>
<div className="col-1"> <div className="col-1">
<button <button
className="button" className="button"
...@@ -1668,7 +1668,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1668,7 +1668,7 @@ export default class OperatingIndicatorMR extends Component {
this.setState({ uploadStatus: 'idle', percentage: '0' }) this.setState({ uploadStatus: 'idle', percentage: '0' })
}} }}
onUpload={() => { onUpload={() => {
String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("OPERATING") && String(this.state.judul).includes("INDICATOR") ? String(this.state.judulColumn).includes("TEMPLATE") && String(this.state.judulColumn).includes("UPLOAD") && String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("OPERATING") && String(this.state.judul).includes("INDICATOR") ?
this.checkUpload() : this.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}} }}
......
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