Skip to content

T
Tia-dev
Commit a5394968 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents 1e5f5218 f8011e9e
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 36 deletions
src/container/Laporan/SubHolding.js
View file @ a5394968
...@@ -1487,13 +1487,46 @@ export default class SubHolding extends Component { ...@@ -1487,13 +1487,46 @@ export default class SubHolding extends Component {
if (indexIDzz === -1) { if (indexIDzz === -1) {
let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : item.profit_loss.mtd_actual let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : item.profit_loss.mtd_actual
let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : item.profit_loss.mtd_mb let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : item.profit_loss.mtd_mb
let persenMtd = Number(mtd_actual/mtd_mb)
let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : item.profit_loss.ytd_actual let persenMtd = 0
let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : item.profit_loss.ytd_mb if (mtd_mb < 0) {
let ytd_last_year = item.profit_loss.ytd_last_year == ''? 0 : item.profit_loss.ytd_last_year if (mtd_actual >= mtd_mb) {
let persenYtdMB = Number(ytd_actual/ytd_mb) persenMtd = ((mtd_mb - mtd_actual) / mtd_mb + 1 )
let persenYtdLY = Number(ytd_actual/ytd_last_year) } else {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb)
}
}
else {
persenMtd = Number(mtd_actual/mtd_mb)
}
let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : Number(item.profit_loss.ytd_actual)
let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : Number(item.profit_loss.ytd_mb)
let ytd_last_year = item.profit_loss.ytd_last_year == ''? 0 : Number(item.profit_loss.ytd_last_year)
let persenYtdMB = 0
if (ytd_mb < 0) {
if (ytd_actual >= ytd_mb) {
persenYtdMB = ((ytd_mb - ytd_actual) / ytd_mb + 1 )
} else {
persenYtdMB = ((ytd_mb - ytd_actual) / ytd_mb)
}
}
else {
persenYtdMB = Number(ytd_actual/ytd_mb)
}
let persenYtdLY = 0
if (ytd_last_year < 0) {
if (ytd_actual >= ytd_last_year) {
persenYtdLY = ((ytd_last_year - ytd_actual) / ytd_last_year + 1 )
} else {
persenYtdLY = (ytd_last_year - ytd_actual) / ytd_last_year
}
}
else {
persenYtdLY = Number(ytd_actual/ytd_last_year)
}
let q1_actual = item.profit_loss.q1_actual == ''? 0 : item.profit_loss.q1_actual let q1_actual = item.profit_loss.q1_actual == ''? 0 : item.profit_loss.q1_actual
let q1_mb = item.profit_loss.q1_mb == ''? 0 : item.profit_loss.q1_mb let q1_mb = item.profit_loss.q1_mb == ''? 0 : item.profit_loss.q1_mb
...@@ -1553,9 +1586,20 @@ export default class SubHolding extends Component { ...@@ -1553,9 +1586,20 @@ export default class SubHolding extends Component {
} }
} }
res.map((item,index) => { res.map((item,index) => {
let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : item.profit_loss.mtd_actual let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : Number(item.profit_loss.mtd_actual)
let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : item.profit_loss.mtd_mb let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : Number(item.profit_loss.mtd_mb)
let persenMtd = Number(mtd_actual/mtd_mb) let persenMtd = 0
if (mtd_mb < 0) {
if (mtd_actual >= mtd_mb) {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb + 1 )
} else {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb)
}
}
else {
persenMtd = Number(mtd_actual/mtd_mb)
}
let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : item.profit_loss.ytd_actual let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : item.profit_loss.ytd_actual
let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : item.profit_loss.ytd_mb let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : item.profit_loss.ytd_mb
......
src/container/Laporan/TableSubHolding.js
View file @ a5394968
...@@ -16173,11 +16173,11 @@ export default class TableSubHolding extends Component { ...@@ -16173,11 +16173,11 @@ export default class TableSubHolding extends Component {
name: `${Number(this.props.periode) + 1}`, name: `${Number(this.props.periode) + 1}`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', fontSize: 13, top: 0, zIndex: 102, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, top: 0, zIndex: 102, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
<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> */}
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50, paddingTop: 15 }}>{columnMeta.name}</div>
<div className="grid grid-1x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="grid grid-1x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#1c71b8', width: 145 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#1c71b8', width: 145 }}>
<span>{"ForeCast"}</span> <span>{"ForeCast"}</span>
...@@ -16218,11 +16218,11 @@ export default class TableSubHolding extends Component { ...@@ -16218,11 +16218,11 @@ export default class TableSubHolding extends Component {
name: `${Number(this.props.periode) + 2}`, name: `${Number(this.props.periode) + 2}`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', fontSize: 13, top: 0, zIndex: 102, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, top: 0, zIndex: 102, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
<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> */}
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50, paddingTop: 15 }}>{columnMeta.name}</div>
<div className="grid grid-1x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="grid grid-1x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#1c71b8', width: 145 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#1c71b8', width: 145 }}>
<span>{"ForeCast"}</span> <span>{"ForeCast"}</span>
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ a5394968
...@@ -636,6 +636,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -636,6 +636,7 @@ export default class CorporateAnnualTargetMR extends Component {
} }
handleCalculate(datatable2) { handleCalculate(datatable2) {
// console.log(datatable2)
this.setState({ loading: true }, () => { this.setState({ loading: true }, () => {
let total = 0 let total = 0
let perfomanceScore = '' let perfomanceScore = ''
...@@ -690,7 +691,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -690,7 +691,7 @@ export default class CorporateAnnualTargetMR extends Component {
} }
}) })
} }
totalScore = Number(totalScore).toFixed(0) let totalScorez = Number(totalScore).toFixed(0)
//Score X Weight //Score X Weight
let totalSW = 0 let totalSW = 0
...@@ -703,16 +704,21 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -703,16 +704,21 @@ export default class CorporateAnnualTargetMR extends Component {
if (item[12] == '' || String(item[12]) == '0' || String(item[12]) == '0.0') { if (item[12] == '' || String(item[12]) == '0' || String(item[12]) == '0.0') {
totalSW = 0 totalSW = 0
} else { } else {
totalSW = (Number(totalScore) * Number(handlePercent) / 100) totalSW = (Number(totalScorez) * Number(handlePercent) / 1000)
} }
totalSW = Number(totalSW).toFixed(2) totalSW = Number(totalSW).toFixed(2)
// console.log(totalSW)
if (item[0] !== 1 && item[0] !== 4) { if (item[0] !== 1 && item[0] !== 4) {
total += Number(totalSW) total += Number(totalSW)
} }
// console.log(item[5])
// console.log(totalAch);
// console.log(achx100);
// console.log(listParameterFilter);
// console.log(listParameterFilterCompany);
// console.log(totalScorez)
// console.log(totalSW)
// console.log(total)
return [ return [
[
item[0], item[0],
item[1], item[1],
item[2], item[2],
...@@ -727,37 +733,39 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -727,37 +733,39 @@ export default class CorporateAnnualTargetMR extends Component {
item[11], item[11],
item[12], item[12],
totalAch, totalAch,
totalScore, totalScorez,
totalSW, totalSW,
item[16], item[16],
item[17], item[17],
item[18], item[18],
item[19], // item[19],
] // ]
] ]
}) })
console.log(totalWeight) // console.log(totalWeight)
console.log(total) // console.log(total)
console.log(datatable3); // console.log(datatable3);
totalWeight = Number(totalWeight) / 100 let totalWeightz = Number(totalWeight) / 100
total = Number(Number(total).toFixed(2) / Number(totalWeight)).toFixed(2) let totalz = Number(Number(total).toFixed(2) / Number(totalWeightz)).toFixed(2)
if (total >= 1.00 && total <= 2.00) { let lastTotal = R.equals(totalz, NaN) ? 0.0 : totalz
// console.log(Number(Number(total).toFixed(2) / Number(totalWeightz)).toFixed(2))
if (lastTotal >= 1.00 && lastTotal <= 2.00) {
perfomanceScore = 'K' perfomanceScore = 'K'
} else if (total >= 2.01 && total <= 2.75) { } else if (lastTotal >= 2.01 && lastTotal <= 2.75) {
perfomanceScore = 'C' perfomanceScore = 'C'
} else if (total >= 2.76 && total <= 3.00) { } else if (lastTotal >= 2.76 && lastTotal <= 3.00) {
perfomanceScore = 'B-' perfomanceScore = 'B-'
} else if (total >= 3.01 && total <= 3.75) { } else if (lastTotal >= 3.01 && lastTotal <= 3.75) {
perfomanceScore = 'B' perfomanceScore = 'B'
} else if (total >= 3.76 && total <= 4.00) { } else if (lastTotal >= 3.76 && lastTotal <= 4.00) {
perfomanceScore = 'B+' perfomanceScore = 'B+'
} else if (total >= 4.01 && total <= 4.75) { } else if (lastTotal >= 4.01 && lastTotal <= 4.75) {
perfomanceScore = 'BS' perfomanceScore = 'BS'
} else if (total >= 4.76 && total <= 5.00) { } else if (lastTotal >= 4.76 && lastTotal <= 5.00) {
perfomanceScore = 'IST' perfomanceScore = 'IST'
} }
setTimeout(() => { setTimeout(() => {
this.setState({ totalScore: total, perfomanceScore, loading: false}, () => { this.setState({ totalScore: lastTotal, perfomanceScore, loading: false}, () => {
this.setState({loading: true}) this.setState({loading: true})
setTimeout(() => { setTimeout(() => {
this.setState({loading: false}) this.setState({loading: false})
...@@ -1044,10 +1052,10 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1044,10 +1052,10 @@ export default class CorporateAnnualTargetMR extends Component {
if (dataTable2[tableMeta.rowIndex][5] == "ROIC") { if (dataTable2[tableMeta.rowIndex][5] == "ROIC") {
dataTable2[tableMeta.rowIndex][column] = 0 dataTable2[tableMeta.rowIndex][column] = 0
} else { } else {
dataTable2[tableMeta.rowIndex][column] = total dataTable2[tableMeta.rowIndex][column] = Number(total).toFixed(1)
} }
return total return Number(total).toFixed(1)
} }
const handleChangeText = (value, tableMeta) => { const handleChangeText = (value, tableMeta) => {
......
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