Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/Laporan/TableSubHolding.js

@@ -9561,8 +9561,9 @@ export default class TableSubHolding extends Component {
                     }
                 }
             }, {
-                name: `Q1 ${this.props.periode}`,
+                name: `Q${this.props.month == 'Mar' ? '1' :  this.props.month == 'Jun' ? '2' : this.props.month == 'Sep' ? '3' : this.props.month == 'Dec' ? '4' : ''} ${this.props.periode}`,
                 options: {
+                    display : this.props.month != 'Jan' && this.props.month != 'Feb' &&  this.props.month != 'Apr' && this.props.month != 'May' && this.props.month != 'Jul' && this.props.month != 'Aug' && this.props.month != 'Oct' && this.props.month != 'Nov',
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -10611,7 +10612,7 @@ export default class TableSubHolding extends Component {
                     }
                 }
             },{
-                name: `ACTUAL LAST YEAR}`,
+                name: `ACTUAL LAST YEAR`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
@@ -10963,6 +10964,7 @@ export default class TableSubHolding extends Component {
             },{
                 name: `OL Q1 ${this.props.periode}`,
                 options: {
+                    display: false,
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -11313,6 +11315,7 @@ export default class TableSubHolding extends Component {
             },{
                 name: `OL Q2 ${this.props.periode}`,
                 options: {
+                    display: false,
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -11663,6 +11666,7 @@ export default class TableSubHolding extends Component {
             },{
                 name: `OL Q3 ${this.props.periode}`,
                 options: {
+                    display: false,
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -12013,6 +12017,7 @@ export default class TableSubHolding extends Component {
             },{
                 name: `OL PA ${this.props.periode}`,
                 options: {
+                    display: false,
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -12363,6 +12368,7 @@ export default class TableSubHolding extends Component {
             },{
                 name: `Historial`,
                 options: {
+                    display: false,
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>