Skip to content

T
Tia-dev
Commit c2f65102 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-' into 'master' 

createCF+quartal+CAT

See merge request !1357
parents 4bedd07a a66410f6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3280 additions and 2857 deletions
src/api/index.js
View file @ c2f65102
......@@ -282,6 +282,7 @@ const create = (type = "") => {
const submitRollingOutlook = (body) => api.post('transaction/rolling_outlook/submit_rolling_outlook', body)
const getRollingOutlookCompanySubmitted = (body) => api.post('transaction/rolling_outlook/get_company_submitted', body)
const getRollingOutlookCF = (body) => api.post('transaction/cash_flow/rolling_outlook/get_report_hierarki', body)
const createRollingOutlookCF = (body) => api.post('transaction/cash_flow/rolling_outlook/create_rolling_outlook', body)
//REPORT NEW
const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
......@@ -784,7 +785,8 @@ const create = (type = "") => {
approvalRolling,
createPeriodeRevisionRO,
historyApprovalRO,
getRollingOutlookCF
getRollingOutlookCF,
createRollingOutlookCF
}
}
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ c2f65102
......@@ -62,6 +62,7 @@ export default class BalanceSheetRO extends Component {
}
componentDidMount() {
console.log(this.props);
// this.getItemHierarki()
this.getLatestUpdate()
this.getSettingControl()
......@@ -1065,6 +1066,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 6)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1196,6 +1198,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 7)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 7)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1327,6 +1330,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 8)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 8)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1458,6 +1462,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 9)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 9)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1589,6 +1594,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 10)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 10)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1720,6 +1726,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 11)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 11)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1851,6 +1858,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 12)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 12)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -1982,6 +1990,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 13)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 13)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -2113,6 +2122,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 14)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 14)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......@@ -2244,6 +2254,7 @@ export default class BalanceSheetRO extends Component {
/>
</div> :
tableMeta.rowData[0] === 7 ?
this.props.quarter === 'q3' ? null :
(Number(handleValueFormula(tableMeta, 15)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 15)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
......
src/container/RollingOutlook/CashFlowRO.js
View file @ c2f65102
This diff is collapsed.
src/container/RollingOutlook/CatRevision.js
View file @ c2f65102
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