Merge branch 'syadziy' into 'master'

Syadziy

See merge request !143

src/container/MasterData/Parameter/CreateParameter.js

@@ -952,7 +952,7 @@ export default class CreateParameter extends Component {
                                 />
                             </div>
 
-                            <div style={{ padding: 10, borderRadius: 5 }}>
+                            <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                 <Typography style={{ fontSize: 11 }}>Dibuat	: </Typography>
                                 <Typography style={{ fontSize: 11 }}>Diubah	: </Typography>
                             </div>

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -97,7 +97,7 @@ export default class CreatePerusahaan extends Component {
                     options: perusahaanData,
                     getOptionLabel: (option) => option.company_name,
                 };
-                this.setState({ perusahaan: typeProps, perusahaanData: response.data.data, getPerusahaan: index == -1 ? perusahaanData[0] : perusahaanData[index] })
+                this.setState({ perusahaan: typeProps, perusahaanData: response.data.data, getPerusahaan: index == -1 ? null : perusahaanData[index] })
             } else {
                 alert(response.data.message)
             }

src/container/MasterData/ReportItems.js

@@ -756,7 +756,7 @@ export default class ReportItems extends Component {
                 {this.state.itemReport === true ?
                     <div>
                         <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
-                            <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Item Report</label>
+                            <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Item Laporan</label>
                             <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
                                 <img src={Images.searchBlack} style={{ marginRight: 10 }} />
                                 <InputBase

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -789,16 +789,14 @@ export default class CreateReportItems extends Component {
                         </div>
                     </div>
 
-                    <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20 }}>
+                    <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingBottom: 20, paddingLeft: 20, paddingRight: 20 }}>
                         <div className="column-1">
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Dibuat</Typography>
-                                    <Typography style={{ fontSize: 11 }}>:</Typography>
+                                    <Typography style={{ fontSize: 11 }}>Dibuat :</Typography>
                                 </div>
                                 <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11, width: '20%' }}>Diubah</Typography>
-                                    <Typography style={{ fontSize: 11 }}>:</Typography>
+                                    <Typography style={{ fontSize: 11 }}>Diubah :</Typography>
                                 </div>
                             </div>
                         </div>

src/container/MasterData/formReportItems/EditReportItems.js

@@ -351,14 +351,13 @@ export default class EditReportItems extends Component {
 
                     <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20 }}>
                         <div className="column-1">
-                            <div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
+                            <div className="margin-top-10px" style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
                                 <TextField
                                     style={{ width: '100%' }}
                                     value={this.state.tempData === null ? '' : this.state.tempData.item_report_id}
                                     id="ID"
                                     label="ID"
                                     disabled
-                                    variant="filled"
                                     onChange={(e) => null}
                                     inputProps={{
                                         style: {
@@ -751,7 +750,7 @@ export default class EditReportItems extends Component {
                             </div>
                         </div>
                     </div>
-                    <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20 }}>
+                    <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingBottom: 20, paddingLeft: 20, paddingRight: 20 }}>
                         <div className="column-1">
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
                                 <div style={{ display: 'flex' }}>

src/container/Profile.js

@@ -122,7 +122,9 @@ export default class Profile extends Component {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                         this.setState({ oldPassword: "", password: "", confirmPassword: "" })
                         localStorage.removeItem(Constant.TOKEN)
+                        setTimeout(() => {
                             window.location.reload();
+                        }, 1000);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }
@@ -307,9 +309,12 @@ export default class Profile extends Component {
                 if (response.ok){
                     if (response.data.status === "success") {
                         this.setState({ uploadVisible: false }, () => {
-                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                             this.getUser()
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' }, () => {
+                                setTimeout(() => {
                                     window.location.reload()
+                                }, 1000);
+                            })
                         })
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })