Merge branch 'deni-dev(pc)' into 'master'

si freeze notes

See merge request !590

src/container/BudgetTahunan/ProfitLoss.js

@@ -35,6 +35,12 @@ const style2 = {
     background: "white",
     zIndex: 100
 };
+const stylenotes = {
+    position: "sticky",
+    background: "white",
+    zIndex: 101,
+    left: 350
+};
 
 export default class ProfitLoss extends Component {
     constructor(props) {
@@ -549,7 +555,7 @@ export default class ProfitLoss extends Component {
                         if (item == '-' || item == '+' || item == '/' || item == '*') {
                             opet = item
                         } else {
-                            arrayJumlah.push(opet == ''? Number(item) : Number(String(opet + String(item))))
+                            arrayJumlah.push(opet == '' ? Number(item) : Number(String(opet + String(item))))
                             tambahan = false
                             opet = ""
                         }
@@ -665,11 +671,18 @@ export default class ProfitLoss extends Component {
             name: "Notes",
             options: {
                 customHeadRender: (columnMeta) => (
-                    <TableCell style={{ ...style2, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 96 }}>
+                    <TableCell style={{ ...stylenotes, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 96 }}>
                         <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                     </TableCell>
                 ),
-                setCellProps: () => ({ style2 }),
+                setCellProps: () => ({
+                    style: {
+                        position: "sticky",
+                        background: "white",
+                        zIndex: 101,
+                        left: 350
+                    }
+                  }),
                 customBodyRender: (value, tableMeta, updateValue) => {
                     return (
                         <div style={{ textAlign: 'right' }}>
@@ -2169,6 +2182,7 @@ export default class ProfitLoss extends Component {
 
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
                                     {this.state.loading && loadingComponent}
+                                    {!this.state.loading && (
                                         <MuiThemeProvider theme={getMuiTheme()}>
                                             <MUIDataTable
                                                 data={dataTable2}
@@ -2176,6 +2190,8 @@ export default class ProfitLoss extends Component {
                                                 options={options}
                                             />
                                         </MuiThemeProvider>
+                                    )}
+
                                 </div>
                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
                             </div>
@@ -2284,6 +2300,7 @@ export default class ProfitLoss extends Component {
                                     {this.state.dataLoaded && (
                                         <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
                                             {this.state.loading && loadingComponent}
+                                            {!this.state.loading && (
                                                 <MuiThemeProvider theme={getMuiTheme()}>
                                                     <MUIDataTable
                                                         data={dataTable2}
@@ -2291,6 +2308,7 @@ export default class ProfitLoss extends Component {
                                                         options={options}
                                                     />
                                                 </MuiThemeProvider>
+                                            )}
                                         </div>
                                     )}
                                 </div>