Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/container/BudgetTahunan/BalanceSheet.js

@@ -323,7 +323,8 @@ export default class BalanceSheet extends Component {
                     company_id: this.props.company.company_id,
                     periode: this.props.periode,
                     report_id: this.props.report_id,
-                    balance_sheet: payload
+                    balance_sheet: payload,
+                    status: 'submitted'
                 }
                 // console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -425,7 +425,8 @@ export default class CorporateAnnualTarget extends Component {
                     periode: this.props.periode,
                     report_id: this.props.report_id,
                     status: '',
-                    cat: payload
+                    cat: payload,
+                    status: 'submitted'
                 }
                 // // // // console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0] })

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -318,7 +318,8 @@ export default class FixedAssetsMovement extends Component {
                     company_id: this.props.company.company_id,
                     periode: this.props.periode,
                     report_id: this.props.report_id,
-                    fixed_asset_movement: payload
+                    fixed_asset_movement: payload,
+                    status: 'submitted'
                 }
                 // // console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })

src/container/BudgetTahunan/ProfitLoss.js

@@ -332,7 +332,8 @@ export default class ProfitLoss extends Component {
                     company_id: this.props.company.company_id,
                     periode: this.props.periode,
                     report_id: this.props.report_id,
-                    profit_loss: payload
+                    profit_loss: payload,
+                    status: 'submitted'
                 }
                 // console.log(isi)
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })

src/container/BudgetTahunan/TaxPlanning.js

@@ -454,7 +454,8 @@ export default class TaxPlanning extends Component {
                     company_id: this.props.company.company_id,
                     periode: this.props.periode,
                     report_id: this.props.report_id,
-                    tax_planning: payload
+                    tax_planning: payload,
+                    status: 'submitted'
                 }
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
             }

src/container/MonthlyReport.js

@@ -801,17 +801,19 @@ export default class MonthlyReport extends Component {
                                     <span>COMPLETED</span> :
                                     val === "draft" ?
                                         <span>DRAFT</span> :
-                                        val === "revision" ?
-                                            <span>REVISION</span> :
-                                            val === "approval_proccess" ?
-                                                <span>APPROVAL PROCCESS</span> :
-                                                val === "approval_review" ?
-                                                    <span>APPROVAL REVIEW</span> :
-                                                    val === "not-yet" ?
-                                                        <span>OPEN</span> :
-                                                        val === "CLOSED" ?
-                                                            <span>CLOSED</span> :
-                                                            <img src={Images.cross} style={{ width: 31, height: 24 }} />
+                                        val === "incomplete" ?
+                                            <span>INCOMPLETE</span> :
+                                            val === "revision" ?
+                                                <span>REVISION</span> :
+                                                val === "approval_proccess" ?
+                                                    <span>APPROVAL PROCCESS</span> :
+                                                    val === "approval_review" ?
+                                                        <span>APPROVAL REVIEW</span> :
+                                                        val === "not-yet" ?
+                                                            <span>OPEN</span> :
+                                                            val === "CLOSED" ?
+                                                                <span>CLOSED</span> :
+                                                                <img src={Images.cross} style={{ width: 31, height: 24 }} />
                                 }
                             </div >
                         );

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -281,7 +281,8 @@ export default class FixedAssetsMovementMR extends Component {
                     periode: this.props.periode,
                     report_id: this.props.report_id,
                     months: this.props.month.month_id,
-                    fixed_asset_movement: payload
+                    fixed_asset_movement: payload,
+                    status: 'submitted'
                 }
                 // console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
@@ -293,7 +294,7 @@ export default class FixedAssetsMovementMR extends Component {
         api.create().checkUploadMonthlyReportFAM(this.state.payload).then(response => {
             // console.log(JSON.stringify(this.state.payload));
             // console.log(this.state.payload)
-            // console.log(response)
+            console.log(response)
             if (response.data) {
                 if (response.data.status === 'success') {
                     this.setState({ visibleUpload: false, loading: true, visibleFAMMR: false })
@@ -323,7 +324,7 @@ export default class FixedAssetsMovementMR extends Component {
                     // console.log(dataTable)
                     this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true }, () => {
                         this.state.dataTable.map(item => {
-                            if (item[18].length > 0) {
+                            if (item[15].length > 0) {
                                 console.log('masuk')
                                 this.setState({ buttonError: true, errorPreview: true, editable: true })
                             }
@@ -367,7 +368,8 @@ export default class FixedAssetsMovementMR extends Component {
             // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
-                    this.props.onClickClose()
+                    // this.props.onClickClose()
+                    this.props.saveToMonthlyReport()
                     // this.props.getReport()
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
@@ -701,6 +703,8 @@ export default class FixedAssetsMovementMR extends Component {
                 // console.log(tableMeta.rowData[7]);
                 // console.log(total)
             }
+            // console.log(dex)
+            // console.log(Number(tableMeta.columnIndex) + Number(type))
             return total
         }
 
@@ -728,6 +732,8 @@ export default class FixedAssetsMovementMR extends Component {
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
                 // console.log(total);
             }
+            // console.log(dex)
+            // console.log(Number(tableMeta.columnIndex) + Number(type))
             return total * 100
         }
 
@@ -1073,7 +1079,8 @@ export default class FixedAssetsMovementMR extends Component {
                                                                     placeholder=""
                                                                     disabled={true}
                                                                     suffix={'%'}
-                                                                    value={Number(handleVariancePercent(tableMeta, 2, 5)).toFixed(1)}
+                                                                    // value={0}
+                                                                    value={Number(handleVariancePercent(tableMeta, 2, 3)).toFixed(1)}
                                                                 />
                                                             }
                                                         />
@@ -1157,7 +1164,8 @@ export default class FixedAssetsMovementMR extends Component {
                                                                     placeholder=""
                                                                     disabled={true}
                                                                     suffix={'%'}
-                                                                    value={Number(handleVariancePercent(tableMeta, 3, 7)).toFixed(1)}
+                                                                    // value={0}
+                                                                    value={Number(handleVariancePercent(tableMeta, 3, 5)).toFixed(1)}
                                                                 />
                                                             }
                                                         />