Merge branch 'GGMAC' into 'master'

last update by

See merge request !1366

src/container/RollingOutlook/OperatingIndicatorRO.js

@@ -45,7 +45,7 @@ export default class OperatingIndicatorRO extends Component {
             dataTable: [],
             loading: true,
             visibleOI: true,
-            updateBy: '-',
+            updateBy: [],
             notesUpdate: '-',
             disabledSave: true,
             editable: true,
@@ -82,7 +82,7 @@ export default class OperatingIndicatorRO extends Component {
 
     handleGetFor(type) {
         this.setState({ get_for: type }, () => {
-            // this.getLatestUpdate()
+            this.getLatestUpdate()
             this.getOperatingIDRolling()
         })
     }
@@ -123,11 +123,11 @@ export default class OperatingIndicatorRO extends Component {
         }
         // console.log(payload);
         api.create().getLastestUpdateROOI(payload).then(response => {
-            // console.log(response.data)
+            console.log(response.data)
             if (response.data) {
                 if (response.data.status === "success") {
                     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
                     })
                 } else {
@@ -2113,7 +2113,16 @@ export default class OperatingIndicatorRO extends Component {
                                             </MuiThemeProvider>
                                         }
                                 </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>
                             </div>
                             <div className="grid grid-2x">