Merge branch 'rifka' into 'master'

update permission approval matrix

See merge request !203

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -269,11 +269,19 @@ export default class CreateApprovalMatrix extends Component {
                                         style={{ width: '100%' }}
                                         id="order"
                                         label="Order"
-                                        type={"number"}
-                                        value={this.state.order}
+                                        // type={"number"}
+                                        value={this.state.order === null ? '' : this.state.order}
                                         error={this.state.errorOrder}
                                         helperText={this.state.msgErrOrder}
-                                        onChange={(e) => this.setState({ order: e.target.value }, () => this.clearError())}
+                                        // onChange={(e) => this.setState({ order: e.target.value }, () => this.clearError())}
+                                        onChange={(e) => {
+                                            let coba = String(e.target.value).replace(/[^\d]/g,'');
+                                            this.setState({
+                                                order: coba
+                                            }, 
+                                            () => this.clearError())}
+                                            // this.handleChange(coba, 'value')}
+                                        }
                                         inputProps={{
                                             style: {
                                                 fontSize: 11

src/container/ApprovalMatrix/EditApprovalMatrix.js

@@ -288,11 +288,18 @@ export default class EditApprovalMatrix extends Component {
                                         style={{ width: '100%' }}
                                         id="order"
                                         label="Order"
-                                        type={"number"}
-                                        value={this.state.order}
+                                        value={this.state.order === null ? '' : this.state.order}
                                         error={this.state.errorOrder}
                                         helperText={this.state.msgErrOrder}
-                                        onChange={(e) => this.setState({ order: e.target.value }, () => this.clearError())}
+                                        // onChange={(e) => this.setState({ order: e.target.value }, () => this.clearError())}
+                                        onChange={(e) => {
+                                            let coba = String(e.target.value).replace(/[^\d]/g,'');
+                                            this.setState({
+                                                order: coba
+                                            }, 
+                                            () => this.clearError())}
+                                            // this.handleChange(coba, 'value')}
+                                        }
                                         inputProps={{
                                             style: {
                                                 fontSize: 11

src/container/ApprovalMatrix/VisualisasiAM.js

@@ -204,6 +204,7 @@ export default class VisualisasiAM extends Component {
                                 <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: 'dodgerblue', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
                                     <span style={{ color: '#fff', fontSize: 11 }}>Back</span>
                                 </div>
+                                {this.props.btnedit && (
                                 <div className="row" style={{ float: 'right', marginRight: 25 }}>
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor:"pointer" }}>
                                         <span style={{ color: '#354960', fontSize: 11 }} >Cancel</span>
@@ -212,6 +213,7 @@ export default class VisualisasiAM extends Component {
                                         <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                     </div>
                                 </div>
+                                )}
                             </div>
                         </div>
                 </div>