Merge branch 'riri' into 'master'

apdet

See merge request !628

src/api/index.js

@@ -434,7 +434,7 @@ const create = (type = "") => {
     getSubmitOI,
     getLastPeriodOI,
     getDashboardUser,
-    getHierarkiMontlyReport
+    getHierarkiMontlyReport,
     getDetailReportCF,
     getReportHierarkiPL,
     getMonthlyReportID,

src/container/BudgetTahunan/ProfitLoss.js

@@ -434,6 +434,7 @@ export default class ProfitLoss extends Component {
                                 }, 1000);
                             }
                         })
+                        // alert(response.data.status)
                     }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
@@ -514,20 +515,7 @@ export default class ProfitLoss extends Component {
         let dataTable2 = this.state.dataTable
         const handleChange = (value, tableMeta, type) => {
             let val = String(value).split(",").join("")
-            if (type === "actual") {
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
-            } else {
-                // let indexParent = dataTable2.findIndex((val) => val[1] == dataTable2[tableMeta.rowIndex][2])
-                // if (indexParent > 0) {
-                //      console.log(indexParent)
-                //     let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
-                //     let jagain = dataTable2[indexParent][tableMeta.columnIndex]
-                //     a = dataTable2[indexParent][tableMeta.columnIndex] = jagain == undefined ? (0 + Number(val)) : (Number(jagain) + Number(val))
-                // } else {
-                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
-                // }
-
-            }
         }
         const handleTotal = (tableMeta) => {
             let total = 0

src/container/MonthlyReport/ProfitLossMR.js

@@ -128,11 +128,11 @@ export default class ProfitLossMR extends Component {
                 name: `Month To Date (MTD)`,
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
+                        <th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                                 <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                             </TableCell> */}
-                            <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
+                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 50, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                             <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
                                 <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
                                     <span>{"Master Budget (MB)"}</span>
@@ -140,7 +140,7 @@ export default class ProfitLossMR extends Component {
                                 <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
                                     <span>{"Rolling Budget (RB)"}</span>
                                 </div>
-                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
+                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6' }}>
                                     <span>{"Actual"}</span>
                                 </div>
                             </div>
@@ -219,7 +219,7 @@ export default class ProfitLossMR extends Component {
                                         <span>{"Act vs Previous Month"}</span>
                                     </div>
                                     <div className="grid grid-2x">
-                                        <div className="column-1" style={{ backgroundColor: '#37b5e6' }}>
+                                        <div className="column-1" style={{ backgroundColor: '#f00000' }}>
                                             <span>{"Amount"}</span>
                                         </div>
                                         <div className="column-2" style={{ borderLeft: '1px #fff solid', backgroundColor: '#37b5e6' }}>