Skip to content

T
Tia-dev
Commit f639c475 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

isu masterdata

See merge request !286
parents fd949054 9de6d9c8
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
src/container/MasterData/Parameter/CreateParameter.js
View file @ f639c475
...@@ -654,11 +654,11 @@ export default class CreateParameter extends Component { ...@@ -654,11 +654,11 @@ export default class CreateParameter extends Component {
}} }}
name="min_value" name="min_value"
onChange={(e) => { onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, ''); // let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({ this.setState({
tempData: { tempData: {
...this.state.tempData, ...this.state.tempData,
min_value: coba min_value: e.target.value
} }
}) })
this.clearMessage() this.clearMessage()
...@@ -822,11 +822,11 @@ export default class CreateParameter extends Component { ...@@ -822,11 +822,11 @@ export default class CreateParameter extends Component {
}} }}
name="max_value" name="max_value"
onChange={(e) => { onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, ''); // let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({ this.setState({
tempData: { tempData: {
...this.state.tempData, ...this.state.tempData,
max_value: coba max_value: e.target.value
} }
}) })
this.clearMessage() this.clearMessage()
...@@ -1035,9 +1035,9 @@ export default class CreateParameter extends Component { ...@@ -1035,9 +1035,9 @@ export default class CreateParameter extends Component {
}} }}
name="minValue" name="minValue"
onChange={(e) => { onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, ''); // let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({ this.setState({
minValue: coba minValue: e.target.value
}) })
this.clearMessage() this.clearMessage()
} }
...@@ -1194,9 +1194,9 @@ export default class CreateParameter extends Component { ...@@ -1194,9 +1194,9 @@ export default class CreateParameter extends Component {
}} }}
name="maxValue" name="maxValue"
onChange={(e) => { onChange={(e) => {
let coba = String(e.target.value).replace(/[^\d]/g, ''); // let coba = String(e.target.value).replace(/[^\d]/g, '');
this.setState({ this.setState({
maxValue: coba maxValue: e.target.value
}) })
this.clearMessage() this.clearMessage()
} }
......
src/container/Profile.js
View file @ f639c475
...@@ -383,9 +383,9 @@ export default class Profile extends Component { ...@@ -383,9 +383,9 @@ export default class Profile extends Component {
onClick={() => this.setState({ uploadVisible: true })} onClick={() => this.setState({ uploadVisible: true })}
> >
{/* <img src={Images.photo} /> */} {/* <img src={Images.photo} /> */}
<div style={{ width: 93, height: 30, objectFit: 'contain', backgroundColor: '#019ce5', borderRadius: 4, display: 'flex', alignContent: 'center', justifyContent: 'center' }}> <div style={{ height: 30, objectFit: 'contain', backgroundColor: '#019ce5', borderRadius: 4, display: 'flex', alignContent: 'center', justifyContent: 'center', paddingLeft: 10, paddingRight: 10 }}>
<img src={Images.camera} /> <img src={Images.camera} />
<Typography style={{ color: '#ffffff', fontSize: 11, fontFamily: 'Nunito Sans, sans-serif', alignSelf: 'center', marginLeft: 5 }}>Ganti Foto</Typography> <Typography style={{ color: '#ffffff', fontSize: 11, fontFamily: 'Nunito Sans, sans-serif', alignSelf: 'center', marginLeft: 5 }}>Change Picture</Typography>
</div> </div>
</button> </button>
</div> </div>
...@@ -610,7 +610,8 @@ export default class Profile extends Component { ...@@ -610,7 +610,8 @@ export default class Profile extends Component {
<ImageUploader <ImageUploader
withIcon={true} withIcon={true}
withPreview withPreview
buttonText='Pilih Gambar' buttonStyles={this.state.pictures.length > 0 ? { display: 'none' } : null}
buttonText={'Select Picture'}
onChange={this.onDrop} onChange={this.onDrop}
imgExtension={['.jpg', '.gif', '.png', '.gif', '.jpeg']} imgExtension={['.jpg', '.gif', '.png', '.gif', '.jpeg']}
maxFileSize={1000000} maxFileSize={1000000}
...@@ -620,7 +621,7 @@ export default class Profile extends Component { ...@@ -620,7 +621,7 @@ export default class Profile extends Component {
<div style={{ display: 'grid', margin: 20 }}> <div style={{ display: 'grid', margin: 20 }}>
<div style={{ justifySelf: 'center' }}> <div style={{ justifySelf: 'center' }}>
<span className="main-color" style={{ color: '#fff', padding: 20, paddingBottom: 10, paddingTop: 10, borderRadius: 15, cursor: 'pointer' }} onClick={() => this.uploadFoto()}>Upload Foto</span> <span className="main-color" style={{ color: '#fff', padding: 20, paddingBottom: 10, paddingTop: 10, borderRadius: 15, cursor: 'pointer' }} onClick={() => this.uploadFoto()}>Upload</span>
</div> </div>
</div> : null </div> : null
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment