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
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
......@@ -93,7 +93,7 @@ export default class TaxPlanning extends Component {
"submission_id": this.props.submissionID
}
api.create().getDetailReportMB(payload).then(response => {
console.log(payload);
// console.log(response);
let dataTable = []
if (response.data) {
let res = response.data.data
......@@ -815,12 +815,8 @@ export default class TaxPlanning extends Component {
if (dataTable2[indexID][24] == tableMeta.rowData[24]) {
anjay.push(0)
} else {
// console.log(dataTable2[indexID][tableMeta.columnIndex]);
let data = dex == 1 ? dataTable2[indexID][tableMeta.columnIndex].tbc : dex == 2 ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf
let valuezz = data.value == undefined ? data : data.value
// console.log(data);
// console.log(data.value);
// console.log(valuezz);
anjay.push(valuezz == "" ? 0 : valuezz)
}
......@@ -1010,23 +1006,32 @@ export default class TaxPlanning extends Component {
}
const handleTotal = (tableMeta, dex) => {
let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 9 && index <= 20) {
if ( tableMeta.rowData[3] === 5 || tableMeta.rowData[3] === 6 || tableMeta.rowData[3] === 7 ) {
let valItem = item.tbf.value == undefined || item.tbf.value == "" || item.tbf.value == "undefined" ? 0.0 : item.tbf.value
total += Number(valItem)
} else {
if (tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date"){
let totalfcp = 0
if (String(tableMeta.rowData[8]).toLowerCase() === "fiscal correction positive / (negative) year to date"){
dataTable2[tableMeta.rowIndex -2].map((item, index) => {
if (index >= 9 && index <= 20) {
if ( dataTable2[tableMeta.rowIndex -2][2] === 5 || dataTable2[tableMeta.rowIndex -2][2] === 6 || dataTable2[tableMeta.rowIndex -2][2] === 7 ) {
let valItem = item.fcp.value == undefined || item.fcp.value == "" || item.fcp.value == "undefined" ? 0.0 : item.fcp.value
total += Number(valItem)
} else {
let valItem = item.fcp == undefined || item.fcp == "" || item.fcp == "undefined" ? 0.0 : item.fcp
total += Number(valItem)
}
}
})
} else {
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 9 && index <= 20) {
if ( tableMeta.rowData[3] === 5 || tableMeta.rowData[3] === 6 || tableMeta.rowData[3] === 7 ) {
let valItem = item.tbf.value == undefined || item.tbf.value == "" || item.tbf.value == "undefined" ? 0.0 : item.tbf.value
total += Number(valItem)
} else {
let valItem = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf
total += Number(valItem)
}
}
}
})
})
}
dataTable2[tableMeta.rowIndex][21] = Number(total).toFixed(1)
return total
}
......@@ -1150,20 +1155,6 @@ export default class TaxPlanning extends Component {
let total = 0
dataTable2.map((item, index) => {
if (item[5] == tableMeta.rowData[4]) {
// if (type == 1) {
// console.log(item[tableMeta.columnIndex].tbc.value)
// console.log(item[tableMeta.columnIndex].tbc)
// } else
// if (type == 2) {
// console.log(item[tableMeta.columnIndex].fcp.value)
// console.log(item[tableMeta.columnIndex].fcp)}
// console.log(type)
// if (type == 3) {
// console.log(item[tableMeta.columnIndex].tbf.value)
// console.log(item[tableMeta.columnIndex].tbf)
// }
// console.log(item[4])
// console.log(tableMeta.rowData[5])
total += Number(type == 1 ?
item[tableMeta.columnIndex].tbc.value == undefined ? Number(item[tableMeta.columnIndex].tbc == "" || item[tableMeta.columnIndex].tbc == "0.0" ? 0 : item[tableMeta.columnIndex].tbc) : Number(item[tableMeta.columnIndex].tbc.value == "" || item[tableMeta.columnIndex].tbc.value == "0.0" ? 0 : item[tableMeta.columnIndex].tbc.value)
:
......@@ -1310,7 +1301,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 0)
// console.log(dataTable2)
// // console.log(dataTable2)
}}
/>
}
......@@ -2714,7 +2705,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -3140,7 +3131,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -3272,7 +3263,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -3567,7 +3558,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -3699,7 +3690,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -3994,7 +3985,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -4126,7 +4117,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -4421,7 +4412,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -4553,7 +4544,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -4848,7 +4839,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -4980,7 +4971,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -5275,7 +5266,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -5407,7 +5398,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -5702,7 +5693,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -5834,7 +5825,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......@@ -6129,7 +6120,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 1)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
......@@ -6261,7 +6252,7 @@ export default class TaxPlanning extends Component {
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 2)
console.log(dataTable2)
// console.log(dataTable2)
}}
/>
}
......
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