Merge branch 'didam' into 'master'

pussh bwanyaq

See merge request !868

src/api/index.js

@@ -176,6 +176,7 @@ const create = (type = "") => {
   const getDetailParameter = (id) => api.get(`setting/get_setting_by_id/${id}`)
   const getAllGroup = () => api.get('/setting_group/get_all_setting_group')
   const getParameterByGroup = (groupID) => api.get(`/setting_type/get_all_setting_type_by_group/${groupID}`)
+  const getParameterByGroupName = (groupName) => api.post(`/setting/get_all_setting_by_group_name`, groupName)
   const createParameter = (body) => api.post('setting/create_setting', body)
   const updateParameter = (body) => api.post('setting/update_setting', body)
   const checkUploadParameter = (body) => api.post('setting/check_import', body)
@@ -532,7 +533,8 @@ const create = (type = "") => {
     checkUploadMonthlyReportLOCF,
     uploadMonthlyReportLOCF,
     validateSubmitReportOI,
-    getMonthlyOI
+    getMonthlyOI,
+    getParameterByGroupName  
   }
 }
 

src/container/MonthlyReport/ListOfCreditFacilities.js

@@ -3761,8 +3761,8 @@ export default class ListOfCreditFacilities extends Component {
                                     <div style={{padding: 5}}>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Total Outstanding Loan</Typography>
                                     </div>
-                                    <div style={{border: '1px solid black', padding: 5, display: 'flex', justifyContent: 'flex-end'}}>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.state.totalOutStand}</Typography>
+                                    <div style={{border: '1px solid black', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end'}}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', minWidth: 200, }}>{this.state.totalOutStand}</Typography>
                                     </div>
                                 </div>
                             </div>
@@ -3771,7 +3771,7 @@ export default class ListOfCreditFacilities extends Component {
                                     <div style={{padding: 5}}>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Diff</Typography>
                                     </div>
-                                    <div style={{borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, display: 'flex', justifyContent: 'flex-end'}}>
+                                    <div style={{borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end'}}>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.state.diff}</Typography>
                                     </div>
                                 </div>