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

Deni dev(pc)

See merge request !375

src/api/index.js

@@ -198,6 +198,7 @@ const create = (type = "") => {
   const uploadMasterBudget = (body) => api.post('transaction/master_budget/import_master_budget', body)
   const validateSubmitReport = (body) => api.post('transaction/master_budget/validate_save', body)
   const getMonthTransaction = () => api.get('transaction/get_default_month')
+  const countingFormula = (body) => api.post('transaction/counting_formula', body)
 
   const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)
   const getAllOperatingInd = (body) => api.post('transaction/get_all_operating_indicator_report', body)
@@ -350,7 +351,8 @@ const create = (type = "") => {
     validateSubmitReport,
     checkUploadOperatingInd,
     uploadOperatingInd,
-    getLastestUpdateMB
+    getLastestUpdateMB,
+    countingFormula
   }
 }
 

src/container/BudgetTahunan.js

@@ -208,11 +208,12 @@ export default class BudgetTahunan extends Component {
         })
     }
 
-    clickDetail(item, id, revision) {
+    clickDetail(item, id, revision, status) {
         console.log(item);
         this.setState({
             report_id: id,
             revisionTable: revision,
+            status: status
         }, () => {
             if (item === 'Balance Sheet') {
                 this.setState({
@@ -415,7 +416,7 @@ export default class BudgetTahunan extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        tableMeta.rowData[5] ? this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2]) : null
+                                        tableMeta.rowData[5] ? this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3]) : null
                                     }
                                 >
                                     <Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
@@ -653,6 +654,7 @@ export default class BudgetTahunan extends Component {
                         saveToMasterBudget={this.saveToMasterBudget.bind(this)}
                         onClickClose={() => this.setState({ visiblePL: false, visibleBudgetTahunan: true })}
                         getReport={this.getReport.bind(this)}
+                        status={this.state.status}
                     />
 
                 )}

src/container/BudgetTahunan/BalanceSheet.js

@@ -115,7 +115,8 @@ export default class BalanceSheet extends Component {
                             item.balance_sheet.december,
                             item.balance_sheet.total_current_year,
                             item.balance_sheet.total_next_year,
-                            item.balance_sheet.total_more_year
+                            item.balance_sheet.total_more_year,
+                            item.order
                         ])
                     }
                     if (item.children !== null) {
@@ -149,7 +150,8 @@ export default class BalanceSheet extends Component {
                         item.balance_sheet.december,
                         item.balance_sheet.total_current_year,
                         item.balance_sheet.total_next_year,
-                        item.balance_sheet.total_more_year
+                        item.balance_sheet.total_more_year,
+                        item.order
                     ])
                     if (item.children !== null) {
                         if (item.children.length > 0) {
@@ -323,12 +325,13 @@ export default class BalanceSheet extends Component {
                             item.total_current_year,
                             item.total_next_year,
                             item.total_more_year,
+                            item.order,
                             item.error
                         ]
                     })
                     this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false }, () => {
                         this.state.dataTable.map(item => {
-                            if (item[22].length > 0) {
+                            if (item[23].length > 0) {
                                 console.log('masuk')
                                 this.setState({ buttonError: true, errorPreview: true })
                             }
@@ -491,7 +494,7 @@ export default class BalanceSheet extends Component {
             let arrayFormula = tableMeta.rowData[3].match(/[a-zA-Z]+|[0-9]+|[-!$%^&*()_+|~=`{}\[\]:";'<>?,.\/]+(?:\.[0-9]+@|)/g)
             let arrayJumlah = []
             arrayFormula.map((item, indexs) => {
-                let index = dataTable2.findIndex((val) => val[1] == item)
+                let index = dataTable2.findIndex((val) => val[22] == item)
                 if (index > 0) {
                     arrayJumlah.push(dataTable2[index][tableMeta.columnIndex])
                 } else {
@@ -569,8 +572,8 @@ export default class BalanceSheet extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ width: 300 }}>
-                            {tableMeta.rowData[22] ?
-                                tableMeta.rowData[22].length > 0 ?
+                            {tableMeta.rowData[23] ?
+                                tableMeta.rowData[23].length > 0 ?
                                     <div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
                                         <LightTooltip title={"Report Items Not Registered"} arrow>
                                             <span style={{ fontSize: 12, color: 'red' }}>{tableMeta.rowData[0] === 4 ? "" : val}</span>
@@ -1936,6 +1939,12 @@ export default class BalanceSheet extends Component {
                 }
             }
         },
+        {
+            name: "",
+            options: {
+                display: false
+            }
+        },
         {
             name: "",
             options: {

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -203,8 +203,8 @@ export default class CreateReportItems extends Component {
             "weight": this.state.weight,
             "condition_if_wrong": this.state.condition,
             "condition_it_should_be": this.state.realVal,
-            "type_kpi": this.state.kpiTypeValue.value,
-            "max_ach": this.state.maxAchValue.value,
+            "type_kpi": this.state.kpiTypeValue ? this.state.kpiTypeValue.value : null,
+            "max_ach": this.state.maxAchValue ? this.state.maxAchValue.value : null,
             "formula_ytd": this.state.formulaYTDValue,
             "start_date": this.state.startDate,
             "end_date": this.state.endDate