Skip to content

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

Merge branch 'riri' into 'master' 

issue

See merge request !887
parents 902c91fd b617814f
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 112 deletions
src/container/MonthlyReport/ProfitLossMR.js
View file @ 432b66c4
...@@ -200,7 +200,7 @@ export default class ProfitLossMR extends Component { ...@@ -200,7 +200,7 @@ export default class ProfitLossMR extends Component {
let res = response.data.data let res = response.data.data
const handlePushChild = (item) => { const handlePushChild = (item) => {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id) let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
if (item.type_report_id === 3 && item.level === 2) { if (item.type_report_id === 3) {
if (item.profit_loss.mtd_vs_previous_month == "" && Number(item.profit_loss.percent_act_vs_previous_month) < this.state.minValue || Number(item.profit_loss.percent_act_vs_previous_month) > this.state.maxValue) { if (item.profit_loss.mtd_vs_previous_month == "" && Number(item.profit_loss.percent_act_vs_previous_month) < this.state.minValue || Number(item.profit_loss.percent_act_vs_previous_month) > this.state.maxValue) {
err = true err = true
...@@ -249,7 +249,7 @@ export default class ProfitLossMR extends Component { ...@@ -249,7 +249,7 @@ export default class ProfitLossMR extends Component {
} }
} }
res.map((item, index) => { res.map((item, index) => {
if (item.type_report_id === 3 && item.level === 2) { if (item.type_report_id === 3 ) {
if (item.profit_loss.mtd_vs_previous_month == "" && Number(item.profit_loss.percent_act_vs_previous_month) < this.state.minValue || Number(item.profit_loss.percent_act_vs_previous_month) > this.state.maxValue) { if (item.profit_loss.mtd_vs_previous_month == "" && Number(item.profit_loss.percent_act_vs_previous_month) < this.state.minValue || Number(item.profit_loss.percent_act_vs_previous_month) > this.state.maxValue) {
err = true err = true
...@@ -560,7 +560,7 @@ export default class ProfitLossMR extends Component { ...@@ -560,7 +560,7 @@ export default class ProfitLossMR extends Component {
let data = [] let data = []
let err = false let err = false
this.state.dataTable.map((i, index) => { this.state.dataTable.map((i, index) => {
if(i[0] === 3 && i[4] === 2) { if(i[0] === 3 ) {
// console.log(i); // console.log(i);
if ( i[19] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) { if ( i[19] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) {
console.log('msk 1'); console.log('msk 1');
...@@ -1505,6 +1505,7 @@ export default class ProfitLossMR extends Component { ...@@ -1505,6 +1505,7 @@ export default class ProfitLossMR 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={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(1) } value={Number(tableMeta.rowData[14]).toFixed(1) }
/> />
...@@ -1579,6 +1580,7 @@ export default class ProfitLossMR extends Component { ...@@ -1579,6 +1580,7 @@ export default class ProfitLossMR 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={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]).toFixed(1) } value={Number(tableMeta.rowData[16]).toFixed(1) }
/> />
...@@ -1652,6 +1654,7 @@ export default class ProfitLossMR extends Component { ...@@ -1652,6 +1654,7 @@ export default class ProfitLossMR 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={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1) } value={Number(tableMeta.rowData[18]).toFixed(1) }
/> />
...@@ -1748,10 +1751,29 @@ export default class ProfitLossMR extends Component { ...@@ -1748,10 +1751,29 @@ export default class ProfitLossMR extends Component {
<div> <div>
<div className="grid grid-3x content-center"> <div className="grid grid-3x content-center">
<div className="col-1"> <div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'left', width: 90 }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 3 ?
this.state.get_for == 'view' ? tableMeta.rowData[19] : this.state.get_for == 'view' ?
<Input
disableUnderline={true}
style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
multiline={true}
disabled={true}
defaultValue={tableMeta.rowData[19]}
inputProps={{
style: {
color: Number(tableMeta.rowData[14]) < this.state.minValue || Number(tableMeta.rowData[14]) > this.state.maxValue ? "#5198ea" : '#5198ea',
textAlign: 'left'
}
}}
onBlur={(event) => {
handleText(event.target.value, tableMeta, 0)
}}
/>
:
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={tableMeta.rowData[19]} // value={tableMeta.rowData[19]}
...@@ -1760,16 +1782,17 @@ export default class ProfitLossMR extends Component { ...@@ -1760,16 +1782,17 @@ export default class ProfitLossMR extends Component {
<LightTooltipError title={"MTD Explanation vs Prev. Month is Reqiured"} arrow> <LightTooltipError title={"MTD Explanation vs Prev. Month is Reqiured"} arrow>
<Input <Input
disableUnderline={true} disableUnderline={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
multiline={true}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
// value={tableMeta.rowData[19]} // value={tableMeta.rowData[19]}
defaultValue={tableMeta.rowData[19]} defaultValue={tableMeta.rowData[19]}
inputProps={{ inputProps={{
style: { style: {
color: "#5198ea", color: "#5198ea",
textAlign: 'right', textAlign: 'left',
backgroundColor: '#ffac99' backgroundColor: '#ffac99'
} }
}} }}
...@@ -1781,9 +1804,10 @@ export default class ProfitLossMR extends Component { ...@@ -1781,9 +1804,10 @@ export default class ProfitLossMR extends Component {
: :
<Input <Input
disableUnderline={true} disableUnderline={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
multiline={true}
// disabled={Number(tableMeta.rowData[14]) < this.state.minValue || Number(tableMeta.rowData[14]) > this.state.maxValue ? false : true} // disabled={Number(tableMeta.rowData[14]) < this.state.minValue || Number(tableMeta.rowData[14]) > this.state.maxValue ? false : true}
// value={tableMeta.rowData[19]} // value={tableMeta.rowData[19]}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
...@@ -1791,7 +1815,7 @@ export default class ProfitLossMR extends Component { ...@@ -1791,7 +1815,7 @@ export default class ProfitLossMR extends Component {
inputProps={{ inputProps={{
style: { style: {
color: Number(tableMeta.rowData[14]) < this.state.minValue || Number(tableMeta.rowData[14]) > this.state.maxValue ? "#5198ea" : '#5198ea', color: Number(tableMeta.rowData[14]) < this.state.minValue || Number(tableMeta.rowData[14]) > this.state.maxValue ? "#5198ea" : '#5198ea',
textAlign: 'right' textAlign: 'left'
} }
}} }}
onBlur={(event) => { onBlur={(event) => {
...@@ -1800,119 +1824,169 @@ export default class ProfitLossMR extends Component { ...@@ -1800,119 +1824,169 @@ export default class ProfitLossMR extends Component {
/> />
} }
/> />
:
null
} }
</div> </div>
</div> </div>
</div> </div>
<div className="col-2"> <div className="col-2">
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'left', width: 90 }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 3 ?
this.state.get_for == 'view' ? tableMeta.rowData[20] : this.state.get_for == 'view' ?
<FormControlLabel <Input
style={{ margin: 0 }} disableUnderline={true}
// value={value} style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
control={ type="text"
tableMeta.rowData[20] === "" && (Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue) ? placeholder=""
<LightTooltipError title={"MTD Explanation vs MB is Reqiured"} arrow> multiline={true}
<Input disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disableUnderline={true} defaultValue={tableMeta.rowData[20]}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} inputProps={{
type="text" style: {
placeholder="" color: Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue ? "#5198ea" : '#5198ea',
// value={tableMeta.rowData[20]} textAlign: 'left'
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} }
defaultValue={tableMeta.rowData[20]} }}
inputProps={{ onBlur={(event) => {
style: { handleText(event.target.value, tableMeta, 1)
color: "#5198ea", }}
textAlign: 'right', />
backgroundColor: '#ffac99' :
} <FormControlLabel
}} style={{ margin: 0 }}
onBlur={(event) => { // value={value}
handleText(event.target.value, tableMeta, 1) control={
}} tableMeta.rowData[20] === "" && (Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue) ?
/> <LightTooltipError title={"MTD Explanation vs MB is Reqiured"} arrow>
</LightTooltipError> <Input
: disableUnderline={true}
<Input style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disableUnderline={true} type="text"
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} placeholder=""
type="text" multiline={true}
placeholder="" // value={tableMeta.rowData[20]}
// disabled={Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue ? false : true} disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
// value={tableMeta.rowData[20]} defaultValue={tableMeta.rowData[20]}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} inputProps={{
defaultValue={tableMeta.rowData[20]} style: {
inputProps={{ color: "#5198ea",
style: { textAlign: 'left',
color: Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue ? "#5198ea" : '#5198ea', backgroundColor: '#ffac99'
textAlign: 'right' }
} }}
}} onBlur={(event) => {
onBlur={(event) => { handleText(event.target.value, tableMeta, 1)
handleText(event.target.value, tableMeta, 1) }}
}} />
/> </LightTooltipError>
} :
/>} <Input
disableUnderline={true}
style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
multiline={true}
// disabled={Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue ? false : true}
// value={tableMeta.rowData[20]}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
defaultValue={tableMeta.rowData[20]}
inputProps={{
style: {
color: Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue ? "#5198ea" : '#5198ea',
textAlign: 'left'
}
}}
onBlur={(event) => {
handleText(event.target.value, tableMeta, 1)
}}
/>
}
/>
:
null
}
</div> </div>
</div> </div>
</div> </div>
<div className="col-3"> <div className="col-3">
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'left', width: 90 }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 3 ?
this.state.get_for == 'view' ? tableMeta.rowData[21] : this.state.get_for == 'view' ?
<FormControlLabel <Input
style={{ margin: 0 }} disableUnderline={true}
// value={value} style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
control={ type="text"
tableMeta.rowData[21] === "" && (Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue) ? placeholder=""
<LightTooltipError title={"MTD Explanation vs RB is Reqiured"} arrow> multiline={true}
<Input disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disableUnderline={true} defaultValue={tableMeta.rowData[21]}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} inputProps={{
type="text" style: {
placeholder="" color: Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue ? "#5198ea" : '#5198ea',
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} textAlign: 'left'
// value={tableMeta.rowData[21]} }
defaultValue={tableMeta.rowData[21]} }}
inputProps={{ onBlur={(event) => {
style: { handleText(event.target.value, tableMeta, 2)
color: "#5198ea", }}
textAlign: 'right', />
backgroundColor: '#ffac99' :
} <FormControlLabel
}} style={{ margin: 0 }}
onBlur={(event) => { // value={value}
handleText(event.target.value, tableMeta, 2) control={
}} tableMeta.rowData[21] === "" && (Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue) ?
/> <LightTooltipError title={"MTD Explanation vs RB is Reqiured"} arrow>
</LightTooltipError> <Input
: disableUnderline={true}
<Input style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disableUnderline={true} type="text"
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} placeholder=""
type="text" multiline={true}
placeholder="" disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
// disabled={Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue ? false : true} // value={tableMeta.rowData[21]}
// value={tableMeta.rowData[21]} defaultValue={tableMeta.rowData[21]}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} inputProps={{
defaultValue={tableMeta.rowData[21]} style: {
inputProps={{ color: "#5198ea",
style: { textAlign: 'left',
color: Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue ? "#5198ea" : '#5198ea', backgroundColor: '#ffac99'
textAlign: 'right' }
} }}
}} onBlur={(event) => {
onBlur={(event) => { handleText(event.target.value, tableMeta, 2)
handleText(event.target.value, tableMeta, 2) }}
}} />
/> </LightTooltipError>
} :
/>} <Input
disableUnderline={true}
style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
multiline={true}
// disabled={Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue ? false : true}
// value={tableMeta.rowData[21]}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
defaultValue={tableMeta.rowData[21]}
inputProps={{
style: {
color: Number(tableMeta.rowData[18]) < this.state.minValue || Number(tableMeta.rowData[18]) > this.state.maxValue ? "#5198ea" : '#5198ea',
textAlign: 'left'
}
}}
onBlur={(event) => {
handleText(event.target.value, tableMeta, 2)
}}
/>
}
/>
:
null
}
</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