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

src/container/BudgetTahunan/TaxPlanning.js

@@ -1476,6 +1476,7 @@ export default class TaxPlanning extends Component {
         }
         const handleValue = (data) => {
             let total = 0
+            // console.log(dataTable2)
             dataTable2.map((item, index) => {
                 if (data.rowData[4] == item[5]) {
                     total = item[data.columnIndex] == undefined ? (Number(total) + 0) : (Number(total) + Number(item[data.columnIndex]))
@@ -1580,7 +1581,7 @@ export default class TaxPlanning extends Component {
                 ),
                 setCellProps: () => ({ style }),
                 customBodyRender: (val, tableMeta) => {
-                    console.log(val)
+                    // console.log(val)
                     return (
                         <div style={{ width: 300 }}>
                             {tableMeta.rowData[7] == 0 ?
@@ -1618,7 +1619,7 @@ export default class TaxPlanning extends Component {
                 ),
                 setCellProps: () => ({ style2 }),
                 customBodyRender: (value, tableMeta, updateValue) => {
-                    // console.log(tableMeta)
+                    console.log(tableMeta)
                     return (
                         <div>
                             <div className="grid grid-3x content-center">
@@ -4719,24 +4720,24 @@ export default class TaxPlanning extends Component {
             name: "2021",
             options: {
                 customHeadRender: (columnMeta) => (
-                    <th  style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
+                    <div  style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
                         {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell> */}
-                        <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
-                        <div className="grid grid-3x" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
-                            <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
+                        <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, paddingBottom: 8 }}>{columnMeta.name}</div>
+                        <div style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}>
+                            <div style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
                                 <span>{"Trial Balance (Fiscal)"}</span>
                             </div>
                         </div>
-                    </th>
+                    </div>
                 ),
                 setCellProps: () => ({ style2 }),
                 customBodyRender: (value, tableMeta, updateValue) => {
                     return (
                         <div>
                             <div className="grid grid-3x content-center">
-                                <div className="col-1">
+                                {/* <div className="col-1"> */}
                                     <div style={{ textAlign: 'right' }}>
                                         {tableMeta.rowData[0] === 3 ?
                                             <div style={{ flex: 1 }}>
@@ -4811,7 +4812,7 @@ export default class TaxPlanning extends Component {
                                                                 <span>validasi</span>
                                         }
                                     </div>
-                                </div>
+                                {/* </div> */}
                             </div>
                         </div>
                     )
@@ -5417,13 +5418,13 @@ export default class TaxPlanning extends Component {
                             </div>
 
                             <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150), height: this.props.height - 400 }}>
-                                <MuiThemeProvider theme={getMuiTheme()}>
+                            {!this.state.loading && <MuiThemeProvider theme={getMuiTheme()}>
                                     <MUIDataTable
                                         data={dataTable2}
                                         columns={columns}
                                         options={options}
                                     />
-                                </MuiThemeProvider>
+                                </MuiThemeProvider>}
                             </div>
                         </div>
                         <div className="grid grid-2x" style={{ marginTop: 20 }}>
@@ -5485,7 +5486,12 @@ export default class TaxPlanning extends Component {
                                         outline: 'none'
                                     }}
                                     onClick={() => {
-                                        this.forceUpdate()
+                                        // this.forceUpdate()
+                                        this.setState({ loading: true }, () => {
+                                            setTimeout(() => {
+                                                this.setState({ loading: false, disabledSave: false })
+                                            }, 100);
+                                        })
                                     }}
                                 >
                                     <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>

src/container/MasterData/Parameter/Parameter.js

@@ -987,7 +987,7 @@ export default class Parameter extends Component {
                         <div style={{ display: 'flex', width: '100%', placeContent: 'flex-end', padding: 20 }}>
                             <button
                                 type="button"
-                                onClick={() => this.setState({ visibleParameter: true })}
+                                onClick={() => this.setState({ visibleParameter: true, judul: "" })}
                                 style={{ marginRight: 20 }}
                             >
                                 <div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>

src/container/Otorisasi/User.js

@@ -524,16 +524,17 @@ export default class UserRole extends Component {
   }
 
   uploadUser() {
+    console.log(JSON.stringify(this.state.payload))
     api.create().uploadUser(this.state.payload).then(response => {
       this.setState({buttonError: false})
-      console.log(response)
+      console.log(JSON.stringify(response))
       if (response.data) {
         if (response.ok) {
           if (response.data.status === "success") {
             this.getUser()
             this.setState({ visibleUser: true, alert: true, messageAlert: response.data.message, tipeAlert: 'success', payload: [], rows: [], judul: '' })
           } else {
-            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', payload: [], rows: [], judul: '' }, () => {
+            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
               if (response.data.message.includes("Someone Logged In")) {
                 setTimeout(() => {
                   localStorage.removeItem(Constant.TOKEN)
@@ -543,10 +544,10 @@ export default class UserRole extends Component {
             })
           }
         } else {
-          this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', payload: [], rows: [], judul: '' })
+          this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
         }
       } else {
-        this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', payload: [], rows: [], judul: '' })
+        this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
       }
     })
   }