Skip to content

T
Tia-dev
Commit 25358045 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents 16c0057b bfb82284
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3298 additions and 2873 deletions
src/api/index.js
View file @ 25358045
...@@ -282,6 +282,7 @@ const create = (type = "") => { ...@@ -282,6 +282,7 @@ const create = (type = "") => {
const submitRollingOutlook = (body) => api.post('transaction/rolling_outlook/submit_rolling_outlook', body) 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 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 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 //REPORT NEW
const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body) const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
...@@ -784,7 +785,8 @@ const create = (type = "") => { ...@@ -784,7 +785,8 @@ const create = (type = "") => {
approvalRolling, approvalRolling,
createPeriodeRevisionRO, createPeriodeRevisionRO,
historyApprovalRO, historyApprovalRO,
getRollingOutlookCF getRollingOutlookCF,
createRollingOutlookCF
} }
} }
......
src/container/OprIndicator/OperatingIndicator.js
View file @ 25358045
...@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component { ...@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component {
borderColor: 'transparent' borderColor: 'transparent'
}} }}
onClick={() => onClick={() =>
tableMeta.rowData[4] ? // tableMeta.rowData[4] ?
this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2]) this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2])
: // :
null // null
} }
> >
<Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography> <Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
......
src/container/RollingOutlook.js
View file @ 25358045
...@@ -890,17 +890,19 @@ export default class RollingOutlook extends Component { ...@@ -890,17 +890,19 @@ export default class RollingOutlook extends Component {
<span>COMPLETED</span> : <span>COMPLETED</span> :
val === "draft" ? val === "draft" ?
<span>DRAFT</span> : <span>DRAFT</span> :
val === "revision" ? val === "incomplete" ?
<span>REVISION</span> : <span>INCOMPLETE</span> :
val === "approval_proccess" ? val === "revision" ?
<span>APPROVAL PROCCESS</span> : <span>REVISION</span> :
val === "approval_review" ? val === "approval_process" ?
<span>APPROVAL REVIEW</span> : <span>APPROVAL PROCCESS</span> :
val === "not-yet" ? val === "approval_review" ?
<span>OPEN</span> : <span>APPROVAL REVIEW</span> :
val === "CLOSED" ? val === "not-yet" ?
<span>CLOSED</span> : <span>OPEN</span> :
<img src={Images.cross} style={{ width: 31, height: 24 }} /> val === "CLOSED" ?
<span>CLOSED</span> :
<img src={Images.cross} style={{ width: 31, height: 24 }} />
} }
</div > </div >
); );
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ 25358045
...@@ -62,6 +62,7 @@ export default class BalanceSheetRO extends Component { ...@@ -62,6 +62,7 @@ export default class BalanceSheetRO extends Component {
} }
componentDidMount() { componentDidMount() {
console.log(this.props);
// this.getItemHierarki() // this.getItemHierarki()
this.getLatestUpdate() this.getLatestUpdate()
this.getSettingControl() this.getSettingControl()
...@@ -1065,6 +1066,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1065,6 +1066,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 6)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1196,6 +1198,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1196,6 +1198,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 7)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 7)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1327,6 +1330,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1327,6 +1330,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 8)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 8)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1458,6 +1462,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1458,6 +1462,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 9)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 9)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1589,6 +1594,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1589,6 +1594,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 10)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 10)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1720,6 +1726,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1720,6 +1726,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 11)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 11)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1851,6 +1858,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1851,6 +1858,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 12)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 12)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1982,6 +1990,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1982,6 +1990,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 13)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 13)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -2113,6 +2122,7 @@ export default class BalanceSheetRO extends Component { ...@@ -2113,6 +2122,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 14)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 14)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -2244,6 +2254,7 @@ export default class BalanceSheetRO extends Component { ...@@ -2244,6 +2254,7 @@ export default class BalanceSheetRO extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 7 ? 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)) ? (Number(handleValueFormula(tableMeta, 15)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 15)).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
......
src/container/RollingOutlook/CashFlowRO.js
View file @ 25358045
This diff is collapsed.
src/container/RollingOutlook/CatRevision.js
View file @ 25358045
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/RollingOutlook/OperatingIndicatorRO.js
View file @ 25358045
...@@ -2138,7 +2138,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -2138,7 +2138,7 @@ export default class OperatingIndicatorRO extends Component {
</button> </button>
</div> </div>
{!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}> {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
{this.state.get_for == 'view' && this.state.viewOnly && {this.state.get_for == 'view' &&
<button <button
type="button" type="button"
onClick={() => { onClick={() => {
......
src/container/RollingOutlook/ProfitLossRO.js
View file @ 25358045
...@@ -444,7 +444,7 @@ export default class ProfitLossROO extends Component { ...@@ -444,7 +444,7 @@ export default class ProfitLossROO extends Component {
orders: i[0] === undefined ? "" : String(i[0]).trim(), orders: i[0] === undefined ? "" : String(i[0]).trim(),
"item_report_id": i[1] === undefined ? 0 : i[1], "item_report_id": i[1] === undefined ? 0 : i[1],
"item_report": i[2] === undefined ? "" : String(i[2]).trim(), "item_report": i[2] === undefined ? "" : String(i[2]).trim(),
"notes": i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[3]).trim(), "notes": i[3] === undefined ? "" : reg.test(String(i[3])) === false ? "" : String(i[3]).trim(),
"january": i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[4]).trim(), "january": i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[4]).trim(),
"february": i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[5]).trim(), "february": i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[5]).trim(),
"march": i[6] === undefined ? "0" : reg.test(String(i[6])) === false ? "0" : String(i[6]).trim(), "march": i[6] === undefined ? "0" : reg.test(String(i[6])) === false ? "0" : String(i[6]).trim(),
......
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