Merge branch 'deni-dev(pc)' into 'master'

lastperiod OI

See merge request !501

src/container/OprIndicator/OperatingIndicator.js

@@ -40,7 +40,9 @@ export default class OperatingIndicator extends Component {
             messageAlert: '',
             buttonCreate: true,
             buttonEdit: true,
-            buttonDelete: true
+            buttonDelete: true,
+            lastPeriod: '',
+            latestPeriode: ''
         }
         this.fileHandler = this.fileHandler.bind(this);
     }
@@ -237,7 +239,7 @@ export default class OperatingIndicator extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let periode = (this.state.latestPeriode == "" ? String(Number(currentYear) + 1) : this.state.latestPeriode)
+                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
                     let index = data.sort((a, b) => a - b).findIndex((val) => val === periode)
                     this.setState({ listPeriode: defaultProps, periode: index == -1 ? periodeData[0] : periodeData[index] }, () => {
                         this.getReport()