Skip to content

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

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

masih issue weight

See merge request !2332
parents 04ec04ee 7543c078
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ b7fff4d4
...@@ -220,7 +220,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -220,7 +220,7 @@ export default class CorporateAnnualTargetMR extends Component {
if (indexIDzz === -1) { if (indexIDzz === -1) {
let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE' let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
// let weight = String(item.weight).includes('%') ? String(item.weight).substr(0, String(item.weight).length - 1) : String(item.weight) // let weight = String(item.weight).includes('%') ? String(item.weight).substr(0, String(item.weight).length - 1) : String(item.weight)
let weightTB = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight) let weightTB = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight) * 100
// console.log(weight) // console.log(weight)
dataTable.push([ dataTable.push([
item.type_report_id, item.type_report_id,
...@@ -284,7 +284,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -284,7 +284,7 @@ export default class CorporateAnnualTargetMR extends Component {
} }
} }
res.map((item, index) => { res.map((item, index) => {
let weightParent = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight) let weightParent = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight) * 100
dataTable.push([ dataTable.push([
item.type_report_id, item.type_report_id,
item.id, item.id,
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ b7fff4d4
...@@ -1108,7 +1108,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1108,7 +1108,7 @@ export default class ListOfCreditFacilities extends Component {
uploadLOCF(type) { uploadLOCF(type) {
console.log('masoook LOCF'); console.log('masoook LOCF');
let dataTable2 = this.state.dataTablelocf == undefined || this.state.tambah == 'tambah' || this.state.tambah == 'upload' ? this.state.dataTableLOCF : this.state.dataTablelocf let dataTable2 = (this.state.dataTablelocf !== undefined && this.state.tambah == 'upload') ? this.state.dataTablelocf : (this.state.dataTablelocf == undefined || this.state.tambah == 'tambah' || this.state.tambah == 'upload') ? this.state.dataTableLOCF : this.state.dataTablelocf
let data = [] let data = []
let error = false let error = false
// this.deleteReport() // this.deleteReport()
......
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