Merge branch 'riri' into 'master'

plmr

See merge request !803

src/container/MonthlyReport/ProfitLossMR.js

@@ -197,7 +197,7 @@ export default class ProfitLossMR extends Component {
                             item.profit_loss.rolling_budget === null ? "0.0" : item.profit_loss.rolling_budget === "" ? "0.0" : item.profit_loss.rolling_budget,
                             item.profit_loss.actual === null ? "0.0" : item.profit_loss.actual === "" ? "0.0" : item.profit_loss.actual,
                             item.profit_loss.ytd_actual === null ? "0.0" : item.profit_loss.ytd_actual === "" ? "0.0" : item.profit_loss.ytd_actual,
-                            item.profit_loss.actual_previous_month === null ? "0.0" : item.profit_loss.actual_previous_month === "" ? "0.0" : item.profit_loss.actual_previous_month,
+                            item.profit_loss.actual_previous_month === null ? "5.0" : item.profit_loss.actual_previous_month === "" ? "5.0" : item.profit_loss.actual_previous_month,
                             item.profit_loss.amount_act_vs_previous_month === null ? "0.0" : item.profit_loss.amount_act_vs_previous_month === "" ? "0.0" : item.profit_loss.amount_act_vs_previous_month,
                             item.profit_loss.percent_act_vs_previous_month === null ? "0.0" : item.profit_loss.percent_act_vs_previous_month === "" ? "0.0" : item.profit_loss.percent_act_vs_previous_month,
                             item.profit_loss.amount_act_vs_mb === null ? "0.0" : item.profit_loss.amount_act_vs_mb === "" ? "0.0" : item.profit_loss.amount_act_vs_mb,
@@ -232,7 +232,7 @@ export default class ProfitLossMR extends Component {
                         item.profit_loss.rolling_budget === null ? "0.0" : item.profit_loss.rolling_budget === "" ? "0.0" : item.profit_loss.rolling_budget,
                         item.profit_loss.actual === null ? "0.0" : item.profit_loss.actual === "" ? "0.0" : item.profit_loss.actual,
                         item.profit_loss.ytd_actual === null ? "0.0" : item.profit_loss.ytd_actual === "" ? "0.0" : item.profit_loss.ytd_actual,
-                        item.profit_loss.actual_previous_month === null ? "0.0" : item.profit_loss.actual_previous_month === "" ? "0.0" : item.profit_loss.actual_previous_month,
+                        item.profit_loss.actual_previous_month === null ? "5.0" : item.profit_loss.actual_previous_month === "" ? "5.0" : item.profit_loss.actual_previous_month,
                         item.profit_loss.amount_act_vs_previous_month === null ? "0.0" : item.profit_loss.amount_act_vs_previous_month === "" ? "0.0" : item.profit_loss.amount_act_vs_previous_month,
                         item.profit_loss.percent_act_vs_previous_month === null ? "0.0" : item.profit_loss.percent_act_vs_previous_month === "" ? "0.0" : item.profit_loss.percent_act_vs_previous_month,
                         item.profit_loss.amount_act_vs_mb === null ? "0.0" : item.profit_loss.amount_act_vs_mb === "" ? "0.0" : item.profit_loss.amount_act_vs_mb,
@@ -506,7 +506,7 @@ export default class ProfitLossMR extends Component {
                 "master_budget": i[8],
                 "rolling_budget": i[9],
                 "actual": i[10],
-                "ytd_actual": [11],
+                "ytd_actual": i[11],
                 "actual_previous_month": i[12],
                 "amount_act_vs_previous_month": i[13],
                 "percent_act_vs_previous_month": i[14],
@@ -519,7 +519,7 @@ export default class ProfitLossMR extends Component {
                 "mtd_vs_rb": i[21]
             })
         })
-        console.log(JSON.stringify(data));
+        // console.log(JSON.stringify(data));
         data.map(i => {
             if (i.mtd_vs_previous_month === "" && (Number(i.percent_act_vs_previous_month) < this.state.minValue || Number(i.percent_act_vs_previous_month) > this.state.maxValue)) {
                 console.log('msk 1');
@@ -551,7 +551,7 @@ export default class ProfitLossMR extends Component {
             "months": this.props.month.month_id,
             "profit_loss": data
         }
-        // console.log(JSON.stringify(payload));
+        console.log(JSON.stringify(payload));
         api.create().validateSubmitReportPL(payload).then((response) => {
             console.log(response)
             if (response.data) {