get latest update

src/assets/sass/app.css

@@ -7,10 +7,6 @@
   background-color: #0b6b24 !important;
 } */
 
-/* .main-color{
-  background-color: #1474CA !important;
-} */
-
 .sub-color{
   background-color: #f0f1f3 !important;
 }

src/container/BudgetTahunan/ProfitLoss.js

@@ -721,7 +721,7 @@ export default class ProfitLoss extends Component {
         const handleValue = (value, data) => {
             let total = 0
             dataTable2.map((item, index) => {
-                if (data.rowData[1] == item[2]) {
+                if (data.rowData[1] == item[2] && item[5] !== "-") {
                     total = item[data.columnIndex] == undefined ? (Number(total) + 0) : (Number(total) + Number(String(item[data.columnIndex]).includes('-') ? Number(String(item[data.columnIndex]).substr(1, String(item[data.columnIndex]).length)) * -1 : Number(item[data.columnIndex])))
                 }
             })

src/container/MasterData/MasterDataCAT/MasterDataCAT.js

@@ -871,7 +871,7 @@ export default class MasterDataCAT extends Component {
                                 </span>
                             }
                             {this.state.buttonDelete &&
-                                <span>
+                            <span>
                                     <a data-tip={'Delete'} data-for="delete">
                                         <button
                                             style={{

src/container/MasterData/Parameter/CreateParameter.js

@@ -8,6 +8,7 @@ import * as R from 'ramda'
 import Images from '../../../assets/Images';
 import Constant from '../../../library/Constant';
 import PopUpInformation from '../../../library/PopUpInformation';
+import { fixNumber, roundMath } from '../../../library/Utils';
 
 export default class CreateParameter extends Component {
     constructor(props) {
@@ -1731,7 +1732,7 @@ export default class CreateParameter extends Component {
                                     id="value"
                                     label={"Value"}
                                     // get data IDR by IDR mn
-                                    value={this.state.tempData === null ? '' : this.state.tempData.setting_group === "CURRENCY" ? Number(this.state.tempData.value) * 1000 : this.state.tempData.value}
+                                    value={this.state.tempData === null ? '' : this.state.tempData.setting_group === "CURRENCY" ? fixNumber(Number(this.state.tempData.value) * 1000) : this.state.tempData.value}
                                     inputProps={{
                                         min: 0,
                                         style: {

src/container/MasterData/Parameter/Parameter.js

@@ -14,6 +14,7 @@ import Constant from '../../../library/Constant';
 import PopUpDelete from '../../../library/PopUpDelete';
 import { css } from "@emotion/core";
 import PropagateLoader from "react-spinners/PropagateLoader"
+import { fixNumber, roundMath } from '../../../library/Utils';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -119,7 +120,7 @@ export default class Parameter extends Component {
                                 item.company_name,
                                 item.description,
                                 item.order,
-                                item.setting_group === "CURRENCY" ? Number(item.value) * 1000 : item.value, // convert IDR mn to IDR
+                                item.setting_group === "CURRENCY" ? fixNumber(Number(item.value) * 1000) : item.value, // convert IDR mn to IDR
                                 item.min_value,
                                 item.max_value,
                                 item.status

src/container/MonthlyReport/LOCFMR.js

@@ -149,7 +149,7 @@ export default class LOCF extends Component {
         if (this.props.dataTablelocf !== prevProps.dataTablelocf) {
             let array = this.props.dataTablelocf
             let datas = array[array.length - 1]
-            this.setState({ dataTable: this.props.dataTablelocf, diff: datas[47], loanTotal: datas[48], perBS: datas[49] })
+            this.setState({ dataTable: this.props.dataTablelocf, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(datas[47]), 1) : datas[47], loanTotal: datas[48], perBS: this.props.defaultCurrency.id == 1 ? fixNumber(Number(datas[49]), 1) : datas[49] })
         }
         if (this.props.loadingChild !== prevProps.loadingChild) {
             this.setState({ loading: this.props.loadingChild })
@@ -353,7 +353,7 @@ export default class LOCF extends Component {
                 // let sortingTable = dataTable.sort((a, b) => a[6].value - b[6].value)
                 // console.log(sortingTable);
                 let lastArray = dataTable[res.length - 1]
-                this.setState({ dataTable, diff: lastArray[47], loanTotal: lastArray[48], perBS: lastArray[49], loading: false, visibleLOCFMR: true }, () => {
+                this.setState({ dataTable, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[47]), 1) : lastArray[47], loanTotal: lastArray[48], perBS: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[49]), 1) : lastArray[49], loading: false, visibleLOCFMR: true }, () => {
                     this.props.sendToParent(dataTable, lastArray, 'LOCF')
                 })
             }
@@ -565,10 +565,8 @@ export default class LOCF extends Component {
                     console.log(dataTable);
 
                     let lastArray = dataTable[dataTable.length - 1]
-                    console.log(lastArray);
-                    this.setState({ dataTable, diff: lastArray[47], loanTotal: lastArray[48], perBS: lastArray[49], dataLoaded: true, loading: false, buttonError: false, dataDelete: [] }, () => {
-                        console.log(this.state.visibleLOCFMR);
-                        this.props.sendToParent(dataTable, lastArray , 'LOCF', 'upload', this.state.visibleLOCFMR)
+                    this.setState({ dataTable, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[47]), 1) : lastArray[47], loanTotal: lastArray[48], perBS: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[49]), 1) : lastArray[49], dataLoaded: true, loading: false, buttonError: false, dataDelete: [] }, () => {
+                        this.props.sendToParent(dataTable, lastArray, 'LOCF', 'upload', this.state.visibleLOCFMR)
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, typeAlert: 'warning', loading: false }, () => {
@@ -970,7 +968,7 @@ export default class LOCF extends Component {
         }
 
         const handleValueDropDown = (value, type, tableMeta) => {
-            let data = type == 'bankName' ? this.state.bankNameList.options : type ==  'typeOfCreditList' ? this.state.typeOfCreditList.options : this.state.businessBankList.options
+            let data = type == 'bankName' ? this.state.bankNameList.options : type == 'typeOfCreditList' ? this.state.typeOfCreditList.options : this.state.businessBankList.options
             let index = 0
             if (type == 'bankName' && dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] != null && dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] != "") {
                 indexNyasar = true
@@ -3619,7 +3617,7 @@ export default class LOCF extends Component {
                                     <Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
                                 </div>
                                 <div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
-                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > 0 ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
+                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff == 0 ? "0.0" : this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
                                 </div>
                             </div>
                         </div>

src/container/ProgressReport/ProgressReport.js

@@ -100,6 +100,7 @@ class ReportProgress extends Component {
                 MB.push({ name: String(i + 1), value: i + 1})
             }
         }
+        console.log(MB);
 
         let defaultPropsMB = {
             options: MB,