Skip to content

T
Tia-dev
Commit 201b8414 authored by EKSAD's avatar EKSAD
Browse files
Options

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

parents a368618e f6f26ae6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1034 additions and 2735 deletions
src/container/BudgetTahunan/CashFlow.js
View file @ 201b8414
......@@ -6,6 +6,7 @@ import ReactTooltip from 'react-tooltip';
import api from '../../api';
import Images from '../../assets/Images';
import * as R from 'ramda'
import { PropagateLoader } from 'react-spinners';
var ct = require("../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable3());
......@@ -35,7 +36,8 @@ export default class CashFlow extends Component {
constructor(props) {
super(props)
this.state = {
dataTable: []
dataTable: [],
loading: false
}
}
......@@ -142,22 +144,19 @@ export default class CashFlow extends Component {
// console.log(url);
let resReal = `https://tia.eksad.com/tia-reporting-dev/public/transaction/cash_flow/export_master_budget?submission_id=${this.props.submissionID}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&report_id=${this.props.report_id}`
let resNull = `https://tia.eksad.com/tia-reporting-dev/public/transaction/cash_flow/export_master_budget?submission_id=&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&report_id=${this.props.report_id}`
if (this.props.submissionID == null) {
console.log(resNull)
} else {
console.log(resReal)
}
let res = await fetch(
this.props.submissionID == null ? resNull : resReal
)
res = await res.blob()
this.setState({ loading: false })
if (res.size > 0) {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Master Budget Cash Flow.xlsx';
a.click();
this.setState({loading: false})
} else {
this.setState({loading: false})
}
}
......@@ -2143,6 +2142,18 @@ export default class CashFlow extends Component {
}
},
]
const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
<PropagateLoader
// css={override}
size={20}
color={"#274B80"}
loading={this.state.loading}
/>
</div>
);
return (
<div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
<div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
......@@ -2170,7 +2181,12 @@ export default class CashFlow extends Component {
borderColor: 'transparent',
margin: 5
}}
onClick={() => this.downloadAllData()}
onClick={() => this.setState({ loading: true }, () => {
this.downloadAllData()
// setTimeout(() => {
// this.setState({loading: false})
// }, 500);
})}
>
<img src={Images.download} />
</button>
......@@ -2181,13 +2197,14 @@ export default class CashFlow extends Component {
</div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{!this.state.loading && <MuiThemeProvider theme={getMuiTheme()}>
{this.state.loading && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
data={dataTable2}
columns={columns}
options={options}
/>
</MuiThemeProvider>}
</MuiThemeProvider>
</div>
</div>
</Paper>
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 201b8414
......@@ -90,6 +90,7 @@ export default class CorporateAnnualTarget extends Component {
this.getKPIType()
this.getMaxAch()
this.getLatestUpdate()
// console.log(this.props.status)
// // console.log(this.props.lastStatus);
}
......@@ -1119,7 +1120,7 @@ export default class CorporateAnnualTarget extends Component {
setCellProps: () => ({ style }),
customBodyRender: (val, tableMeta) => {
return (
tableMeta.rowData[1] == "" ?
handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta) && (tableMeta.rowData[1] == "" || String(this.props.status).toLocaleLowerCase() == 'draft' || String(this.props.status).toLocaleLowerCase() == 'submitted' || String(this.props.status).toLocaleLowerCase() == 'revision')?
<div style={{ textAlign: 'left', paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
{!this.state.loading && <FormControlLabel
style={{ margin: 0 }}
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 201b8414
This diff is collapsed.
src/container/Laporan/SubHolding.js
View file @ 201b8414
......@@ -291,7 +291,6 @@ export default class SubHolding extends Component {
item.formula,
item.level,
item.description,
item.profit_loss.notes === "" ? null : item.profit_loss.notes,
item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
item.profit_loss.january,
item.profit_loss.february,
......@@ -327,7 +326,6 @@ export default class SubHolding extends Component {
item.formula,
item.level,
item.description,
item.profit_loss.notes === "" ? null : item.profit_loss.notes,
item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
item.profit_loss.january,
item.profit_loss.february,
......
src/container/Laporan/TableSubHolding.js
View file @ 201b8414
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MonthlyReport.js
View file @ 201b8414
......@@ -13,6 +13,7 @@ import UploadFile from "../library/Upload";
import { format } from 'date-fns';
import BalanceSheetMR from './MonthlyReport/BalanceSheetMR';
import ProfitLossMR from './MonthlyReport/ProfitLossMR';
import TaxPlanningMR from './MonthlyReport/TaxPlanningMR';
export default class MonthlyReport extends Component {
constructor(props) {
......@@ -545,9 +546,18 @@ export default class MonthlyReport extends Component {
)}
{this.state.visibleTP && (
<TaxPlanning
open={this.props.open}
report_id={this.state.report_id}
height={this.props.height}
width={this.props.width}
company={this.state.company}
onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
revision={this.state.revisionTable}
periode={this.state.periode.periode}
submissionID={this.state.submissionID}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
// getReport={this.getCompanyActive.bind(this)}
// onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
/>
)}
{this.state.visibleFAM && (
......
src/container/Laporan/LBTaxPlanning.js → src/container/MonthlyReport/TaxPlanningMR.js
View file @ 201b8414
......@@ -39,7 +39,7 @@ const style2 = {
top: 0
};
export default class TaxPlanning extends Component {
export default class TaxPlanningMR extends Component {
constructor(props) {
super(props)
this.state = {
......
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @ 201b8414
......@@ -1989,7 +1989,7 @@ export default class BalanceSheet extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div>
{this.state.dataLoaded && (
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150), height: this.props.height - 400 }}>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150)}}>
{this.state.loading && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
......
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