Skip to content

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

Merge branch 'deni-dev(pc)' into 'master' 

yby

See merge request !568
parents d9b4f2bb caa2c6ee
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 105 deletions
src/container/BudgetTahunan.js
View file @ eb04029d
......@@ -1345,7 +1345,7 @@ export default class BudgetTahunan extends Component {
periode={this.state.periode.periode}
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })}
getReport={this.getSubmission.bind(this)}
isApprover={this.state.isApprover}
status={this.state.status}
......
src/container/BudgetTahunan/CashFlow.js
View file @ eb04029d
......@@ -42,7 +42,7 @@ export default class CashFlow extends Component {
}
componentDidMount() {
this.setState({loading: true})
this.setState({ loading: true })
this.getItemHierarki()
}
......@@ -87,9 +87,9 @@ export default class CashFlow extends Component {
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
item.cash_flow.forecast_formula == null? [] : item.cash_flow.forecast_formula
item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
])
if (item.children !== null) {
if (item.children.length > 0) {
item.children.map((items, indexs) => {
......@@ -125,7 +125,7 @@ export default class CashFlow extends Component {
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
item.cash_flow.forecast_formula == null? [] : item.cash_flow.forecast_formula
item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -154,9 +154,9 @@ export default class CashFlow extends Component {
a.href = url;
a.download = 'Master Budget Cash Flow.xlsx';
a.click();
this.setState({loading: false})
this.setState({ loading: false })
} else {
this.setState({loading: false})
this.setState({ loading: false })
}
}
......@@ -188,13 +188,13 @@ export default class CashFlow extends Component {
})
baru.map((item, index) => {
if (item == '-' || item == '+' || item == '/' || item == '*'|| item == '(' || item == ')') {
if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') {
anjay.push(item)
} else {
if (String(item).includes('#')) {
if (forecast !== undefined) {
let forecastt = 0
forecast.map((items,index) => {
forecast.map((items, index) => {
if (items.periode == periode) {
forecastt += Number(items.value)
}
......@@ -206,7 +206,7 @@ export default class CashFlow extends Component {
let data = column == 7 ? 18 : column - 1
let period = data == 18 ? Number(this.props.periode) - 1 : this.props.periode
let indexID = tableMeta.rowData[data].formula.findIndex((val) => val.item_formula == String(`@${tst}`) && val.periode == period)
if (indexID !== -1) {
let valuezz = tableMeta.rowData[data].formula[indexID].value
anjay.push(valuezz == "" ? 0 : valuezz)
......@@ -219,7 +219,7 @@ export default class CashFlow extends Component {
}
}
}
} else {
let indexID = dataTable2.findIndex((val) => val[22] == item)
if (indexID !== -1) {
......@@ -243,7 +243,7 @@ export default class CashFlow extends Component {
let anjay2 = []
let kurung = false
let item1 = []
anjay.map((item,index) => {
anjay.map((item, index) => {
if (item == "(") {
kurung = true
} else if (item == ")") {
......@@ -295,7 +295,7 @@ export default class CashFlow extends Component {
}
})
if (index == anjay2.length -1) {
if (index == anjay2.length - 1) {
if (opt == "tambah") {
total = Number(total) + Number(totalPrio)
} else if (opt == "kurang") {
......@@ -309,7 +309,7 @@ export default class CashFlow extends Component {
}
}
} else {
// console.log(item.length)
// console.log(item.length)
if (item == "+") {
opt = "tambah"
if (prio) {
......@@ -381,8 +381,8 @@ export default class CashFlow extends Component {
const handleForecast = (tableMeta, periode, column) => {
let total = 0
// console.log(column)
// console.log(tableMeta.rowData)
// console.log(tableMeta.rowIndex)
// console.log(total)
// dataTable2[tableMeta.rowIndex][column] = total
......@@ -393,31 +393,31 @@ export default class CashFlow extends Component {
let columns = [
{
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "(In Rupiah million)",
options: {
customHeadRender: (columnMeta) => (
......@@ -460,7 +460,7 @@ export default class CashFlow extends Component {
name: `MB 2021`,
options: {
customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102 , fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
<th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
{/* <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> */}
......@@ -493,7 +493,7 @@ export default class CashFlow extends Component {
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"8"}</span>
</div>
</div>
<div className="column-3 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center', backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
......@@ -509,7 +509,7 @@ export default class CashFlow extends Component {
<span>{"12"}</span>
</div>
</div>
</div>
</th>
),
......@@ -656,7 +656,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -672,7 +672,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -769,7 +769,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -785,7 +785,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -882,7 +882,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -898,7 +898,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1007,7 +1007,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1023,7 +1023,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1130,7 +1130,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1146,7 +1146,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1253,7 +1253,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1269,7 +1269,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1376,7 +1376,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1392,7 +1392,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1473,7 +1473,7 @@ export default class CashFlow extends Component {
null
}
</div>
</div>
</div>
<div className="grid grid-4x content-center">
<div className="col-1">
{tableMeta.rowData[0] === 3 ?
......@@ -1501,7 +1501,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1517,7 +1517,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1624,7 +1624,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1640,7 +1640,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1747,7 +1747,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1763,7 +1763,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1870,7 +1870,7 @@ export default class CashFlow extends Component {
:
// null
tableMeta.rowData[0] === 5 ?
// null
// null
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1886,7 +1886,7 @@ export default class CashFlow extends Component {
null
:
tableMeta.rowData[0] === 6 ?
// null
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -2165,48 +2165,70 @@ export default class CashFlow extends Component {
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan - Cash Flow</Typography>
</div>
<div style={{ padding: 20 }}>
<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' }}>in IDR mn</Typography>
</div>
<div style={{ width: '50%' }}>
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download'} data-for="download">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
margin: 5
}}
onClick={() => this.setState({ loading: true }, () => {
this.downloadAllData()
// setTimeout(() => {
// this.setState({loading: false})
// }, 500);
})}
>
<img src={Images.download} />
</button>
</a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
</div>
<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' }}>in IDR mn</Typography>
</div>
<div style={{ width: '50%' }}>
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download'} data-for="download">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
margin: 5
}}
onClick={() => this.setState({ loading: true }, () => {
this.downloadAllData()
// setTimeout(() => {
// this.setState({loading: false})
// }, 500);
})}
>
<img src={Images.download} />
</button>
</a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
</div>
</div>
</div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{this.state.loading && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
data={dataTable2}
columns={columns}
options={options}
/>
</MuiThemeProvider>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{this.state.loading && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
data={dataTable2}
columns={columns}
options={options}
/>
</MuiThemeProvider>
</div>
<div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1">
<button
type="button"
onClick={() => this.setState({ loading: true }, () => {
setTimeout(() => {
this.props.onClickClose()
}, 100);
})}
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
outline: 'none'
}}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
</div>
</button>
</div>
</div>
</div>
</Paper>
</div>
</div>
......
src/container/Laporan/SubHolding.js
View file @ eb04029d
......@@ -489,7 +489,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Report DB Profit $ Loss.xlsx';
a.download = 'Report DB Profit & Loss.xlsx';
a.click();
}
} else {
......
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