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

src/container/Laporan/SubHolding.js

@@ -3189,8 +3189,9 @@ export default class SubHolding extends Component {
                                             />}
                                         value={this.state.periode}
                                     />
-                                    
-                                    {/* {this.state.report != null ? String(this.state.report.label).toLocaleLowerCase().includes('summary') ? <Autocomplete
+                                </div>
+                                {this.state.report != null ? String(this.state.report.label).toLocaleLowerCase().includes('quarterly') ? <div style={{ marginTop: 15, display: 'flex' }}>
+                                    <Autocomplete
                                         {...this.state.listQuarter}
                                         // getOptionLabel={(option) => titleCase(option.label)}
                                         id="quarter"
@@ -3198,11 +3199,11 @@ export default class SubHolding extends Component {
                                             this.getReportType()
                                         })}
                                         disableClearable
-                                        style={{ width: 250, marginLeft: 10 }}
+                                        style={{ width: 250 }}
                                         renderInput={(params) => <TextField {...params} label="Quarter" margin="normal" style={{ marginTop: 7 }} />}
                                         value={this.state.quarter}
-                                    /> : null : null} */}
-                                </div>
+                                    /> 
+                                </div> : null : null}
                                 {this.state.report != null ? String(this.state.report.label).toLocaleLowerCase().includes('summary') ? <div style={{ marginTop: 15, display: 'flex' }}>
                                     <Autocomplete
                                         {...this.state.listMonths}

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 }}>
@@ -10204,7 +10205,7 @@ export default class TableSubHolding extends Component {
                                             control={
                                                 <NumberFormat
                                                     thousandSeparator={true}
-                                                    style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
@@ -10246,7 +10247,7 @@ export default class TableSubHolding extends Component {
                                             control={
                                                 <NumberFormat
                                                     thousandSeparator={true}
-                                                    style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
@@ -10611,7 +10612,7 @@ export default class TableSubHolding extends Component {
                     }
                 }
             },{
-                name: `ACTUAL ${Number(this.props.periode) - 1}`,
+                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 }}>