Merge branch 'dev/fahrur-new' into 'ENV-DEV'

master data CAT

See merge request !2293

src/container/MasterData/MasterDataCAT/CreateMasterDataCAT.js

@@ -3,7 +3,7 @@ import { TextField, Typography, Snackbar, withStyles } from '@material-ui/core';
 import * as R from 'ramda';
 import api from '../../../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
-import { titleCase } from '../../../library/Utils';
+import { fixNumber, titleCase } from '../../../library/Utils';
 import format from "date-fns/format";
 import { DatePicker } from '@material-ui/pickers';
 import Images from '../../../assets/Images';
@@ -184,10 +184,10 @@ export default class CreateMasterDataCAT extends Component {
         getData.map((item) => {
             jumlah += Number(item.weight)
         })
-        console.log(jumlah)
-        if ( jumlah > 100/100 ) {
+        console.log(fixNumber(jumlah,3))
+        if ( fixNumber(jumlah,3) > 100/100 ) {
             this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' })
-        } else if (jumlah < 100/100) {
+        } else if (fixNumber(jumlah,3) < 100/100) {
             this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' })
         }
         else {

src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js

@@ -6,7 +6,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import MuiAlert from '@material-ui/lab/Alert';
 import api from '../../../api';
 import * as R from 'ramda'
-import { titleCase } from '../../../library/Utils';
+import { fixNumber, titleCase } from '../../../library/Utils';
 import Images from '../../../assets/Images';
 import Constant from '../../../library/Constant';
 const Alert = withStyles({
@@ -194,10 +194,10 @@ export default class EditMasterDataCAT extends Component {
         getData.map((item) => {
             jumlah += Number(item.weight)
         })
-        console.log(jumlah)
-        if ( jumlah > 100/100 ) {
+        console.log(fixNumber(jumlah,3))
+        if ( fixNumber(jumlah,3) > 100/100 ) {
             this.setState({ errorWeight: true, msgErrorWeight: 'Weight more than 100%' })
-        } else if (jumlah < 100/100) {
+        } else if (fixNumber(jumlah,3) < 100/100) {
             this.setState({ errorWeight: true, msgErrorWeight: 'Weight less than 100%' })
         }
         else {
@@ -226,7 +226,7 @@ export default class EditMasterDataCAT extends Component {
         this.props.updateReportItems(payload)
     }
 
-    
+
     getInputType() {
         api.create().getInputType().then((response) => {
             // console.log(response.data)
@@ -378,7 +378,7 @@ export default class EditMasterDataCAT extends Component {
 
                         <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20 }}>
                             <div className="column-1">
-                                <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }} >                                    
+                                <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }} >
                                     <Autocomplete
                                         {...this.state.listCompany}
                                         id="company"