Commit 10afc3bf authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

benerin pitak2

See merge request !1122
parents 1f8a16da f6059781
...@@ -80,7 +80,7 @@ export default class TableSummaryTriputra extends Component { ...@@ -80,7 +80,7 @@ export default class TableSummaryTriputra extends Component {
name: `MTD 2021`, name: `MTD 2021`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} > <th style={{ ...style2, backgroundColor: '#1c71b8', top: 0, color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
<div className="grid grid-4x" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="grid grid-4x" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', height: 65 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', height: 65 }}>
...@@ -205,7 +205,8 @@ export default class TableSummaryTriputra extends Component { ...@@ -205,7 +205,8 @@ export default class TableSummaryTriputra extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[6]).toFixed(1)} suffix={'%'}
value={tableMeta.rowData[6]}
/> />
} }
/> />
...@@ -266,7 +267,7 @@ export default class TableSummaryTriputra extends Component { ...@@ -266,7 +267,7 @@ export default class TableSummaryTriputra extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(1)} value={tableMeta.rowData[9]}
/> />
} }
/> />
...@@ -327,7 +328,7 @@ export default class TableSummaryTriputra extends Component { ...@@ -327,7 +328,7 @@ export default class TableSummaryTriputra extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(2)} value={tableMeta.rowData[12]}
/> />
} }
/> />
...@@ -388,7 +389,7 @@ export default class TableSummaryTriputra extends Component { ...@@ -388,7 +389,7 @@ export default class TableSummaryTriputra extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(2)} value={tableMeta.rowData[15]}
/> />
} }
/> />
...@@ -465,7 +466,7 @@ export default class TableSummaryTriputra extends Component { ...@@ -465,7 +466,7 @@ export default class TableSummaryTriputra extends Component {
name: `MTD 2021 (OPTIONAL)`, name: `MTD 2021 (OPTIONAL)`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} > <th style={{ ...style2, backgroundColor: '#1c71b8', top: 0, color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
<div className="column-5" style={{ ...style2, display: 'flex', backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="column-5" style={{ ...style2, display: 'flex', backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', height: 65, width: 685 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', height: 65, width: 685 }}>
......
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