Skip to content

T
Tia-dev
Commit 84188466 authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

lastupdate tp ro

See merge request !1382
parents 5c21d2bf 817edecc
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/container/RollingOutlook/TaxPlanningRO.js
View file @ 84188466
...@@ -142,8 +142,8 @@ export default class TaxPlanning extends Component { ...@@ -142,8 +142,8 @@ export default class TaxPlanning extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update, // updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update,
// updateBy: response.data.data.detail === null ? [] : response.data.data.detail, updateBy: response.data.data.detail === null ? [] : response.data.data.detail,
notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update notes: response.data.data.notes_update === null ? "" : response.data.data.notes_update
}) })
} else { } else {
...@@ -6077,17 +6077,17 @@ export default class TaxPlanning extends Component { ...@@ -6077,17 +6077,17 @@ export default class TaxPlanning extends Component {
} }
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> {/* <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> */}
{/* <div style={{display: 'flex'}}> <div style={{display: 'flex'}}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{marginLeft: 10, overflowY: 'scroll', height: 75, marginTop: 10}}> <div style={{marginLeft: 10, overflowY: 'scroll', marginTop: 10}}>
{this.state.updateBy.reverse().map((item,index) => { {this.state.updateBy.reverse().map((item,index) => {
return ( return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>{item.latest_update}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>{item.latest_update}</Typography>
) )
})} })}
</div> </div>
</div> */} </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography>
</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