Merge branch 'faisal' into 'master'

upload company

See merge request !177

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -21,6 +21,34 @@ const style2 = {
 };
 
 export default class FixedAssetsMovement extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            dataTable: [
+                ["COST", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181"],
+                ["Control", "-", "-"],
+                ["Accumulated Depreciation (negative value)", "2,647,647", "2,058,898"],
+                ["Control", "-", "-"],
+                ["Gain / (Loss) on Fixed Assets", "-", "-"],
+                ["Control", "-", "-"]
+            ]
+        }
+    }
+
+    componentDidMount() {
+        console.log(this.props);
+    }
+
+    handleChange(value, tableMeta) {
+        let data = this.state.dataTable
+        let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = value
+        this.setState({
+            data: a
+        }, () => console.log(this.state.dataTable))
+        // let a = data[0].tableMeta.tableData[tableMeta.rowIndex] === value
+        // console.log(data)
+    }
+
     render() {
         const columns = [{
             name: "Account",
@@ -240,18 +268,7 @@ export default class FixedAssetsMovement extends Component {
             }
         }
         ]
-        const dataTable = [
-            ["COST", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181"],
-            // ["Beginning balance", "11,247,249", "10,702,196"],
-            // ["Additional FA in MTD", "11,247,249", "10,702,196"],
-            // ["Revaluation", "11,247,249", "10,702,196"],
-            // ["Disposal (negative value)", "11,247,249", "10,702,196"],
-            ["Control", "-", "-"],
-            ["Accumulated Depreciation (negative value)", "2,647,647", "2,058,898"],
-            ["Control", "-", "-"],
-            ["Gain / (Loss) on Fixed Assets", "-", "-"],
-            ["Control", "-", "-"],
-        ]
+
         return (
             <div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
                 <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
@@ -272,7 +289,7 @@ export default class FixedAssetsMovement extends Component {
                             <div style={{ marginTop: 20, width: '100%' }}>
                                 <MuiThemeProvider theme={getMuiTheme()}>
                                     <MUIDataTable
-                                        data={dataTable}
+                                        data={this.state.dataTable}
                                         columns={columns}
                                         options={options}
                                     />
@@ -281,16 +298,27 @@ export default class FixedAssetsMovement extends Component {
                         </div>
                         <div className="grid grid-2x">
                             <div className="col-1">
-                                <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                    <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Kembali</Typography>
-                                </div>
+                                <button
+                                    className="button"
+                                    type="button"
+                                    style={{
+                                        backgroundColor: 'transparent',
+                                        cursor: 'pointer',
+                                        borderColor: 'transparent',
+                                    }}
+                                    onClick={() => this.props.onClickClose()}
+                                >
+                                    <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
+                                        <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Kembali</Typography>
+                                    </div>
+                                </button>
                             </div>
                             <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%'}}>
                                 <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960', marginRight: 20 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Batal</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Cancel</Typography>
                                 </div>
                                 <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                    <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Simpan</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save</Typography>
                                 </div>
                             </div>
                         </div>

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -669,7 +669,7 @@ export default class Perusahaan extends Component {
                                 type={this.state.uploadStatus}
                                 percentage={this.state.percentage}
                                 result={this.state.result}
-                                acceptedFiles={["xsls"]}
+                                acceptedFiles={["xlsx"]}
                                 onHandle={(dt) => {
                                     this.fileHandler(dt)
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })