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

src/container/BudgetTahunan.js

@@ -12,9 +12,24 @@ export default class BudgetTahunan extends Component {
             perusahaan: 'TAP Group',
             revisi: '0',
             visibleBudgetTahunan: true,
-            visibleBalanceSheet: false
+            visibleBS: false
         }
     }
+
+    clickDetail(item){
+        if (item === 'Balance Sheet') {
+            this.setState({ 
+                visibleBudgetTahunan: false, 
+                visibleBS: true,
+                visiblePL: false,
+                visibleCAT: false,
+                visibleFAM: false,
+                visibleTP: false
+            })
+        }
+    }
+
+
     render() {
         const columns = ["#", "Jenis Laporan",
             {
@@ -44,7 +59,7 @@ export default class BudgetTahunan extends Component {
                                         cursor: 'pointer',
                                         borderColor: 'transparent'
                                     }}
-                                    onClick={() => this.setState({ visibleBudgetTahunan: false, visibleBalanceSheet: true })}
+                                    onClick={() => this.clickDetail(tableMeta.rowData[1])}
                                 >
                                     <Typography style={{ color: '#5198ea', fontSize: 12, }}>Detail</Typography>
                                 </button>
@@ -199,7 +214,7 @@ export default class BudgetTahunan extends Component {
                     </div>
                 )}
 
-                {this.state.visibleBalanceSheet && (
+                {this.state.visibleBS && (
                     <BalanceSheet />
                 )}
             </div >

src/container/Home.js

@@ -491,7 +491,7 @@ export default function MiniDrawer() {
         }
         {open &&
           <div style={{ marginLeft: 20, marginTop: 10 }}>
-            <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'nunito' }}>Application</Typography>
+            <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'Nunito Sans, sans-serif' }}>Application</Typography>
           </div>
         }
         <List>
@@ -501,7 +501,7 @@ export default function MiniDrawer() {
                 <div style={{ justifyContent: 'space-between', flexDirection: 'row', display: 'flex', paddingLeft: 5, paddingRight: 10, cursor: 'pointer' }} onClick={() => { handleCollapse(item) }}>
                   <ListItem key={item.label}>
                     <ListItemIcon style={{ minWidth: open ? 40 : 56 }}><img src={item.img} /></ListItemIcon>
-                    <Typography style={{ fontFamily: 'nunito', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
+                    <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
                   </ListItem>
                   {item.subItem.length !== 0 ? (item.collapse ? <ExpandLess style={{ color: "#525355", marginLeft: 50, alignSelf: 'center' }} /> : <ExpandMore style={{ color: "#525355", marginLeft: 50, alignSelf: 'center' }} />) : null}
                 </div>
@@ -510,7 +510,7 @@ export default function MiniDrawer() {
                   <div style={{ paddingLeft: 5 }} className={selectedIndex === item.label ? "active" : ""}>
                     <ListItem button key={item.label} onClick={() => selectIndex(item.label)}>
                       <ListItemIcon style={{ minWidth: open ? 40 : 56 }}><img src={item.img} style={{ fill: '#525355' }} /></ListItemIcon>
-                      <Typography style={{ fontFamily: 'nunito', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
+                      <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
                     </ListItem>
                   </div>
                 </Link>
@@ -523,8 +523,8 @@ export default function MiniDrawer() {
                         return (
                           <Link to={sub.label === "Logout" ? `/` : `${url}/${sub.path}`}>
                             <div style={{ paddingLeft: 5, }} className={selectedSubIndex === sub.label ? "active" : ""} onClick={() => sub.label === "Logout" ? logout() : selectSub(sub.label)}>
-                              <ListItem button style={{ paddingLeft: 61 }}>
-                                <Typography style={{ fontFamily: 'nunito', color: '#525355', fontSize: 14 }}>{sub.label}</Typography>
+                              <ListItem button style={{ paddingLeft: 57 }}>
+                                <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{sub.label}</Typography>
                               </ListItem>
                             </div>
                           </Link>
@@ -539,7 +539,7 @@ export default function MiniDrawer() {
         </List>
         {open &&
           <div style={{ marginLeft: 20 }}>
-            <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'nunito' }}>Setting</Typography>
+            <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'Nunito Sans, sans-serif' }}>Setting</Typography>
           </div>
         }
         <List style={{ marginTop: !open ? -10 : null, marginLeft: !open ? -2 : null }}>
@@ -549,7 +549,7 @@ export default function MiniDrawer() {
                 <div style={{ justifyContent: 'space-between', flexDirection: 'row', display: 'flex', paddingLeft: 5, paddingRight: 10, cursor: 'pointer' }} onClick={() => { handleCollapseSetting(item) }}>
                   <ListItem key={item.label}>
                     <ListItemIcon style={{ minWidth: open ? 40 : 56 }}><img src={item.img} /></ListItemIcon>
-                    <Typography style={{ fontFamily: 'nunito', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
+                    <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
                   </ListItem>
                   {item.subItem.length !== 0 ? (item.collapse ? <ExpandLess style={{ color: "#525355", marginLeft: 50, alignSelf: 'center' }} /> : <ExpandMore style={{ color: "#525355", marginLeft: 50, alignSelf: 'center' }} />) : null}
                 </div>
@@ -558,7 +558,7 @@ export default function MiniDrawer() {
                   <div style={{ paddingLeft: 5 }} className={selectedIndex === item.label ? "active" : ""}>
                     <ListItem button key={item.label} onClick={() => selectIndex(item.label)}>
                       <ListItemIcon style={{ minWidth: open ? 40 : 56 }}><img src={item.img} style={{ fill: '#525355' }} /></ListItemIcon>
-                      <Typography style={{ fontFamily: 'nunito', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
+                      <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{item.label}</Typography>
                     </ListItem>
                   </div>
                 </Link>
@@ -571,8 +571,8 @@ export default function MiniDrawer() {
                         return (
                           <Link to={sub.label === "Logout" ? `/` : `${url}/${sub.path}`}>
                             <div style={{ paddingLeft: 5, }} className={selectedSubIndex === sub.label ? "active" : ""} onClick={() => sub.label === "Logout" ? logout() : selectSub(sub.label)}>
-                              <ListItem button style={{ paddingLeft: 61 }}>
-                                <Typography style={{ fontFamily: 'nunito', color: '#525355', fontSize: 14 }}>{sub.label}</Typography>
+                              <ListItem button style={{ paddingLeft: 57 }}>
+                                <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{sub.label}</Typography>
                               </ListItem>
                             </div>
                           </Link>

src/library/CustomTable.js

@@ -343,11 +343,10 @@ exports.customOptionsFixedColumn = function () {
     sort: false,
     viewColumns:false,
     overflowX: 'auto',
-    rowsPerPage: 10,
-    rowsPerPageOptions: [5, 10, 20, 50],
     print: false,
     download: false,
     elevation: 5,
-    search:false
+    search:false,
+    pagination: false
   }
 }
\ No newline at end of file