Merge branch 'rifka' into 'master'

push

See merge request !365

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -92,8 +92,8 @@ export default class ApprovalMatrix extends Component {
                 let body = {
                     approval_matrix: payload
                 }
-                console.log(resp.rows[1])
                 this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0] })
+                console.log(this.state.payload)
             }
         });
     }
@@ -621,7 +621,7 @@ export default class ApprovalMatrix extends Component {
                 filter: false,
                 sort: false,
                 customBodyRender: (val, tableMeta) => {
-                    console.log(tableMeta)
+                    // console.log(tableMeta)
                     return (
                         <div style={{ display: 'flex' }}>
                             {this.state.btnedit && <span>

src/container/BudgetTahunan/TaxPlanning.js

@@ -722,13 +722,12 @@ export default class TaxPlanning extends Component {
             }
         }
         const handleTotal = (tableMeta) => {
-            console.log(dataTable2[tableMeta.rowIndex]);
             let total = 0
             dataTable2[tableMeta.rowIndex].map((item, index) => {
                 if (index >= 9 && index <= 20) {
+                    console.log(item);
                     let valItem = item.fcp == undefined || item.fcp == "" ? 0 : item.fcp
                     total += Number(valItem)
-                    console.log(item);
                 }
             })
             dataTable2[tableMeta.rowIndex][21] = total

src/container/DocumentManagement/CreateManagementDoc.js

@@ -63,15 +63,9 @@ export default class CreateManagementDoc extends Component {
             console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
-                    if (response.data.data.length == 0){
-                        this.setState({
-                            sizeUpload: 1
-                        })
-                    } else {
-                        this.setState({
-                            sizeUpload: response.data.data[0].value
-                        })
-                    }
+                    this.setState({
+                        sizeUpload: response.data.data[0] ? response.data.data[0].value === undefined ? "1" : response.data.data[0].value : "1"
+                    })
                 }
             }
         })

src/container/DocumentManagement/EditManagementDoc.js

@@ -65,15 +65,9 @@ export default class EditManagementDoc extends Component {
             console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
-                    if (response.data.data.length == 0){
-                        this.setState({
-                            sizeUpload: 1
-                        })
-                    } else {
-                        this.setState({
-                            sizeUpload: response.data.data[0].value
-                        })
-                    }
+                    this.setState({
+                        sizeUpload: response.data.data[0] ? response.data.data[0].value === undefined ? "1" : response.data.data[0].value : "1"
+                    })
                 }
             }
         })