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

src/container/Laporan/SubHolding.js

@@ -3251,6 +3251,7 @@ export default class SubHolding extends Component {
                                         width={this.props.width}
                                         height={this.props.height}
                                         open={this.props.open}
+                                        month={this.state.month.month_value}
                                         approvedMB={this.state.approveMB}
                                         approveMonthly={this.state.approveMonthly}
                                         type={this.state.report ? this.state.report.value : 1}

src/container/Laporan/TableSubHolding.js

@@ -13365,7 +13365,7 @@ export default class TableSubHolding extends Component {
                                             control={
                                                 <Input
                                                     disableUnderline={true}
-                                                    style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
@@ -13373,7 +13373,7 @@ export default class TableSubHolding extends Component {
                                                     defaultValue={tableMeta.rowData[31]}
                                                     inputProps={{
                                                         style: {
-                                                            color: "#5198ea"
+                                                            color: this.props.approvedMB ? 'black' : '#5198ea'
                                                         }
                                                     }}
                                                     // onBlur={(event) => {
@@ -13703,8 +13703,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, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, top: 0, zIndex: 102, 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, height: 50, paddingTop: 15 }}>{columnMeta.name}</div>
@@ -13856,8 +13857,9 @@ export default class TableSubHolding extends Component {
                             </div>
                         </div>
                     )
-                }
+                } 
             }
+
         }, {
             name: `FY ${this.props.periode}`,
             options: {