Skip to content

T
Tia-dev
Commit 5f486deb authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev/riri' into 'ENV-DEV' 

update full amount banyak banget

See merge request !1990
parents 7ec0e39b 1d7b66ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10898 additions and 7277 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ 5f486deb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CashFlow.js
View file @ 5f486deb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 5f486deb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/ProfitLoss.js
View file @ 5f486deb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/TaxPlanning.js
View file @ 5f486deb
This diff is collapsed.
src/container/MonthlyReport/CashFlowMR.js
View file @ 5f486deb
......@@ -10,6 +10,7 @@ import { PropagateLoader } from 'react-spinners';
import { ExcelRenderer } from 'react-excel-renderer';
import Constant from '../../library/Constant';
import UploadFile from "../../library/Upload";
import { fixNumber } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({
tooltip: {
......@@ -222,7 +223,7 @@ export default class CashFlowMR extends Component {
// item[6].value = this.handleValueFormula(item, index)
listCF.push({
"item_report_id": item[1],
"actual": item[0] == 1 ? "" : Number(item[6].value).toFixed(1)
"actual": item[0] == 1 ? "" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(item[6].value), 1) : Number(item[6].value)
})
// } else {
// listCF.push({
......@@ -609,7 +610,7 @@ export default class CashFlowMR extends Component {
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
value={this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)) : this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
/>
</span>
:
......@@ -624,24 +625,8 @@ export default class CashFlowMR extends Component {
// value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
// />
// </span>
(Number(handleValueFormula(tableMeta, 6)).toFixed(1) > Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)).toFixed(1) < Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
/> :
<LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
this.props.defaultCurrency.id == 1 ?
(fixNumber(Number(handleValueFormula(tableMeta, 6)), 1) > Number(this.state.minValue) && fixNumber(Number(handleValueFormula(tableMeta, 6)), 1) < Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
style={{
......@@ -651,14 +636,67 @@ export default class CashFlowMR extends Component {
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'red'
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
/>
</LightTooltip>
value={this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)}
/> :
<LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'red'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)}
/>
</LightTooltip>
:
(Number(handleValueFormula(tableMeta, 6)) > Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)) < Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
/> :
<LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'red'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
/>
</LightTooltip>
: null}
</div>
)
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ 5f486deb
......@@ -2051,6 +2051,7 @@ export default class CorporateAnnualTargetMR extends Component {
/>
</MuiThemeProvider>
)}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5 }}>
<div>
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 5f486deb
......@@ -2565,9 +2565,9 @@ export default class MonthlyReport extends Component {
:
// {
(tableMeta.rowData[5] ?
// (tableMeta.rowData[5] ?
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
: null)
// : null)
// console.log(tableMeta.rowData)
// }
......
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ 5f486deb
......@@ -1758,6 +1758,7 @@ export default class OperatingIndicatorMR extends Component {
/>
</MuiThemeProvider>
}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 5f486deb
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment