Skip to content

T
Tia-dev
Commit 04a7e44e authored by d.arizona's avatar d.arizona
Browse files
Options

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

parents 402123ae 4c446470
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 96 deletions
src/api/index.js
View file @ 04a7e44e
......@@ -260,8 +260,8 @@ const create = (type = "") => {
const createRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/create_rolling_outlook', body)
const checkImportRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/check_import', body)
const importRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/import_rolling_outlook', body)
const getRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/get_report_hierarki', body)
const createRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/store_ro_tax_planning', body)
const getRollingOutlookTP = (body) => api.post('transaction/tax_planning/rolling_outlook/get_report_hierarki', body)
const createRollingOutlookTP = (body) => api.post('transaction/tax_planning/rolling_outlook/create_rolling_outlook', body)
const getRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/get_report_hierarki', body)
const createRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/create_rolling_outlook', body)
const checkImportRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/check_import', body)
......
src/container/RollingOutlook/OperatingIndicatorRO.js
View file @ 04a7e44e
......@@ -173,9 +173,9 @@ export default class OperatingIndicatorRO extends Component {
item.level,
item.description,
item.uom,
item.rolling_outlook.january,
item.rolling_outlook.february,
item.rolling_outlook.march,
item.rolling_outlook.january === "" ? "0" : item.rolling_outlook.january,
item.rolling_outlook.february === "" ? "0" : item.rolling_outlook.february,
item.rolling_outlook.march === "" ? "0" : item.rolling_outlook.march,
item.rolling_outlook.april === "" ? "0" : item.rolling_outlook.april,
item.rolling_outlook.may === "" ? "0" : item.rolling_outlook.may,
item.rolling_outlook.june === "" ? "0" : item.rolling_outlook.june,
......@@ -206,9 +206,9 @@ export default class OperatingIndicatorRO extends Component {
item.level,
item.description,
item.uom,
item.rolling_outlook.january,
item.rolling_outlook.february,
item.rolling_outlook.march,
item.rolling_outlook.january === "" ? "0" : item.rolling_outlook.january,
item.rolling_outlook.february === "" ? "0" : item.rolling_outlook.february,
item.rolling_outlook.march === "" ? "0" : item.rolling_outlook.march,
item.rolling_outlook.april === "" ? "0" : item.rolling_outlook.april,
item.rolling_outlook.may === "" ? "0" : item.rolling_outlook.may,
item.rolling_outlook.june === "" ? "0" : item.rolling_outlook.june,
......@@ -827,7 +827,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={ value === "" ? "" : Number(handleParent(tableMeta)).toFixed(1)}
value={ value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -846,7 +846,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={ value === "" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
value={ value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -868,7 +868,7 @@ export default class OperatingIndicatorRO extends Component {
type="text"
placeholder=""
// value={Number(value).toFixed(1)}
value={value === "" ? "" : Number(value).toFixed(1)}
value={value === "0" ? "" : Number(value).toFixed(1)}
decimalScale={1}
disabled={true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -923,7 +923,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={ value === "" ? "" :Number(handleParent(tableMeta)).toFixed(1)}
value={ value === "0" ? "" :Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -942,7 +942,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={ value === "" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
value={ value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -964,7 +964,7 @@ export default class OperatingIndicatorRO extends Component {
type="text"
placeholder=""
// value={Number(value).toFixed(1)}
value={value === "" ? "" : Number(value).toFixed(1)}
value={value === "0" ? "" : Number(value).toFixed(1)}
decimalScale={1}
disabled={true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -1018,7 +1018,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={ value === "" ? "" : Number(handleParent(tableMeta)).toFixed(1)}
value={ value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1037,7 +1037,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value === "" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
value={value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1058,7 +1058,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value === "" ? "" : Number(value).toFixed(1)}
value={value === "0" ? "" : Number(value).toFixed(1)}
// value={Number(value).toFixed(1)}
decimalScale={1}
disabled={true}
......@@ -1113,7 +1113,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleParent(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1132,7 +1132,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleFormula(tableMeta)).toFixed(1)}
value={ this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1153,7 +1153,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ color: this.props.quartal == 'q1'? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(value).toFixed(1)}
decimalScale={1}
disabled={this.props.quartal == 'q1'? false : true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -1206,7 +1206,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleParent(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1225,7 +1225,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleFormula(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1246,7 +1246,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ color: this.props.quartal == 'q1'? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(value).toFixed(1)}
decimalScale={1}
disabled={this.props.quartal == 'q1'? false : true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -1299,7 +1299,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleParent(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1318,7 +1318,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleFormula(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1339,7 +1339,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ color: this.props.quartal == 'q1'? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(value).toFixed(1)}
decimalScale={1}
disabled={this.props.quartal == 'q1'? false : true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -1392,7 +1392,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleParent(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1411,7 +1411,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleFormula(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1432,7 +1432,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ color: this.props.quartal == 'q1' || this.props.quartal == 'q2'? "#5198ea" : '#555252' , fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(value).toFixed(1)}
decimalScale={1}
disabled={this.props.quartal == 'q1' || this.props.quartal == 'q2'? false : true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -1485,7 +1485,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleParent(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1504,7 +1504,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleFormula(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1525,7 +1525,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ color: this.props.quartal == 'q1' || this.props.quartal == 'q2'? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(value).toFixed(1)}
decimalScale={1}
disabled={this.props.quartal == 'q1' || this.props.quartal == 'q2'? false : true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -1578,7 +1578,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleParent(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
/>
......@@ -1597,7 +1597,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(handleFormula(tableMeta)).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
......@@ -1618,7 +1618,7 @@ export default class OperatingIndicatorRO extends Component {
style={{ color: this.props.quartal == 'q1' || this.props.quartal == 'q2'? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(value).toFixed(1)}
decimalScale={1}
disabled={this.props.quartal == 'q1' || this.props.quartal == 'q2'? false : true}
// disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
......@@ -2045,12 +2045,7 @@ export default class OperatingIndicatorRO extends Component {
{!this.state.emptyData && <div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.data.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode}
{
this.props.quartal === "q1" ? ' Q1 ' :
this.props.quartal === "q2" ? ' Q2 ' :
this.props.quartal === "q3" ? ' Q3 ' : ''
}
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode} {String(this.props.quartal).toLocaleUpperCase()}
</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div>
......@@ -2234,12 +2229,7 @@ export default class OperatingIndicatorRO extends Component {
<div style={{ padding: 25 }}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.data.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode}
{
this.props.quartal === "q1" ? ' Q1 ' :
this.props.quartal === "q2" ? ' Q2 ' :
this.props.quartal === "q3" ? ' Q3 ' : ''
}
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode} {String(this.props.quartal).toLocaleUpperCase()}
</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div>
......
src/container/RollingOutlook/ProfitLossRO.js
View file @ 04a7e44e
......@@ -246,9 +246,9 @@ export default class ProfitLossROO extends Component {
item.description,
item.profit_loss.notes,
item.profit_loss.last_year_total === "" ? "0" : item.profit_loss.last_year_total,
item.profit_loss.january,
item.profit_loss.february,
item.profit_loss.march,
item.profit_loss.january === "" ? "0" : item.profit_loss.january,
item.profit_loss.february === "" ? "0" : item.profit_loss.february,
item.profit_loss.march === "" ? "0" : item.profit_loss.march,
item.profit_loss.april === "" ? "0" : item.profit_loss.april,
item.profit_loss.may === "" ? "0" : item.profit_loss.may,
item.profit_loss.june === "" ? "0" : item.profit_loss.june,
......@@ -281,9 +281,9 @@ export default class ProfitLossROO extends Component {
item.description,
item.profit_loss.notes,
item.profit_loss.last_year_total === "" ? "0" : item.profit_loss.last_year_total,
item.profit_loss.january,
item.profit_loss.february,
item.profit_loss.march,
item.profit_loss.january === "" ? "0" : item.profit_loss.january,
item.profit_loss.february === "" ? "0" : item.profit_loss.february,
item.profit_loss.march === "" ? "0" : item.profit_loss.march,
item.profit_loss.april === "" ? "0" : item.profit_loss.april,
item.profit_loss.may === "" ? "0" : item.profit_loss.may,
item.profit_loss.june === "" ? "0" : item.profit_loss.june,
......@@ -1040,7 +1040,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={val === "" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)}
value={val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1057,7 +1057,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={true}
value={val === "" ? "" : Number(val).toFixed(1)}
value={val === "0" ? "" : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1078,7 +1078,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={val === "" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1095,7 +1095,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={val === "" ? "" : Number(val).toFixed(1)}
value={val === "0" ? "" : Number(val).toFixed(1)}
/>
}
/>
......@@ -1138,7 +1138,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={val === "" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)}
value={val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1155,7 +1155,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={true}
value={val === "" ? "" : Number(val).toFixed(1)}
value={val === "0" ? "" : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1176,7 +1176,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={val === "" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1193,7 +1193,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={val === "" ? "" : Number(val).toFixed(1)}
value={val === "0" ? "" : Number(val).toFixed(1)}
/>
}
/>
......@@ -1236,7 +1236,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={val === "" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)}
value={val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1253,7 +1253,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={true}
value={val === "" ? "" : Number(val).toFixed(1)}
value={val === "0" ? "" : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1274,7 +1274,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={val === "" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1291,7 +1291,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={val === "" ? "" : Number(val).toFixed(1)}
value={val === "0" ? "" : Number(val).toFixed(1)}
/>
}
/>
......@@ -1334,7 +1334,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1351,7 +1351,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={this.props.quarter == 'q1'? false : true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1372,7 +1372,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1389,7 +1389,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
/>
}
/>
......@@ -1432,7 +1432,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1449,7 +1449,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={this.props.quarter == 'q1'? false : true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1470,7 +1470,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1487,7 +1487,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
/>
}
/>
......@@ -1530,7 +1530,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1547,7 +1547,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={this.props.quarter == 'q1'? false : true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1568,7 +1568,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1585,7 +1585,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
/>
}
/>
......@@ -1628,7 +1628,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1645,7 +1645,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={this.props.quarter == 'q1' || this.props.quarter == 'q2'? false : true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1666,7 +1666,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1683,7 +1683,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
/>
}
/>
......@@ -1726,7 +1726,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1743,7 +1743,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={this.props.quarter == 'q1' || this.props.quarter == 'q2'? false : true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1764,7 +1764,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1781,7 +1781,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
/>
}
/>
......@@ -1824,7 +1824,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
disabled={true}
// value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/>
</span>
:
......@@ -1841,7 +1841,7 @@ export default class ProfitLossROO extends Component {
placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={this.props.quarter == 'q1' || this.props.quarter == 'q2'? false : true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta)
}}
......@@ -1862,7 +1862,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
......@@ -1879,7 +1879,7 @@ export default class ProfitLossROO extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(val).toFixed(1)}
/>
}
/>
......@@ -2316,7 +2316,7 @@ export default class ProfitLossROO extends Component {
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div>
<div style={{ width: '50%' }}>
......@@ -2540,7 +2540,7 @@ export default class ProfitLossROO extends Component {
<div style={{ padding: 20 }}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
......
src/container/RollingOutlook/TaxPlanningRO.js
View file @ 04a7e44e
......@@ -3776,7 +3776,8 @@ export default class TaxPlanning extends Component {
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Trial Balance (Commercial) MTD"}</span>
</div>
&&
: null }
{this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Fiscal Correction Positive /(Negative)"}</span>
</div>
......@@ -3937,7 +3938,8 @@ export default class TaxPlanning extends Component {
}
</div>
</div>
&&
: null }
{this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
<div className="col-2">
<div style={{ textAlign: 'right' }}>
{
......@@ -4226,7 +4228,8 @@ export default class TaxPlanning extends Component {
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Trial Balance (Commercial) MTD"}</span>
</div>
&&
: null }
{this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Fiscal Correction Positive /(Negative)"}</span>
</div>
......@@ -4387,7 +4390,8 @@ export default class TaxPlanning extends Component {
}
</div>
</div>
&&
: null }
{this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
<div className="col-2">
<div style={{ textAlign: 'right' }}>
{
......@@ -6154,7 +6158,7 @@ export default class TaxPlanning extends Component {
name: `${this.props.periode}`,
options: {
customHeadRender: (columnMeta) => (
<div style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 200, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 200, borderRight: "1px solid rgb(255, 255, 255)" }} >
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell> */}
......
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