Commit 1586536a authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

Bug

See merge request !991
parents 1f00a5fa 997334d8
......@@ -111,7 +111,7 @@ class HomePage extends Component {
api.create().getMonthTransaction().then(response => {
let dateNow = new Date
let month = format(dateNow, 'MMMM')
// console.log(response);
console.log(response);
if (response.data) {
if (response.data.status === "success") {
// console.log(response);
......@@ -126,7 +126,7 @@ class HomePage extends Component {
options: monthData,
getOptionLabel: (option) => option.month_value,
};
let index = data.sort((a, b) => a - b).findIndex((val) => val.month_name == month)
let index = data.findIndex((val) => val.month_name == month)
// console.log(month)
// console.log(index)
this.setState({ listMonth: defaultProps, month: index == -1 ? monthData[0] : monthData[index] }, () => {
......
......@@ -309,7 +309,7 @@ export default class MonthlyReport extends Component {
options: monthData,
getOptionLabel: (option) => option.month_value,
};
let index = data.sort((a, b) => a - b).findIndex((val) => val.month_name == month)
let index = data.findIndex((val) => val.month_name == month)
console.log(index);
this.setState({ listMonth: defaultProps, month: index == -1 ? monthData[0] : monthData[index] }, () => {
// if (this.state.isApprover === true) {
......
......@@ -2245,7 +2245,7 @@ export default class BalanceSheetMR extends Component {
<LightTooltip title={"MTD Explanation vs MB is Reqiured"} arrow>
<Input
disableUnderline={true}
style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', minHeight: 30, padding: 0 }}
type="text"
placeholder=""
multiline={true}
......@@ -2256,7 +2256,9 @@ export default class BalanceSheetMR extends Component {
style: {
color: "#5198ea",
textAlign: 'left',
backgroundColor: '#ffac99'
backgroundColor: '#ffac99',
minHeight: 30,
padding: 0
}
}}
onBlur={(event) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment