Merge branch 'rifka' into 'master'

add monthly report

See merge request !196

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -188,7 +188,7 @@ export default class ApprovalMatrix extends Component {
                                     }
                                 },
                                 {
-                                    name: "Start Date",
+                                    name: "Valid From",
                                     options: {
                                         customBodyRender: (val, tableMeta) => {
                                             let check = null
@@ -213,7 +213,7 @@ export default class ApprovalMatrix extends Component {
                                     }
                                 },
                                 {
-                                    name: "End Date",
+                                    name: "Valid To",
                                     options: {
                                         customBodyRender: (val, tableMeta) => {
                                             let check = null

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -195,7 +195,7 @@ export default class CreateApprovalMatrix extends Component {
                     <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                             <div className="popup-title">
-                                <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Add Data</span>
+                                <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Create Data</span>
                             </div>
                         </div>
                         <div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>

src/library/Array.js

@@ -16,7 +16,7 @@ const arraySide = [
     {
         img: Images.laporanBulanan,
         label: 'Monthly Report',
-        path: 'beranda',
+        path: 'monthly-report',
         subItem: null
     },
     {

src/router/homeRoutes.js

@@ -13,6 +13,7 @@ import DashboardCAT from '../container/Laporan/DashboardCAT'
 import BudgetTahunan from '../container/BudgetTahunan';
 import RollingOutlook from '../container/RollingOutlook';
 import OperatingIndicator from '../container/OperatingIndicator/OperatingIndicator'
+import MonthlyReport from '../container/MonthlyReport';
 
 const routes = [
   {
@@ -71,6 +72,10 @@ const routes = [
     path: "/home/profile",
     main: Profile
   },
+  {
+    path: "/home/monthly-report",
+    main: MonthlyReport
+  },
   {
     path: "*",
     main: screen404