Skip to content

T
Tia-dev
Commit 99d74bb3 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

parents cfbaf446 ebf07473
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 91 deletions
src/container/MasterData/Parameter/Parameter.js
View file @ 99d74bb3
......@@ -224,7 +224,7 @@ export default class Parameter extends Component {
downloadFile = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=ParameterTemplate&&fileType=xlsx"
`${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=ParameterTemplate&&fileType=xlsx`
)
res = await res.blob()
// console.log(res)
......@@ -239,7 +239,7 @@ export default class Parameter extends Component {
downloadDataTable = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/setting/export_setting"
`${process.env.REACT_APP_URL_MAIN_BE}/public/setting/export_setting`
)
res = await res.blob()
// console.log(res)
......
src/container/MasterData/Perusahaan/Perusahaan.js
View file @ 99d74bb3
......@@ -468,7 +468,7 @@ export default class Perusahaan extends Component {
downloadFile = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=CompanyTemplate&&fileType=xlsx"
`${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=CompanyTemplate&&fileType=xlsx`
)
res = await res.blob()
console.log(res)
......@@ -483,7 +483,7 @@ export default class Perusahaan extends Component {
downloadDataTable = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/company/export_company"
`${process.env.REACT_APP_URL_MAIN_BE}/public/company/export_company`
)
res = await res.blob()
console.log(res)
......
src/container/MasterData/ReportItems.js
View file @ 99d74bb3
......@@ -752,7 +752,7 @@ export default class ReportItems extends Component {
downloadFile = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=ItemReportTemplate&&fileType=xlsx"
`${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=ItemReportTemplate&&fileType=xlsx`
)
res = await res.blob()
// console.log(res)
......@@ -767,7 +767,7 @@ export default class ReportItems extends Component {
downloadDataTable = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/item_report/export_item_report"
`${process.env.REACT_APP_URL_MAIN_BE}/public/item_report/export_item_report`
)
res = await res.blob()
// console.log(res)
......
src/container/MasterData/UnitBisnis.js
View file @ 99d74bb3
......@@ -418,7 +418,7 @@ export default class UnitBisnis extends Component {
downloadFile = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=BusinessUnitTemplate&&fileType=xlsx"
`${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=BusinessUnitTemplate&&fileType=xlsx`
)
res = await res.blob()
console.log(res)
......@@ -433,7 +433,7 @@ export default class UnitBisnis extends Component {
downloadDataTable = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/business_unit/export_business_unit"
`${process.env.REACT_APP_URL_MAIN_BE}/public/business_unit/export_business_unit`
)
res = await res.blob()
console.log(res)
......
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 99d74bb3
......@@ -352,7 +352,8 @@ export default class BalanceSheetMR extends Component {
periode: this.props.periode,
report_id: this.props.report_id,
balance_sheet: payload,
months: this.props.month.month_id
months: this.props.month.month_id,
status: 'submitted'
}
console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
......@@ -456,13 +457,15 @@ export default class BalanceSheetMR extends Component {
"balance_sheet": data
}
console.log(body);
// console.log(JSON.stringify(body));
console.log(JSON.stringify(body));
console.log(body)
api.create('UPLOAD').uploadMonthlyReportBS(body).then(response => {
console.log(response);
if (response.data) {
if (response.data.status === "success") {
this.props.onClickClose()
// this.props.onClickClose()
this.props.saveToMonthlyReport()
this.setState({loading: false, handleTekTekTek: 0})
// this.props.getReport()
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false, handleTekTekTek: 0 }, () => {
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ 99d74bb3
......@@ -481,12 +481,12 @@ export default class ListOfCreditFacilities extends Component {
"company_id": this.props.company.company_id,
"periode": this.props.periode,
"report_id": this.props.report_id,
// "status": 'draft',
"status": 'submitted',
"months": this.props.month.month_id,
"locf": payload,
"per_bs": this.state.perBS,
"diff": this.state.diff,
"total_loan" : this.state.totalOutStand
"total_loan" : this.state.perBS
}
console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
......@@ -700,11 +700,11 @@ export default class ListOfCreditFacilities extends Component {
"other_ratio1_financial": i[34] == ""? "0.00" : i[34],
"other_ratio1_current": i[35] == ""? "0.00" : i[35],
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": i[37] == ""? "0.00" : i[36],
"other_ratio2_current": i[38] == ""? "0.00" : i[37],
"other_ratio2_financial": i[37] == ""? "0.00" : i[37],
"other_ratio2_current": i[38] == ""? "0.00" : i[38],
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": i[40] == ""? "0.00" : i[39],
"other_ratio3_current": i[41] == ""? "0.00" : i[40],
"other_ratio3_financial": i[40] == ""? "0.00" : i[40],
"other_ratio3_current": i[41] == ""? "0.00" : i[41],
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": i[43] == ""? "0.00" : i[43],
"other_ratio4_current": i[44] == ""? "0.00" : i[44],
......@@ -1083,11 +1083,11 @@ export default class ListOfCreditFacilities extends Component {
"other_ratio1_financial": i[34] == ""? "0.00" : i[34],
"other_ratio1_current": i[35] == ""? "0.00" : i[35],
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": i[37] == ""? "0.00" : i[36],
"other_ratio2_current": i[38] == ""? "0.00" : i[37],
"other_ratio2_financial": i[37] == ""? "0.00" : i[37],
"other_ratio2_current": i[38] == ""? "0.00" : i[38],
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": i[40] == ""? "0.00" : i[39],
"other_ratio3_current": i[41] == ""? "0.00" : i[40],
"other_ratio3_financial": i[40] == ""? "0.00" : i[40],
"other_ratio3_current": i[41] == ""? "0.00" : i[41],
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": i[43] == ""? "0.00" : i[43],
"other_ratio4_current": i[44] == ""? "0.00" : i[44],
......@@ -3110,18 +3110,19 @@ export default class ListOfCreditFacilities extends Component {
<div>
<div className="grid grid-3x content-center">
<div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'left', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null :
<div style={{ flex: 1 }}>
// <div style={{ flex: 1 }}>
<ThemeProvider theme={this.state.get_for == 'view'? theme3 : theme}>
<Input
disableUnderline={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={this.state.get_for == 'view'}
defaultValue={tableMeta.rowData[33]}
multiline={true}
onBlur={(event) => {
// // // console.log(event.target.value)
// updateValue(event.target.value)
......@@ -3130,7 +3131,7 @@ export default class ListOfCreditFacilities extends Component {
}}
/>
</ThemeProvider>
</div>
// </div>
}
</div>
</div>
......@@ -3153,7 +3154,7 @@ export default class ListOfCreditFacilities extends Component {
decimalScale={2}
value={Number(tableMeta.rowData[34]).toFixed(2)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta, 31)
handleChange(event.target.value, tableMeta, 34)
}}
/>
}
......@@ -3226,18 +3227,19 @@ export default class ListOfCreditFacilities extends Component {
<div>
<div className="grid grid-3x content-center">
<div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'left', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null :
<div style={{ flex: 1 }}>
// <div style={{ flex: 1 }}>
<ThemeProvider theme={this.state.get_for == 'view'? theme3 : theme}>
<Input
disableUnderline={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={this.state.get_for == 'view'}
defaultValue={tableMeta.rowData[36]}
multiline={true}
onBlur={(event) => {
// // // console.log(event.target.value)
// updateValue(event.target.value)
......@@ -3246,7 +3248,7 @@ export default class ListOfCreditFacilities extends Component {
}}
/>
</ThemeProvider>
</div>
// </div>
}
</div>
</div>
......@@ -3297,7 +3299,7 @@ export default class ListOfCreditFacilities extends Component {
decimalScale={2}
value={Number(tableMeta.rowData[38]).toFixed(2)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta, 20)
handleChange(event.target.value, tableMeta, 38)
}}
/>
}
......@@ -3342,17 +3344,18 @@ export default class ListOfCreditFacilities extends Component {
<div>
<div className="grid grid-3x content-center">
<div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'left', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null :
<div style={{ flex: 1 }}>
// <div style={{ flex: 1 }}>
<ThemeProvider theme={this.state.get_for == 'view'? theme3 : theme}>
<Input
disableUnderline={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={this.state.get_for == 'view'}
multiline={true}
defaultValue={tableMeta.rowData[39]}
onBlur={(event) => {
// // // console.log(event.target.value)
......@@ -3362,7 +3365,7 @@ export default class ListOfCreditFacilities extends Component {
}}
/>
</ThemeProvider>
</div>
// </div>
}
</div>
</div>
......@@ -3413,7 +3416,7 @@ export default class ListOfCreditFacilities extends Component {
decimalScale={2}
value={Number(tableMeta.rowData[41]).toFixed(2)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta, 20)
handleChange(event.target.value, tableMeta, 41)
}}
/>
}
......@@ -3458,17 +3461,18 @@ export default class ListOfCreditFacilities extends Component {
<div>
<div className="grid grid-3x content-center">
<div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'left', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null :
<div style={{ flex: 1 }}>
// <div style={{ flex: 1 }}>
<ThemeProvider theme={this.state.get_for == 'view'? theme3 : theme}>
<Input
disableUnderline={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={this.state.get_for == 'view'}
multiline={true}
defaultValue={tableMeta.rowData[42]}
onBlur={(event) => {
// // // console.log(event.target.value)
......@@ -3478,7 +3482,7 @@ export default class ListOfCreditFacilities extends Component {
}}
/>
</ThemeProvider>
</div>
// </div>
}
</div>
</div>
......@@ -3514,7 +3518,7 @@ export default class ListOfCreditFacilities extends Component {
<div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null :
<div style={{ flex: 1 }}>
// <div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={val}
......@@ -3529,12 +3533,12 @@ export default class ListOfCreditFacilities extends Component {
decimalScale={2}
value={Number(tableMeta.rowData[44]).toFixed(2)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta, 20)
handleChange(event.target.value, tableMeta, 44)
}}
/>
}
/>
</div>
// </div>
}
</div>
</div>
......@@ -3547,55 +3551,35 @@ export default class ListOfCreditFacilities extends Component {
name: "Notes",
options: {
customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, height: 43, borderRight: '1px #fff solid' }}>
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, height: 42, borderRight: '1px #fff solid' }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell>
),
setCellProps: () => ({ style2 }),
customBodyRender: (val, tableMeta, updateValue) => {
return (
<div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'left', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null :
<Input
disableUnderline={true}
style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
disabled={this.state.get_for == 'view'? true : false}
defaultValue={tableMeta.rowData[45]}
// disabled={false}
multiline={true}
inputProps={{
style: {
color: this.state.get_for == 'view'? "black" : "#5198ea",
textAlign: 'center',
backgroundColor: 'white'
}
}}
onBlur={(event) => {
// // // console.log(event.target.value)
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 45)
// // // console.log(dataTable2)
}}
<FormControlLabel
style={{ margin: 0 }}
control={
<ThemeProvider theme={theme}>
<Input
disableUnderline={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 75, backgroundColor: 'transparent' }}
type="text"
placeholder=""
multiline={true}
defaultValue={tableMeta.rowData[45]}
disabled={this.state.get_for == 'view'}
onBlur={(event) => {
handleChange(event.target.value, tableMeta, 45)
}}
/>
</ThemeProvider>
}
/>
// <ThemeProvider theme={theme}>
// <Input
// disableUnderline={true}
// style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }}
// type="text"
// placeholder=""
// disabled={this.state.get_for == 'view'}
// defaultValue={tableMeta.rowData[45]}
// multin
// onBlur={(event) => {
// // // // console.log(event.target.value)
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta, 45)
// // // // console.log(dataTable2)
// }}
// />
// </ThemeProvider>
}
</div>
)
......@@ -3830,7 +3814,7 @@ export default class ListOfCreditFacilities extends Component {
</MuiThemeProvider>}
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5}}>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15, marginTop: 5}}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Last Updated by : {this.state.updateBy}</Typography>
</div>
......@@ -3839,11 +3823,11 @@ export default class ListOfCreditFacilities extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Total Outstanding Loan</Typography>
</div>
<div style={{border: '1px solid black', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end'}}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{formatSeparator(this.state.perBS)}</Typography>
<Typography style={{ fontSize: '14px', color: '#4b4b4b' }}>{formatSeparator(this.state.perBS)}</Typography>
</div>
</div>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15}}>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15}}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notes}</Typography>
</div>
......@@ -3852,7 +3836,7 @@ export default class ListOfCreditFacilities extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Diff</Typography>
</div>
<div style={{borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end'}}>
<Typography style={{ fontSize: '11px', color: Number(this.state.diff) > 0? 'red' :'#4b4b4b' }}>{formatSeparator(this.state.diff)}</Typography>
<Typography style={{ fontSize: '14px', color: Number(this.state.diff) > 0? 'red' :'#4b4b4b' }}>{formatSeparator(this.state.diff)}</Typography>
</div>
</div>
</div>
......@@ -4023,7 +4007,7 @@ export default class ListOfCreditFacilities extends Component {
</MuiThemeProvider>}
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5}}>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15, marginTop: 5}}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Last Updated by : {this.state.updateBy}</Typography>
</div>
......@@ -4036,7 +4020,7 @@ export default class ListOfCreditFacilities extends Component {
</div>
</div>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15}}>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15}}>
<div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notes}</Typography>
</div>
......
src/container/Otorisasi/User.js
View file @ 99d74bb3
......@@ -431,7 +431,7 @@ export default class UserRole extends Component {
downloadFile = async () => {
let res = await fetch(
"${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=UserTemplate&&fileType=xlsx"
`${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=UserTemplate&&fileType=xlsx`
)
res = await res.blob()
// console.log(res)
......@@ -445,7 +445,7 @@ export default class UserRole extends Component {
}
downloadDataTables = async () => {
let res = await fetch("${process.env.REACT_APP_URL_MAIN_BE}/public/user/export_user")
let res = await fetch(`${process.env.REACT_APP_URL_MAIN_BE}/public/user/export_user`)
res = await res.blob()
// console.log(res)
if (res.size > 0) {
......
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