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

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/BalanceSheetMR.js

@@ -140,6 +140,7 @@ export default class BalanceSheetMR extends Component {
             "get_for" : this.state.get_for
         }
         api.create().getHierarkiMontlyReportBS(payload).then(response => {
+            console.log(payload);
             console.log(response);
             let dataTable = []
             let err = false
@@ -418,6 +419,7 @@ export default class BalanceSheetMR extends Component {
         }
         console.log(body);
         // console.log(JSON.stringify(body));
+        console.log(body)
         api.create('UPLOAD').uploadMonthlyReportBS(body).then(response => {
             console.log(response);
             if (response.data) {
@@ -473,7 +475,7 @@ export default class BalanceSheetMR extends Component {
         }
         api.create('UPLOAD').createMonthlyReportBS(payload).then(response => {
             console.log(response);
-            console.log(JSON.stringify(payload))
+            // console.log(JSON.stringify(payload))
             if (response.data) {
                 if (response.data.status === "success") {
                     this.props.saveToMonthlyReport()
@@ -493,7 +495,7 @@ export default class BalanceSheetMR extends Component {
         let err = false
         this.state.dataTable.map((i, index) => {
             if(i[0] === 3) {
-                console.log(i);
+                // console.log(i);
                 if ( i[17] === "" && (Number(i[12]) < this.state.minValue || Number(i[12]) > this.state.maxValue)) {
                     console.log('msk 1');
                     // console.log(i);
@@ -524,7 +526,7 @@ export default class BalanceSheetMR extends Component {
                 "mtd_vs_rb": i[19]
             })
         })
-        console.log(JSON.stringify(data));
+        // console.log(JSON.stringify(data));
         // data.map(i => {
         //     if (i.mtd_vs_previous_month === "" && (Number(i.percent_act_vs_previous_month) < this.state.minValue || Number(i.percent_act_vs_previous_month) > this.state.maxValue)) {
         //         console.log('msk 1');
@@ -556,7 +558,7 @@ export default class BalanceSheetMR extends Component {
             "months": this.props.month.month_id,
             "balance_sheet": data
         }
-        console.log(JSON.stringify(payload));
+        // console.log(JSON.stringify(payload));
         console.log(this.state.dataTable)
         api.create().validateSubmitReportBS(payload).then((response) => {
             console.log(response)

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>