Skip to content

T
Tia-dev
Commit 7b70ba52 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

parents bcadcd8e a4804090
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 86 deletions
.env_staging
View file @ 7b70ba52
// contents of .env // contents of .env
REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging
REACT_APP_URL_MAIN_FE=/web REACT_APP_URL_MAIN_FE=/web-staging
\ No newline at end of file \ No newline at end of file
package.json
View file @ 7b70ba52
{ {
"name": "my-app", "name": "my-app",
"version": "0.1.0", "version": "0.1.0",
"homepage": "http://localhost:8080/web/", "homepage": "http://localhost:8080/web-staging/",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@date-io/date-fns": "^1.3.13", "@date-io/date-fns": "^1.3.13",
......
src/assets/sass/app.css
View file @ 7b70ba52
.main-color{
background-color: #273b80 !important;
}
/* .main-color{ /* .main-color{
background-color: #1474CA !important; background-color: #273b80 !important;
} */ } */
.main-color{
background-color: #0b6b24 !important;
}
.sub-color{ .sub-color{
background-color: #f0f1f3 !important; background-color: #f0f1f3 !important;
} }
src/container/Menu/Home.js
View file @ 7b70ba52
...@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({
easing: theme.transitions.easing.sharp, easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen, duration: theme.transitions.duration.enteringScreen,
}), }),
backgroundColor: '#273b80' backgroundColor: '#0b6b24'
}, },
topleftClose: { topleftClose: {
borderRight: 0, borderRight: 0,
...@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({
}, },
padding: 20, padding: 20,
display: 'flex', display: 'flex',
backgroundColor: '#273b80' backgroundColor: '#0b6b24'
}, },
drawerOpen: { drawerOpen: {
width: drawerWidth, width: drawerWidth,
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ 7b70ba52
...@@ -432,82 +432,88 @@ export default class ListOfCreditFacilities extends Component { ...@@ -432,82 +432,88 @@ export default class ListOfCreditFacilities extends Component {
}) })
} }
// fileHandler = (event) => { fileHandler = (event) => {
// let fileObj = event let fileObj = event
// ExcelRenderer(fileObj, (err, resp) => { ExcelRenderer(fileObj, (err, resp) => {
// // console.log(resp) console.log(resp)
// if (err) { if (err) {
// console.log(err); console.log(err);
// } }
// else { else {
// let isi = resp.rows.slice(3) let isi = resp.rows.slice(3)
// console.log(isi); console.log(isi);
// let payload = [] let payload = []
// let reg = /^[-+]?(?:[0-9]+,)*[0-9]+(?:\.[0-9]+)?$/; let reg = /^[-+]?(?:[0-9]+,)*[0-9]+(?:\.[0-9]+)?$/;
// isi.map((i, index) => { isi.map((i, index) => {
// if (i.length > 0) { if (i.length > 0) {
// let tgl = String(i[5]).split('-') let excelDate = i[5]
// console.log(i[5]) let excelBaseDate = new Date('1900-01-01');
// console.log(tgl) let javascriptBaseDate = new Date('1970-01-01');
// payload.push({ let daysBetween = excelDate - 1;
// "item_report_id": i[1], let javascriptDate = new Date(excelBaseDate.getTime() + (daysBetween * 24 * 60 * 60 * 1000));
// "borrower_comp_name": this.props.company.company_name, let tgl = String(i[5]).split('-')
// "bank_name": i[2], console.log(i[5])
// "type_of_credit": i[3], console.log(tgl)
// "remarks": i[4], console.log(javascriptDate);
// "loan_maturity_date": i[5] !== undefined ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : null, payload.push({
// "interest": i[6], "item_report_id": i[1],
// "currency": i[7], "borrower_comp_name": this.props.company.company_name,
// "loan_plafond_amount_ori": i[8] !== undefined ? Number(i[8]) : i[8], "bank_name": i[2],
// "loan_plafond_amount_idr": i[9] !== undefined ? Number(i[9]) : i[9], "type_of_credit": i[3],
// "out_loan_ki_amount_ori": i[10] !== undefined ? Number(i[10]) : i[10], "remarks": i[4],
// "out_loan_ki_amount_idr": i[11] !== undefined ? Number(i[11]) : i[11], "loan_maturity_date": i[5] !== undefined ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : null,
// "out_loan_kmk_amount_ori": i[12] !== undefined ? Number(i[12]) : i[12], "interest": i[6],
// "out_loan_kmk_amount_idr": i[13] !== undefined ? Number(i[13]) : i[13], "currency": i[7],
// "out_loan_other_type": i[14], "loan_plafond_amount_ori": i[8] !== undefined ? Number(i[8]) : i[8],
// "out_loan_other_amount_ori": i[15] !== undefined ? Number(i[15]) : i[15], "loan_plafond_amount_idr": i[9] !== undefined ? Number(i[9]) : i[9],
// "out_loan_other_amount_idr": i[16] !== undefined ? Number(i[16]) : i[16], "out_loan_ki_amount_ori": i[10] !== undefined ? Number(i[10]) : i[10],
// // "total_out_loan_ori": i[18], "out_loan_ki_amount_idr": i[11] !== undefined ? Number(i[11]) : i[11],
// // "total_out_loan_idr": i[19], "out_loan_kmk_amount_ori": i[12] !== undefined ? Number(i[12]) : i[12],
// // "remaining_plafond_ori": i[20], "out_loan_kmk_amount_idr": i[13] !== undefined ? Number(i[13]) : i[13],
// // "remaining_plafond_idr": i[21], "out_loan_other_type": i[14],
// "current_ratio_financial": i[17], "out_loan_other_amount_ori": i[15] !== undefined ? Number(i[15]) : i[15],
// "der_financial": i[18], "out_loan_other_amount_idr": i[16] !== undefined ? Number(i[16]) : i[16],
// "debt_to_ebitda_financial": i[19], // "total_out_loan_ori": i[18],
// "ebitda_to_interest_financial": i[20], // "total_out_loan_idr": i[19],
// "other_ratio1_ratio_name": i[21], // "remaining_plafond_ori": i[20],
// "other_ratio1_financial": i[22], // "remaining_plafond_idr": i[21],
// "other_ratio1_current": i[23], "current_ratio_financial": i[17],
// "other_ratio2_ratio_name": i[24], "der_financial": i[18],
// "other_ratio2_financial": i[25], "debt_to_ebitda_financial": i[19],
// "other_ratio2_current": i[26], "ebitda_to_interest_financial": i[20],
// "other_ratio3_ratio_name": i[27], "other_ratio1_ratio_name": i[21],
// "other_ratio3_financial": i[28], "other_ratio1_financial": i[22],
// "other_ratio3_current": i[29], "other_ratio1_current": i[23],
// "other_ratio4_ratio_name": i[30], "other_ratio2_ratio_name": i[24],
// "other_ratio4_financial": i[31], "other_ratio2_financial": i[25],
// "other_ratio4_current": i[32], "other_ratio2_current": i[26],
// "notes": i[33], "other_ratio3_ratio_name": i[27],
// }) "other_ratio3_financial": i[28],
// } "other_ratio3_current": i[29],
// }) "other_ratio4_ratio_name": i[30],
// let body = { "other_ratio4_financial": i[31],
// "monthly_report_id": this.props.monthlyReportId, "other_ratio4_current": i[32],
// "company_id": this.props.company.company_id, "notes": i[33],
// "periode": this.props.periode, })
// "report_id": this.props.report_id, }
// "status": 'submitted', })
// "months": this.props.month.month_id, let body = {
// "locf": payload, "monthly_report_id": this.props.monthlyReportId,
// "per_bs": this.state.perBS, "company_id": this.props.company.company_id,
// "diff": this.state.diff, "periode": this.props.periode,
// "total_loan": this.state.perBS "report_id": this.props.report_id,
// } "status": 'submitted',
// console.log(body) "months": this.props.month.month_id,
// this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] }) "locf": payload,
// } "per_bs": this.state.perBS,
// }); "diff": this.state.diff,
// } "total_loan": this.state.perBS
}
console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
}
});
}
deleteReport() { deleteReport() {
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 7b70ba52
...@@ -951,7 +951,7 @@ export default class MonthlyReport extends Component { ...@@ -951,7 +951,7 @@ export default class MonthlyReport extends Component {
visibleOI: false, visibleOI: false,
visibleCF: false, visibleCF: false,
}) })
} else if (item === 'List Of Credit Facilities and Investment') { } else if (item === 'List of Credit Facilities') {
this.setState({ this.setState({
visibleMonthlyReport: false, visibleMonthlyReport: false,
visibleBS: false, visibleBS: false,
......
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