Merge branch 'riri' into 'master'

Riri

See merge request !1523

src/container/Laporan/TableSubHolding.js

@@ -26031,6 +26031,28 @@ export default class TableSubHolding extends Component {
                             </div>
                         </div>
                         :
+                        this.props.type === 7 || this.props.type === 8 ? 
+                        <div style={{ paddingLeft: 20, paddingBottom: 40 }}>
+                            <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, textDecorationLine: 'underline' }}>Notes:</Typography>
+                                </div>
+                                <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, fontWeight: 'bold' }}>Rolling Outlook (Full Year) or Rolling Budget (RB)</Typography>
+                                </div>
+                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jan-Mar = MB figures</Typography>
+                                </div>
+                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Apr-Jun = OL Q1 figures or MB figures (if OL Q1 not available)</Typography>
+                                </div>
+                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jul-Sep = OL Q2 figures or OL Q1 (if OL Q2 not available) or MB (if OL Q2 and OL Q1 not available)</Typography>
+                                </div>
+                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Oct-Dec = OL Q3 figures or OL Q2 (if OL Q3 not available) and consecutive to the MB</Typography>
+                                </div>
+                        </div>
+                        :
                         null
                 }
             </div>

src/container/MonthlyReport/BalanceSheetMR.js

@@ -2685,6 +2685,25 @@ export default class BalanceSheetMR extends Component {
                             </div>
                             <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Notes : {this.state.notes}</Typography>
 
+                            <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, textDecorationLine: 'underline' }}>Notes:</Typography>
+                            </div>
+                            <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, fontWeight: 'bold' }}>Rolling Outlook (Full Year) or Rolling Budget (RB)</Typography>
+                            </div>
+                            <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jan-Mar = MB figures</Typography>
+                            </div>
+                            <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Apr-Jun = OL Q1 figures or MB figures (if OL Q1 not available)</Typography>
+                            </div>
+                            <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jul-Sep = OL Q2 figures or OL Q1 (if OL Q2 not available) or MB (if OL Q2 and OL Q1 not available)</Typography>
+                            </div>
+                            <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Oct-Dec = OL Q3 figures or OL Q2 (if OL Q3 not available) and consecutive to the MB</Typography>
+                            </div>
+
                         </div>
                         {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
                                 (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
@@ -2713,7 +2732,7 @@ export default class BalanceSheetMR extends Component {
                                 <div className="col-2">
                                 </div> :
                                 <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
-                                    {this.state.get_for == 'view' &&  <button
+                                    {this.state.get_for == 'view' && this.state.viewOnly && <button
                                         className="button"
                                         type="button"
                                         style={{