Skip to content

T
Tia-dev
Commit e4fda636 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'didam' into 'master' 

push dulu

See merge request !920
parents b3a608e9 0e135d8d
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 114 deletions
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ e4fda636
...@@ -97,6 +97,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -97,6 +97,7 @@ export default class CorporateAnnualTargetMR extends Component {
api.create().getParameterByGroupName({ api.create().getParameterByGroupName({
"group_name" : 'ACHIEVEMENT_KPI' "group_name" : 'ACHIEVEMENT_KPI'
}).then((response) => { }).then((response) => {
console.log(response.data.data)
if (response.data) { if (response.data) {
this.setState({parameterScore: response.data.data}) this.setState({parameterScore: response.data.data})
} }
...@@ -160,6 +161,8 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -160,6 +161,8 @@ export default class CorporateAnnualTargetMR extends Component {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id) let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
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.corporate_annual_target.weight).substr(0,String(item.corporate_annual_target.weight).length-1)
console.log(weight)
dataTable.push([ dataTable.push([
item.type_report_id, item.type_report_id,
item.id, item.id,
...@@ -167,7 +170,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -167,7 +170,7 @@ export default class CorporateAnnualTargetMR extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.corporate_annual_target.weight == ""? "0%" : item.corporate_annual_target.weight, item.corporate_annual_target.weight == ""? Number(0).toFixed(1) : Number(weight).toFixed(1),
parentTrue ? item.corporate_annual_target.uom : item.uom, parentTrue ? item.corporate_annual_target.uom : item.uom,
parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type, parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type,
// parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type }, // parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },
...@@ -201,7 +204,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -201,7 +204,7 @@ export default class CorporateAnnualTargetMR extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : item.weight, item.weight == ''? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
item.uom, item.uom,
item.kpi_type == "" ? null : item.kpi_type, item.kpi_type == "" ? null : item.kpi_type,
// item.kpi_type == "" ? null : { value: item.kpi_type }, // item.kpi_type == "" ? null : { value: item.kpi_type },
...@@ -1044,15 +1047,25 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1044,15 +1047,25 @@ export default class CorporateAnnualTargetMR extends Component {
let parameterAch = String(tableMeta.rowData[9]).includes('%')? `MAX${String(tableMeta.rowData[9]).substr(0,String(tableMeta.rowData[9]).length - 1)}` : String(tableMeta.rowData[9]) let parameterAch = String(tableMeta.rowData[9]).includes('%')? `MAX${String(tableMeta.rowData[9]).substr(0,String(tableMeta.rowData[9]).length - 1)}` : String(tableMeta.rowData[9])
let parameterMix = `${parameterKpi}_${parameterAch}` let parameterMix = `${parameterKpi}_${parameterAch}`
let listParameterFilter = listParameter.filter((val) => val.setting_type == String(parameterMix).toLocaleUpperCase()) let listParameterFilter = listParameter.filter((val) => val.setting_type == String(parameterMix).toLocaleUpperCase())
let listParameterFilterCompany = listParameterFilter.filter((val) => val.company_id == this.props.company.company_id)
let totalScore = 0 let totalScore = 0
let achx100 = Number(tableMeta.rowData[13])/100 let achx100 = tableMeta.rowData[9] == '100%'? 1 : Number(tableMeta.rowData[13])/100
if (listParameterFilterCompany.length == 0) {
listParameterFilter.map((item,index) => { listParameterFilter.map((item,index) => {
if (Number(achx100) >= Number(item.min_value) && Number(achx100) <= Number(item.max_value)) { if (Number(achx100) >= Number(item.min_value) && Number(achx100) <= Number(item.max_value)) {
totalScore = Number(item.value) totalScore = Number(item.value)
} }
}) })
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(1) } else {
return Number(totalScore).toFixed(1) listParameterFilterCompany.map((item,index) => {
if (Number(achx100) >= Number(item.min_value) && Number(achx100) <= Number(item.max_value)) {
totalScore = Number(item.value)
}
})
}
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(0)
return Number(totalScore).toFixed(0)
} }
const handleTotal = (tableMeta) => { const handleTotal = (tableMeta) => {
...@@ -1196,7 +1209,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1196,7 +1209,7 @@ export default class CorporateAnnualTargetMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
suffix={"%"} suffix={"%"}
value={Number(value).toFixed(1)} value={value}
disabled={true} disabled={true}
// disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)} // disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
decimalScale={1} decimalScale={1}
...@@ -1404,6 +1417,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1404,6 +1417,7 @@ export default class CorporateAnnualTargetMR extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
suffix={"%"}
value={handleAchiement(tableMeta).toFixed(1)} value={handleAchiement(tableMeta).toFixed(1)}
decimalScale={1} decimalScale={1}
disabled={true} disabled={true}
...@@ -1442,7 +1456,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1442,7 +1456,7 @@ export default class CorporateAnnualTargetMR extends Component {
: :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={Number(value).toFixed(1)} value={Number(value).toFixed(0)}
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1450,7 +1464,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1450,7 +1464,7 @@ export default class CorporateAnnualTargetMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
value={handleScore(tableMeta)} value={handleScore(tableMeta)}
decimalScale={1} decimalScale={0}
disabled={true} disabled={true}
// onBlur={(event) => { // onBlur={(event) => {
// // updateValue(event.target.value) // // updateValue(event.target.value)
...@@ -1495,7 +1509,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1495,7 +1509,7 @@ export default class CorporateAnnualTargetMR extends Component {
style={{ color: "black", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "black", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
value={handleTotal(tableMeta).toFixed(1)} value={handleTotal(tableMeta).toFixed(2)}
decimalScale={2} decimalScale={2}
disabled={true} disabled={true}
/> />
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ e4fda636
...@@ -405,42 +405,42 @@ export default class ListOfCreditFacilities extends Component { ...@@ -405,42 +405,42 @@ export default class ListOfCreditFacilities extends Component {
payload.push({ payload.push({
"item_report_id": i[1], "item_report_id": i[1],
"borrower_comp_name": this.props.company.company_name, "borrower_comp_name": this.props.company.company_name,
"bank_name": i[3], "bank_name": i[2],
"type_of_credit": i[4], "type_of_credit": i[3],
"remarks": i[5], "remarks": i[4],
"loan_maturity_date": i[6], "loan_maturity_date": i[5],
"interest": i[7], "interest": i[6],
"currency": i[8], "currency": i[7],
"loan_plafond_amount_ori": i[9], "loan_plafond_amount_ori": i[8],
"loan_plafond_amount_idr": i[10], "loan_plafond_amount_idr": i[9],
"out_loan_ki_amount_ori": i[11], "out_loan_ki_amount_ori": i[10],
"out_loan_ki_amount_idr": i[12], "out_loan_ki_amount_idr": i[11],
"out_loan_kmk_amount_ori": i[13], "out_loan_kmk_amount_ori": i[12],
"out_loan_kmk_amount_idr": i[14], "out_loan_kmk_amount_idr": i[13],
"out_loan_other_type": i[15], "out_loan_other_type": i[14],
"out_loan_other_amount_ori": i[16], "out_loan_other_amount_ori": i[15],
"out_loan_other_amount_idr": i[17], "out_loan_other_amount_idr": i[16],
// "total_out_loan_ori": i[18], // "total_out_loan_ori": i[18],
// "total_out_loan_idr": i[19], // "total_out_loan_idr": i[19],
// "remaining_plafond_ori": i[20], // "remaining_plafond_ori": i[20],
// "remaining_plafond_idr": i[21], // "remaining_plafond_idr": i[21],
"current_ratio_financial": i[18], "current_ratio_financial": i[17],
"der_financial": i[19], "der_financial": i[18],
"debt_to_ebitda_financial": i[20], "debt_to_ebitda_financial": i[19],
"ebitda_to_interest_financial": i[21], "ebitda_to_interest_financial": i[20],
"other_ratio1_ratio_name": i[22], "other_ratio1_ratio_name": i[21],
"other_ratio1_financial": i[23], "other_ratio1_financial": i[22],
"other_ratio1_current": i[24], "other_ratio1_current": i[23],
"other_ratio2_ratio_name": i[25], "other_ratio2_ratio_name": i[24],
"other_ratio2_financial": i[27], "other_ratio2_financial": i[25],
"other_ratio2_current": i[28], "other_ratio2_current": i[26],
"other_ratio3_ratio_name": i[29], "other_ratio3_ratio_name": i[27],
"other_ratio3_financial": i[30], "other_ratio3_financial": i[28],
"other_ratio3_current": i[31], "other_ratio3_current": i[29],
"other_ratio4_ratio_name": i[32], "other_ratio4_ratio_name": i[30],
"other_ratio4_financial": i[33], "other_ratio4_financial": i[31],
"other_ratio4_current": i[34], "other_ratio4_current": i[32],
"notes": i[35], "notes": i[33],
}) })
} }
}) })
...@@ -874,7 +874,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -874,7 +874,7 @@ export default class ListOfCreditFacilities extends Component {
api.create().getPerBSiMontlyReportLOCF(payload).then((response) => { api.create().getPerBSiMontlyReportLOCF(payload).then((response) => {
console.log(response) console.log(response)
if (response.data.status == "success") { if (response.data.status == "success") {
this.setState({perBS: response.data.data.per_bs == null || response.data.data.per_bs == ''? 0.0 : Number(response.data.data.per_bs).toFixed(1)}) this.setState({perBS: response.data.data.per_bs == null || response.data.data.per_bs == ''? Number(0).toFixed(1) : Number(response.data.data.per_bs).toFixed(1)})
} }
}) })
} }
...@@ -3061,22 +3061,25 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3061,22 +3061,25 @@ export default class ListOfCreditFacilities extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null : null :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<ThemeProvider theme={theme}> <FormControlLabel
<Input style={{ margin: 0 }}
disableUnderline={true} value={val}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }} control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
defaultValue={tableMeta.rowData[34]} fixedDecimalScale={2}
decimalScale={2}
value={Number(tableMeta.rowData[34]).toFixed(2)}
onBlur={(event) => { onBlur={(event) => {
// // // console.log(event.target.value) handleChange(event.target.value, tableMeta, 31)
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 34)
// // // console.log(dataTable2)
}} }}
/> />
</ThemeProvider> }
/>
</div> </div>
} }
</div> </div>
...@@ -3174,22 +3177,25 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3174,22 +3177,25 @@ export default class ListOfCreditFacilities extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null : null :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<ThemeProvider theme={theme}> <FormControlLabel
<Input style={{ margin: 0 }}
disableUnderline={true} value={val}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }} control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
defaultValue={tableMeta.rowData[37]} fixedDecimalScale={2}
decimalScale={2}
value={Number(tableMeta.rowData[37]).toFixed(2)}
onBlur={(event) => { onBlur={(event) => {
// // // console.log(event.target.value)
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 37) handleChange(event.target.value, tableMeta, 37)
// // // console.log(dataTable2)
}} }}
/> />
</ThemeProvider> }
/>
</div> </div>
} }
</div> </div>
...@@ -3287,22 +3293,25 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3287,22 +3293,25 @@ export default class ListOfCreditFacilities extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null : null :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<ThemeProvider theme={theme}> <FormControlLabel
<Input style={{ margin: 0 }}
disableUnderline={true} value={val}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }} control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
defaultValue={tableMeta.rowData[40]} fixedDecimalScale={2}
decimalScale={2}
value={Number(tableMeta.rowData[40]).toFixed(2)}
onBlur={(event) => { onBlur={(event) => {
// // // console.log(event.target.value)
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 40) handleChange(event.target.value, tableMeta, 40)
// // // console.log(dataTable2)
}} }}
/> />
</ThemeProvider> }
/>
</div> </div>
} }
</div> </div>
...@@ -3400,22 +3409,25 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3400,22 +3409,25 @@ export default class ListOfCreditFacilities extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 8 || tableMeta.rowData[0] === 9?
null : null :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<ThemeProvider theme={theme}> <FormControlLabel
<Input style={{ margin: 0 }}
disableUnderline={true} value={val}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, backgroundColor: 'transparent', marginBottom: -105 }} control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
defaultValue={tableMeta.rowData[43]} fixedDecimalScale={2}
decimalScale={2}
value={Number(tableMeta.rowData[43]).toFixed(2)}
onBlur={(event) => { onBlur={(event) => {
// // // console.log(event.target.value)
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta, 43) handleChange(event.target.value, tableMeta, 43)
// // // console.log(dataTable2)
}} }}
/> />
</ThemeProvider> }
/>
</div> </div>
} }
</div> </div>
...@@ -3457,7 +3469,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3457,7 +3469,7 @@ export default class ListOfCreditFacilities extends Component {
name: "Notes", name: "Notes",
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, height: 43, borderRight: '1px #fff solid' }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography> <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell> </TableCell>
), ),
...@@ -3762,7 +3774,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3762,7 +3774,7 @@ export default class ListOfCreditFacilities extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Diff</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Diff</Typography>
</div> </div>
<div style={{borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end'}}> <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? '#ffac99' :'#4b4b4b' }}>{formatSeparator(this.state.diff)}</Typography> <Typography style={{ fontSize: '11px', color: Number(this.state.diff) > 0? 'red' :'#4b4b4b' }}>{formatSeparator(this.state.diff)}</Typography>
</div> </div>
</div> </div>
</div> </div>
...@@ -3955,7 +3967,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3955,7 +3967,7 @@ export default class ListOfCreditFacilities extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Diff</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Diff</Typography>
</div> </div>
<div style={{borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end'}}> <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? '#ffac99' :'#4b4b4b' }}>{formatSeparator(this.state.diff)}</Typography> <Typography style={{ fontSize: '11px', color: Number(this.state.diff) > 0? 'red' :'#4b4b4b' }}>{formatSeparator(this.state.diff)}</Typography>
</div> </div>
</div> </div>
</div> </div>
......
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