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

src/container/BudgetTahunan.js

@@ -559,6 +559,8 @@ export default class BudgetTahunan extends Component {
                 {this.state.visibleBS && (
                     <BalanceSheet
                         report_id={this.state.report_id}
+                        height={this.props.height}
+                        width={this.props.width}
                         company={this.state.company}
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}

src/container/Home.js

@@ -473,22 +473,25 @@ export default function MiniDrawer() {
             </IconButton>}
           {open &&
             <div style={{ width: '100%', marginTop: 15, marginBottom: 60 }}>
+              <Link to={"profile"}>
                 <Typography style={{ fontSize: 14, color: '#fff', textAlign: 'center', fontWeight: 'bold' }}>{userFullname}</Typography>
+              </Link>
+              <Link to={"profile"}>
                 <Typography style={{ fontSize: 14, color: '#fff', textAlign: 'center', marginTop: 10 }}>{userEmail}</Typography>
+              </Link>
             </div>
           }
         </div>
         <Divider />
         {open &&
           <div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -45, display: 'flex', justifyContent: 'center' }}>
+            <Link to={"profile"}>
               <div className={"sub-color"} style={{ width: 90, height: 90, borderRadius: 50, display: 'flex', justifyContent: 'center' }}>
                 <div style={{ width: 72, height: 72, backgroundColor: '#838383', borderRadius: 50, alignSelf: 'center' }}>
-                <Link to={"profile"}>
                   {userPhoto === "" ? null : <img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />}
-                </Link>
                 </div>
-
               </div>
+            </Link>
           </div>
         }
         {open && application.length > 0 &&
@@ -619,7 +622,7 @@ export default function MiniDrawer() {
                   key={index}
                   path={route.path}
                   // exact={route.exact}
-                  children={<route.main height={height} />}
+                  children={<route.main height={height} width={width} />}
                 />
               ))}
             </Switch>

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -78,7 +78,12 @@ export default class Perusahaan extends Component {
                 }
                 console.log(resp.rows[1])
                 this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0] })
-                api.create().checkUploadPerusahaan(body).then(response => {
+            }
+        });
+    }
+
+    checkUpload() {
+        api.create().checkUploadPerusahaan(this.state.payload).then(response => {
             console.log(response);
             if (response.data) {
                 if (response.ok) {
@@ -147,7 +152,7 @@ export default class Perusahaan extends Component {
                                 }
                             },
                             {
-                                        name: "Unit Bisnis",
+                                name: "Business Unit",
                                 options: {
                                     customBodyRender: (val, tableMeta) => {
                                         let check = null
@@ -172,7 +177,7 @@ export default class Perusahaan extends Component {
                                 }
                             },
                             {
-                                        name: "Start Date",
+                                name: "Valid From",
                                 options: {
                                     customBodyRender: (val, tableMeta) => {
                                         let check = null
@@ -197,7 +202,7 @@ export default class Perusahaan extends Component {
                                 }
                             },
                             {
-                                        name: "End Date",
+                                name: "Valid To",
                                 options: {
                                     customBodyRender: (val, tableMeta) => {
                                         let check = null
@@ -229,11 +234,12 @@ export default class Perusahaan extends Component {
                             }
                         ]
 
-                                console.log(dataRow);
+                        // console.log(dataRow);
                         this.setState({
                             dataLoaded: true,
                             cols: columns,
-                                    rows: dataRow
+                            rows: dataRow, visibleUpload: false, 
+                            visiblePerusahaan: false
                         });
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
@@ -251,11 +257,7 @@ export default class Perusahaan extends Component {
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
-                    console.log(response);
         })
-
-            }
-        });
     }
 
     componentDidMount() {
@@ -287,7 +289,7 @@ export default class Perusahaan extends Component {
 
     getData() {
         api.create().getPerusahaan().then((response) => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
@@ -307,10 +309,10 @@ export default class Perusahaan extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', dataTable: [] })
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', dataTable: [] })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -789,7 +791,7 @@ export default class Perusahaan extends Component {
                                 }}
                                 onUpload={() => {
                                     this.state.judul === "MASTER DATA - COMPANY" ?
-                                    this.setState({ visibleUpload: false, visiblePerusahaan: false }) :
+                                    this.checkUpload() :
                                     this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning'})
                                 }}
                             />

src/library/CustomTable.js

@@ -356,6 +356,7 @@ exports.customOptionsFixedColumn = function () {
     filterType: false,
     filter: false,
     sort: false,
+    responsive: 'scrollMaxHeight',
     viewColumns:false,
     overflowX: 'auto',
     print: false,