Merge branch 'rifka' into 'master'

quarter

See merge request !1174

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}