Merge branch 'rifka' into 'master'

create md cat & olpa ketuker

See merge request !1349

src/container/MasterData/MasterDataCAT/CreateMasterDataCAT.js

@@ -24,7 +24,7 @@ export default class CreateMasterDataCAT extends Component {
             tipeAlert: '',
             messageAlert: '',
             listPeriode: null,
-            // periode: null,
+            periode: null,
             errorWeight: false,
             msgErrorWeight: '',
             getParent: []
@@ -264,7 +264,7 @@ export default class CreateMasterDataCAT extends Component {
                                         id="company"
                                         disabled={this.state.intent === 'Home' ? true : false}
                                         onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
-                                            this.getReportType()
+                                            this.getParentIR()
                                         })}
                                         disableClearable
                                         style={{ width: 250 }}
@@ -294,7 +294,7 @@ export default class CreateMasterDataCAT extends Component {
                                         onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
                                             this.getParentIR()
                                         })}
-                                        debug
+                                        disableClearable
                                         renderInput={(params) =>
                                             <TextField {...params}
                                                 label="Year"

src/container/OutlookPA.js

@@ -333,7 +333,7 @@ export default class OutlookPA extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriodProps == undefined ? this.state.lastPeriodProps : Number(this.state.lastPeriod))
+                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriodProps == undefined ? Number(this.state.lastPeriod) : this.state.lastPeriodProps )
                     let index = data.sort((a, b) => a - b).findIndex((val) => val == periode)
                     // console.log(data)
                     // console.log(this.state.lastPeriod)