Skip to content

T
Tia-dev
Commit f82e9679 authored by Hardiansyah's avatar Hardiansyah
Browse files
Options

Merge branch 'ENV-PROD' into 'ENV-DEV' 

# Conflicts:
#   src/container/OutlookPA/CorporateAnnualTargetOLPA.js
parents 13923bd8 74a9e68f
Hide whitespace changes
Inline Side-by-side
Showing with 582 additions and 581 deletions
package.json
View file @ f82e9679
{
"name": "my-app",
"version": "0.1.0",
"homepage": "http://localhost:8080/web/",
"homepage": "http://localhost:8080/web/",
"private": true,
"dependencies": {
"@date-io/date-fns": "^1.3.13",
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ f82e9679
......@@ -617,33 +617,33 @@ export default class CorporateAnnualTarget extends Component {
stateFR = false
}
// if (this.state.defaultCurrencyUpload?.id == 2) {
data.push({
"item_report_id": i[1] == "" || i[1] == null ? 0 : i[1],
"item_report": String(i[6]),
"weight": String(i[7]),
"uom": String(i[8]),
"kpi_type": i[9] == null ? "" : i[9].value,
"max_ach": i[10] == null ? "" : i[10].value,
"formula": i[11] == null ? "" : i[11].value,
"total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]),
"january": i[13].value != undefined ? String(Number(i[13].formula[0].value)/1000) : String(i[13]),
"february": i[14].value != undefined ? String(Number(i[14].formula[0].value)/1000) : String(i[14]),
"march": i[15].value != undefined ? String(Number(i[15].formula[0].value)/1000) : String(i[15]),
"april": i[16].value != undefined ? String(Number(i[16].formula[0].value)/1000) : String(i[16]),
"may": i[17].value != undefined ? String(Number(i[17].formula[0].value)/1000) : String(i[17]),
"june": i[18].value != undefined ? String(Number(i[18].formula[0].value)/1000) : String(i[18]),
"july": i[19].value != undefined ? String(Number(i[19].formula[0].value)/1000) : String(i[19]),
"august": i[20].value != undefined ? String(Number(i[20].formula[0].value)/1000) : String(i[20]),
"september": i[21].value != undefined ? String(Number(i[21].formula[0].value)/1000) : String(i[21]),
"october": i[22].value != undefined ? String(Number(i[22].formula[0].value)/1000) : String(i[22]),
"november": i[23].value != undefined ? String(Number(i[23].formula[0].value)/1000) : String(i[23]),
"december": i[24].value != undefined ? String(Number(i[24].formula[1].value)/1000) : String(i[24]),
"total_current_year": i[30] == undefined || String(Number(i[30])) == "" ? "0.0" : (Number(i[30].length)) > 0 ? String(Number(i[30][2]?.value)/1000) : String(i[25]),
"total_next_year": i[30] == undefined || String(Number(i[30])) == "" ? "0.0" : (Number(i[30].length)) > 0 ? String(Number(i[30][0]?.value)/1000) : String(i[26]),
"total_more_year": i[30] == undefined || String(Number(i[30])) == "" ? "0.0" : (Number(i[30].length)) > 0 ? String(Number(i[30][1]?.value)/1000) : String(i[27]),
"strategic": String(i[28]),
"pic": String(i[29])
})
data.push({
"item_report_id": i[1] == "" || i[1] == null ? 0 : i[1],
"item_report": String(i[6]),
"weight": String(i[7]),
"uom": String(i[8]),
"kpi_type": i[9] == null ? "" : i[9].value,
"max_ach": i[10] == null ? "" : i[10].value,
"formula": i[11] == null ? "" : i[11].value,
"total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]),
"january": i[13].value != undefined ? String(Number(i[13].formula[0].value)/1000) : String(i[13]),
"february": i[14].value != undefined ? String(Number(i[14].formula[0].value)/1000) : String(i[14]),
"march": i[15].value != undefined ? String(Number(i[15].formula[0].value)/1000) : String(i[15]),
"april": i[16].value != undefined ? String(Number(i[16].formula[0].value)/1000) : String(i[16]),
"may": i[17].value != undefined ? String(Number(i[17].formula[0].value)/1000) : String(i[17]),
"june": i[18].value != undefined ? String(Number(i[18].formula[0].value)/1000) : String(i[18]),
"july": i[19].value != undefined ? String(Number(i[19].formula[0].value)/1000) : String(i[19]),
"august": i[20].value != undefined ? String(Number(i[20].formula[0].value)/1000) : String(i[20]),
"september": i[21].value != undefined ? String(Number(i[21].formula[0].value)/1000) : String(i[21]),
"october": i[22].value != undefined ? String(Number(i[22].formula[0].value)/1000) : String(i[22]),
"november": i[23].value != undefined ? String(Number(i[23].formula[0].value)/1000) : String(i[23]),
"december": i[24].value != undefined ? String(Number(i[24].formula[1].value)/1000) : String(i[24]),
"total_current_year": i[30] == undefined || String(Number(i[30])) == "" ? "0.0" : (Number(i[30].length)) > 0 ? String(Number(i[30][2]?.value)/1000) : String(i[25]),
"total_next_year": i[30] == undefined || String(Number(i[30])) == "" ? "0.0" : (Number(i[30].length)) > 0 ? String(Number(i[30][0]?.value)/1000) : String(i[26]),
"total_more_year": i[30] == undefined || String(Number(i[30])) == "" ? "0.0" : (Number(i[30].length)) > 0 ? String(Number(i[30][1]?.value)/1000) : String(i[27]),
"strategic": String(i[28]),
"pic": String(i[29])
})
// } else {
// data.push({
// "item_report_id": i[1] == "" || i[1] == null ? 0 : i[1],
......@@ -677,7 +677,7 @@ export default class CorporateAnnualTarget extends Component {
})
let body = {
"report_id": this.props.report_id,
// "revision": Number(this.props.revision),
// "revision": Number(this.props.revision),
"periode": this.props.periode,
"company_id": this.props.company.company_id,
"submission_id": this.props.submissionID,
......@@ -1689,7 +1689,7 @@ export default class CorporateAnnualTarget extends Component {
),
customBodyRender: (val, tableMeta) => {
return (
// handleAction(tableMeta.rowData[2]) &&
// handleAction(tableMeta.rowData[2]) &&
<div style={{ display: 'flex' }}>
{/* {tableMeta.rowData[6] === "Active" ? */}
{handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta) && <span>
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ f82e9679
......@@ -334,7 +334,7 @@ export default class CorporateAnnualTargetMR extends Component {
}
} else {
// console.log('terrrr')
//
//
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, saveDraft: true })
}
console.log(dataTable);
......
src/container/MonthlyReport/LOVMR.js
View file @ f82e9679
......@@ -356,7 +356,7 @@ export default class LOV extends Component {
isi.map((i, index) => {
if (i.length > 0) {
let tgl = String(i[6]).split('-')
console.log(tgl);
// console.log(tgl);
payload.push({
"item_report_id": i[1],
"company_name": this.props.company.company_name,
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ f82e9679
......@@ -952,7 +952,8 @@ export default class ListOfCreditFacilities extends Component {
error = true
this.setState({ emptyData: true})
}
if (i[7] == null || i[7] == ""){
if ((i[7]?.value == 'Government bonds' && i[8] == '') || (i[7]?.value == 'Stocks' && i[8] == '') || (i[7]?.value == 'Mutual funds' && i[8] == '') || (i[7]?.value == 'Investment in associate' && i[8] == '') || (i[7]?.value == 'Investment in joint venture' && i[8] == '') || (i[7]?.value == 'Investment in subsidiary' && i[8] == '') || (i[7]?.value == 'Corporate bonds' && i[8] == '') || (i[7]?.value == 'Others' && i[8] == '')) {
error = true
}else {
if ((i[7].value == 'Government bonds' && i[8] == '') || (i[7].value == 'Stocks' && i[8] == '') || (i[7].value == 'Mutual funds' && i[8] == '') || (i[7].value == 'Investment in associate' && i[8] == '') || (i[7].value == 'Investment in joint venture' && i[8] == '') || (i[7].value == 'Investment in subsidiary' && i[8] == '') || (i[7].value == 'Corporate bonds' && i[8] == '') || (i[7].value == 'Others' && i[8] == '')) {
......
src/container/OutlookPA/CorporateAnnualTargetOLPA.js
View file @ f82e9679
......@@ -1405,7 +1405,7 @@ export default class CorporateAnnualTargetRO extends Component {
<input style={{ borderColor: 'white', width: 96, textAlign: 'center', padding: 0, margin: 0, color: handleAction(tableMeta.rowData[2], tableMeta.rowData[0]) ? "#5198ea" : "black" }} type="text" {...params.inputProps} />
</div>
}
// value={this.state.parent}
// value={this.state.parent}
/>
}
</div>
......@@ -1443,7 +1443,7 @@ export default class CorporateAnnualTargetRO extends Component {
<input style={{ borderColor: 'white', width: 96, textAlign: 'center', padding: 0, margin: 0, color: handleAction(tableMeta.rowData[2], tableMeta.rowData[0]) ? "#5198ea" : "black" }} type="text" {...params.inputProps} />
</div>
}
// value={this.state.parent}
// value={this.state.parent}
/>
}
</div>
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ f82e9679
......@@ -3318,7 +3318,7 @@ export default class BalanceSheetRO extends Component {
</div>
{this.state.visibleUpload && (
<div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div className="popup-content background-white border-radius" style={{ borderRadius: 8, width: 679 }}>
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<div className="popup-title">
......
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @ f82e9679
This source diff could not be displayed because it is too large. You can view the blob instead.
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