Commit d9d548b8 authored by Riri Novita's avatar Riri Novita

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

parents 21ecc213 8d35bd38
...@@ -45,7 +45,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -45,7 +45,7 @@ export default class OperatingIndicatorRO extends Component {
dataTable: [], dataTable: [],
loading: true, loading: true,
visibleOI: true, visibleOI: true,
updateBy: '-', updateBy: [],
notesUpdate: '-', notesUpdate: '-',
disabledSave: true, disabledSave: true,
editable: true, editable: true,
...@@ -82,7 +82,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -82,7 +82,7 @@ export default class OperatingIndicatorRO extends Component {
handleGetFor(type) { handleGetFor(type) {
this.setState({ get_for: type }, () => { this.setState({ get_for: type }, () => {
// this.getLatestUpdate() this.getLatestUpdate()
this.getOperatingIDRolling() this.getOperatingIDRolling()
}) })
} }
...@@ -123,11 +123,11 @@ export default class OperatingIndicatorRO extends Component { ...@@ -123,11 +123,11 @@ export default class OperatingIndicatorRO extends Component {
} }
// console.log(payload); // console.log(payload);
api.create().getLastestUpdateROOI(payload).then(response => { api.create().getLastestUpdateROOI(payload).then(response => {
// console.log(response.data) console.log(response.data)
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.detail === null ? [] : response.data.data.detail,
notesUpdate: response.data.data.notes_update === null ? '-' : response.data.data.notes_update notesUpdate: response.data.data.notes_update === null ? '-' : response.data.data.notes_update
}) })
} else { } else {
...@@ -2113,7 +2113,16 @@ export default class OperatingIndicatorRO extends Component { ...@@ -2113,7 +2113,16 @@ export default class OperatingIndicatorRO extends Component {
</MuiThemeProvider> </MuiThemeProvider>
} }
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> <div style={{display: 'flex'}}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
<div style={{marginLeft: 10, overflowY: 'scroll', height: 75, marginTop: 10}}>
{this.state.updateBy.reverse().map((item,index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>{item.latest_update}</Typography>
)
})}
</div>
</div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notesUpdate}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notesUpdate}</Typography>
</div> </div>
<div className="grid grid-2x"> <div className="grid grid-2x">
......
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