Skip to content

T
Tia-dev
Commit 7dfdce25 authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

pl tp mr

See merge request !748
parents e59b686a 0f7ed65f
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 77 deletions
src/container/MonthlyReport/ProfitLossMR.js
View file @ 7dfdce25
...@@ -680,7 +680,7 @@ export default class ProfitLossMR extends Component { ...@@ -680,7 +680,7 @@ export default class ProfitLossMR extends Component {
} }
} }
}, { }, {
name: "Rolling Outlook (FY 2021)", name: `Rolling Outlook (FY ${this.props.periode})`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ 7dfdce25
...@@ -197,7 +197,7 @@ export default class TaxPlanningMR extends Component { ...@@ -197,7 +197,7 @@ export default class TaxPlanningMR extends Component {
} else { } else {
this.setState({ dataTable, loading: false, editable: true }) this.setState({ dataTable, loading: false, editable: true })
} }
// console.log(this.state.dataTable) console.log(this.state.dataTable)
}) })
} }
...@@ -243,7 +243,7 @@ export default class TaxPlanningMR extends Component { ...@@ -243,7 +243,7 @@ export default class TaxPlanningMR extends Component {
} }
api.create('UPLOAD').createMonthlyReportTP(payload).then(response => { api.create('UPLOAD').createMonthlyReportTP(payload).then(response => {
// console.log(payload); console.log(payload);
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
...@@ -332,6 +332,7 @@ export default class TaxPlanningMR extends Component { ...@@ -332,6 +332,7 @@ export default class TaxPlanningMR extends Component {
}, },
item.trial_balance_fiscal_actual === null ? "0.0" : item.trial_balance_fiscal_actual === "" ? "0.0" : item.trial_balance_fiscal_actual, item.trial_balance_fiscal_actual === null ? "0.0" : item.trial_balance_fiscal_actual === "" ? "0.0" : item.trial_balance_fiscal_actual,
item.trial_balance_fiscal_mb === null ? "0.0" : item.trial_balance_fiscal_mb === "" ? "0.0" : item.trial_balance_fiscal_mb, item.trial_balance_fiscal_mb === null ? "0.0" : item.trial_balance_fiscal_mb === "" ? "0.0" : item.trial_balance_fiscal_mb,
item.actual_formula,
item.orders, item.orders,
{ tbc: item.condition_it_should_be.tbc, fcp: item.condition_it_should_be.fcp, tbf: item.condition_it_should_be.tbf }, { tbc: item.condition_it_should_be.tbc, fcp: item.condition_it_should_be.fcp, tbf: item.condition_it_should_be.tbf },
{ tbc: item.condition_if_wrong.tbc, fcp: item.condition_if_wrong.fcp, tbf: item.condition_if_wrong.tbf }, { tbc: item.condition_if_wrong.tbc, fcp: item.condition_if_wrong.fcp, tbf: item.condition_if_wrong.tbf },
...@@ -340,7 +341,7 @@ export default class TaxPlanningMR extends Component { ...@@ -340,7 +341,7 @@ export default class TaxPlanningMR extends Component {
}) })
this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, saveDraft: true }, () => { this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, saveDraft: true }, () => {
this.state.dataTable.map(item => { this.state.dataTable.map(item => {
if (item[15].length > 0) { if (item[16].length > 0) {
// console.log('masuk') // console.log('masuk')
this.setState({ buttonError: true, errorPreview: true, editable: true, saveDraft: true }) this.setState({ buttonError: true, errorPreview: true, editable: true, saveDraft: true })
} }
...@@ -1064,42 +1065,42 @@ export default class TaxPlanningMR extends Component { ...@@ -1064,42 +1065,42 @@ export default class TaxPlanningMR extends Component {
/> />
</div> </div>
: :
tableMeta.rowData[3] === 7 ? null tableMeta.rowData[3] === 7 ?
// (Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) <= Number(this.state.maxValue)) ? (Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) <= Number(this.state.maxValue)) ?
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ style={{
// fontSize: 12, fontSize: 12,
// textAlign: 'right', textAlign: 'right',
// borderColor: 'transparent', borderColor: 'transparent',
// margin: 0, margin: 0,
// width: 96, width: 96,
// backgroundColor: 'transparent', backgroundColor: 'transparent',
// color: 'black' color: 'black'
// }} }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={true}
// value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)}
// /> : /> :
// <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[13].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ style={{
// fontSize: 12, fontSize: 12,
// textAlign: 'right', textAlign: 'right',
// borderColor: 'transparent', borderColor: 'transparent',
// margin: 0, margin: 0,
// width: 96, width: 96,
// backgroundColor: 'transparent', backgroundColor: 'transparent',
// color: 'red' color: 'red'
// }} }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={true}
// value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)}
// /> />
// </LightTooltip> </LightTooltip>
: :
null null
} }
...@@ -1182,42 +1183,42 @@ export default class TaxPlanningMR extends Component { ...@@ -1182,42 +1183,42 @@ export default class TaxPlanningMR extends Component {
/> />
</div> </div>
: :
tableMeta.rowData[0] === 7 ? null tableMeta.rowData[0] === 7 ?
// (Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) <= Number(this.state.maxValue)) ? (Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) <= Number(this.state.maxValue)) ?
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ style={{
// fontSize: 12, fontSize: 12,
// textAlign: 'right', textAlign: 'right',
// borderColor: 'transparent', borderColor: 'transparent',
// margin: 0, margin: 0,
// width: 96, width: 96,
// backgroundColor: 'transparent', backgroundColor: 'transparent',
// color: 'black' color: 'black'
// }} }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={true}
// value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)}
// /> : /> :
// <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[13].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ style={{
// fontSize: 12, fontSize: 12,
// textAlign: 'right', textAlign: 'right',
// borderColor: 'transparent', borderColor: 'transparent',
// margin: 0, margin: 0,
// width: 96, width: 96,
// backgroundColor: 'transparent', backgroundColor: 'transparent',
// color: 'red' color: 'red'
// }} }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={true}
// value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)}
// /> />
// </LightTooltip> </LightTooltip>
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
...@@ -1331,7 +1332,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1331,7 +1332,7 @@ export default class TaxPlanningMR extends Component {
// disabled={true} // disabled={true}
// value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} // value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)}
// /> : // /> :
// <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[13].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> // <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
// <NumberFormat // <NumberFormat
// thousandSeparator={true} // thousandSeparator={true}
// style={{ // style={{
......
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