Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into deni-dev(pc)

src/container/MasterData/Parameter/Parameter.js

@@ -644,8 +644,8 @@ export default class Parameter extends Component {
                 {this.state.visibleParameter === 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' }}>Parameter</label>
-                            <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5 }}>
+                            <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Parameter</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
                                     style={{ width: '100%' }}
@@ -655,7 +655,7 @@ export default class Parameter extends Component {
                                     inputProps={{ 'aria-label': 'naked' }}
                                 />
                             </div>
-                            <div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
+                            <div style={{ width: '30%', justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                 <a data-tip={'Download Template'} data-for="template">
                                     <button
                                         style={{

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -112,7 +112,7 @@ export default class CreatePerusahaan extends Component {
         return (
             <div className="test app-popup-show" style={{ paddingTop: 100 }}>
                 <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
-                    <div className="popup-panel grid grid-2x" style={{ backgroundColor: '#51c6ea', height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
+                    <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                             <div className="popup-title">
                                 <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Create Data</span>
@@ -230,8 +230,8 @@ export default class CreatePerusahaan extends Component {
                             </div>
 
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
-                                <Typography style={{ fontSize: 11 }}>Dibuat	: Admin - 21 Jul 2020, 18:45</Typography>
-                                <Typography style={{ fontSize: 11 }}>Diubah	: Admin - 21 Jul 2020, 18:45</Typography>
+                                <Typography style={{ fontSize: 11 }}>Dibuat	: </Typography>
+                                <Typography style={{ fontSize: 11 }}>Diubah	: </Typography>
                             </div>
                         </div>
 

src/container/MasterData/Perusahaan/EditPerusahaan.js

@@ -13,11 +13,13 @@ export default class EditPerusahaan extends Component {
         this.state = {
             id: '',
             company: '',
+            companyID: '',
             parent: '',
             unitBisnis: '',
             totalReport: '',
             startDate: '',
             endDate: '',
+            status: '',
             types: null,
             getTypes: null,
             perusahaan: null,
@@ -166,7 +168,7 @@ export default class EditPerusahaan extends Component {
         return (
             <div className="test app-popup-show">
                 <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
-                    <div className="popup-panel grid grid-2x" style={{ backgroundColor: '#51c6ea', height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
+                    <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                             <div className="popup-title">
                                 <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Ubah Data</span>
@@ -189,7 +191,7 @@ export default class EditPerusahaan extends Component {
                             <div style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
                                 <TextField
                                     style={{ width: '100%' }}
-                                    value={this.state.businessID}
+                                    value={this.state.companyID}
                                     id="id"
                                     label="ID"
                                     disabled