Skip to content

T
Tia-dev
Commit 8e7b2e63 authored by EKSAD's avatar EKSAD
Browse files
Options

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

parents 071fa016 6e15c15d
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 49 deletions
src/container/MasterData/Perusahaan/CreatePerusahaan.js
View file @ 8e7b2e63
......@@ -186,13 +186,13 @@ export default class CreatePerusahaan extends Component {
validasiEdit() {
if (R.isEmpty(this.state.company)) {
this.setState({ errorNP: true, msgErrorNP: 'Nama perusahaan harus diisi' })
this.setState({ errorNP: true, msgErrorNP: 'Company Name required' })
} else if (R.isNil(this.state.getTypes)) {
this.setState({ errorUB: true, msgErrorUB: 'Unit Bisnis harus diisi' })
this.setState({ errorUB: true, msgErrorUB: 'Business Unit required' })
} else if (R.isNil(this.state.startDate)) {
this.setState({ errorSD: true, msgErrorSD: 'Start Date tidak boleh kosong' })
this.setState({ errorSD: true, msgErrorSD: 'Start Date required' })
} else if (R.isNil(this.state.endDate)) {
this.setState({ errorED: true, msgErrorED: 'End Date tidak boleh kosong' })
this.setState({ errorED: true, msgErrorED: 'End Date required' })
} else {
let payload = {
"company_id": this.state.companyID,
......@@ -210,15 +210,13 @@ export default class CreatePerusahaan extends Component {
validasi() {
if (R.isEmpty(this.state.company)) {
this.setState({ errorNP: true, msgErrorNP: 'Nama perusahaan harus diisi' })
this.setState({ errorNP: true, msgErrorNP: 'Company Name required' })
} else if (R.isNil(this.state.getTypes)) {
this.setState({ errorUB: true, msgErrorUB: 'Unit Bisnis harus diisi' })
this.setState({ errorUB: true, msgErrorUB: 'Business Unit required' })
} else if (R.isNil(this.state.startDate)) {
this.setState({ errorSD: true, msgErrorSD: 'Start Date tidak boleh kosong' })
this.setState({ errorSD: true, msgErrorSD: 'Start Date required' })
} else if (R.isNil(this.state.endDate)) {
this.setState({ errorED: true, msgErrorED: 'End Date tidak boleh kosong' })
} else if (!R.isEmpty(this.state.startDate) && !R.isEmpty(this.state.endDate) && (this.state.startDate > this.state.endDate)) {
return alert("Masa Berlaku Tidak Boleh Kurang Dari Tanggal Mulai")
this.setState({ errorED: true, msgErrorED: 'End Date required' })
}
// else if (R.isEmpty(this.state.totalReport)) {
// this.setState({ errorJL: true, msgErrorJL: 'Total Report harus diisi' })
......@@ -244,7 +242,7 @@ export default class CreatePerusahaan extends Component {
<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>
<span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Edit Data</span>
</div>
</div>
<div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>
......@@ -292,7 +290,7 @@ export default class CreatePerusahaan extends Component {
{...params}
InputProps={{ ...params.InputProps, style: { fontSize: 11 } }}
InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }}
label="Unit Bisnis"
label="Business Unit"
error={this.state.errorUB}
helperText={this.state.msgErrorUB}
/>
......@@ -304,7 +302,7 @@ export default class CreatePerusahaan extends Component {
<DatePicker
margin="normal"
id="startDate"
label="Berlaku Mulai"
label="Start Date"
format="dd MMMM yyyy"
value={this.state.startDate}
onChange={(e) => this.handleChange(e, 'start_date')}
......@@ -350,11 +348,11 @@ export default class CreatePerusahaan extends Component {
<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, width: '20%' }}>Created</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.created}</Typography>
</div>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '20%' }}>Diubah</Typography>
<Typography style={{ fontSize: 11, width: '20%' }}>Edited</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
</div>
</div>
......@@ -365,7 +363,7 @@ export default class CreatePerusahaan extends Component {
<TextField
style={{ width: '100%' }}
id="perusahaan"
label="Nama Perusahaan"
label="Company Name"
value={this.state.company}
inputProps={{
style: {
......@@ -398,7 +396,7 @@ export default class CreatePerusahaan extends Component {
<DatePicker
margin="normal"
id="endDate"
label="Berlaku Hingga"
label="End Date"
format="dd MMMM yyyy"
value={this.state.endDate}
minDate={this.state.startDate}
......@@ -455,7 +453,7 @@ export default class CreatePerusahaan extends Component {
onClick={() => this.props.onClickClose()}
>
<div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#354960', fontSize: 11 }}>Batal</span>
<span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
</div>
</button>
</div>
......@@ -465,7 +463,7 @@ export default class CreatePerusahaan extends Component {
onClick={() => this.validasiEdit()}
>
<div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
<span style={{ color: '#fff', fontSize: 11 }}>Save</span>
</div>
</button>
</div>
......@@ -527,7 +525,7 @@ export default class CreatePerusahaan extends Component {
renderInput={(params) =>
<TextField
{...params}
label="Unit Bisnis"
label="Business Unit"
margin="normal"
style={{marginTop: 7}}
error={this.state.errorUB}
......@@ -550,7 +548,7 @@ export default class CreatePerusahaan extends Component {
<DatePicker
margin="normal"
id="startDate"
label="Berlaku Mulai"
label="Start Date"
format="dd MMMM yyyy"
value={this.state.startDate == "" ? null : this.state.startDate}
onChange={(e) => this.handleChange(e, 'start_date')}
......@@ -594,8 +592,8 @@ export default class CreatePerusahaan extends Component {
</div>
<div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
<Typography style={{ fontSize: 11 }}>Dibuat : </Typography>
<Typography style={{ fontSize: 11 }}>Diubah : </Typography>
<Typography style={{ fontSize: 11 }}>Created : </Typography>
<Typography style={{ fontSize: 11 }}>Edited : </Typography>
</div>
</div>
......@@ -604,7 +602,7 @@ export default class CreatePerusahaan extends Component {
<TextField
style={{ width: '100%' }}
id="perusahaan"
label="Nama Perusahaan"
label="Company Name"
value={this.state.company}
inputProps={{
style: {
......@@ -637,7 +635,7 @@ export default class CreatePerusahaan extends Component {
<DatePicker
margin="normal"
id="endDate"
label="Berlaku Hingga"
label="End Date"
format="dd MMMM yyyy"
error={this.state.errorED}
helperText={this.state.msgErrorED}
......@@ -697,7 +695,7 @@ export default class CreatePerusahaan extends Component {
onClick={() => this.props.onClickClose()}
>
<div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#354960', fontSize: 11 }}>Batal</span>
<span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
</div>
</button>
</div>
......@@ -707,7 +705,7 @@ export default class CreatePerusahaan extends Component {
onClick={() => this.validasi()}
>
<div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<span style={{ color: '#fff', fontSize: 11 }}>Simpan</span>
<span style={{ color: '#fff', fontSize: 11 }}>Save</span>
</div>
</button>
</div>
......
src/container/Otorisasi/User/AddUser.js
View file @ 8e7b2e63
......@@ -158,17 +158,17 @@ export default class AddUser extends Component {
var isEmail = this.isEmail(this.state.email)
if (R.isEmpty(this.state.fullname)) {
this.setState({ errorFullname: true, msgErrorFN: 'Nama Lengkap tidak boleh kosong' })
this.setState({ errorFullname: true, msgErrorFN: 'Full Name is Required' })
} else if (R.isEmpty(this.state.email)) {
this.setState({ errorEmail: true, msgErrorEM: 'Email tidak boleh kosong' })
this.setState({ errorEmail: true, msgErrorEM: 'Email is Required' })
} else if (!isEmail) {
this.setState({ errorEmail: true, msgErrorEM: 'Format email tidak sesuai!' })
this.setState({ errorEmail: true, msgErrorEM: 'Email format not recognized!' })
} else if (R.isNil(this.state.role)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
} else if (R.isNil(this.state.startDate)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
} else if (R.isNil(this.state.endDate)) {
this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
}
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
......
src/container/Otorisasi/User/EditUser.js
View file @ 8e7b2e63
......@@ -166,17 +166,17 @@ export default class EditUser extends Component {
// console.log(this.state.tempData)
if (R.isEmpty(this.state.tempData.fullname)) {
this.setState({ errorFullname: true, msgErrorFN: 'Nama Lengkap tidak boleh kosong' })
this.setState({ errorFullname: true, msgErrorFN: 'Full Name is Required' })
} else if (R.isEmpty(this.state.tempData.email)) {
this.setState({ errorEmail: true, msgErrorEM: 'Email tidak boleh kosong' })
this.setState({ errorEmail: true, msgErrorEM: 'Email is Required' })
} else if (!isEmail) {
this.setState({ errorEmail: true, msgErrorEM: 'Format email tidak sesuai!' })
this.setState({ errorEmail: true, msgErrorEM: 'Email format not recognized!' })
} else if (R.isNil(this.state.role)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
} else if (R.isNil(this.state.tempData.start_date)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
} else if (R.isNil(this.state.tempData.end_date)) {
this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
}
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
......
src/container/Otorisasi/UserRole.js
View file @ 8e7b2e63
......@@ -174,7 +174,7 @@ class UserRole extends Component {
}
}
}, {
name: "Hak Akses",
name: "Access Rights",
options: {
customBodyRender: (val, tableMeta) => {
return (
......@@ -207,7 +207,7 @@ class UserRole extends Component {
</Snackbar>
<div>
<div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
<label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Role & Otorisasi</label>
<label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Role & Authorization</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/Otorisasi/UserRole/AddRole.js
View file @ 8e7b2e63
......@@ -110,13 +110,13 @@ export default class AddRole extends Component {
validasi() {
if (R.isEmpty(this.state.roleName)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
} else if (R.isNil(this.state.startDate)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
} else if (R.isNil(this.state.endDate)) {
this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
} else if (this.state.privileges.length < 1) {
this.setState({ alert: true, messageAlert: 'Hak Akses belum di pilih !!', tipeAlert: 'warning' })
this.setState({ alert: true, messageAlert: 'You must choose the Access Rights!!', tipeAlert: 'warning' })
} else {
this.addRole()
}
......
src/container/Otorisasi/UserRole/EditRole.js
View file @ 8e7b2e63
......@@ -116,13 +116,13 @@ export default class EditRole extends Component {
validasi() {
if (R.isEmpty(this.state.tempData.role_name)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
} else if (R.isNil(this.state.tempData.start_date)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
} else if (R.isNil(this.state.tempData.end_date)) {
this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
} else if (this.state.privileges.length < 1) {
this.setState({ alert: true, messageAlert: 'Hak Akses belum di pilih !!', tipeAlert: 'warning' })
this.setState({ alert: true, messageAlert: 'You must choose the Access Rights', tipeAlert: 'warning' })
} else {
this.updateRole()
}
......
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