Skip to content

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

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

start date to valod from

See merge request !205
parents db1f9ecb 88650ce4
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
src/container/Otorisasi/User/AddUser.js
View file @ c0a4393c
......@@ -166,9 +166,9 @@ export default class AddUser extends Component {
} else if (R.isNil(this.state.role)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role name Cannot be Empty' })
} else if (R.isNil(this.state.startDate)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start date Cannot be Empty' })
this.setState({ errorStartDate: true, msgErrorSD: 'Valid From Cannot be Empty' })
} else if (R.isNil(this.state.endDate)) {
this.setState({ errorEndDate: true, msgErrorED: 'End date Cannot be Empty' })
this.setState({ errorEndDate: true, msgErrorED: 'Valid To Cannot be Empty' })
}
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
......@@ -579,7 +579,7 @@ export default class AddUser extends Component {
<DatePicker
margin="normal"
id="startDate"
label="Start Date"
label="Valid From"
format="dd MMMM yyyy"
value={this.state.startDate}
error={this.state.errorStartDate}
......@@ -612,7 +612,7 @@ export default class AddUser extends Component {
<DatePicker
margin="normal"
id="endDate"
label="End Date"
label="Valid To"
format="dd MMMM yyyy"
value={this.state.endDate}
error={this.state.errorEndDate}
......
src/container/Otorisasi/User/EditUser.js
View file @ c0a4393c
......@@ -174,9 +174,9 @@ export default class EditUser extends Component {
} else if (R.isNil(this.state.role)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role Name Cannot be Empty' })
} else if (R.isNil(this.state.tempData.start_date)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start Date Cannot be Empty' })
this.setState({ errorStartDate: true, msgErrorSD: 'Valid From Cannot be Empty' })
} else if (R.isNil(this.state.tempData.end_date)) {
this.setState({ errorEndDate: true, msgErrorED: 'End Date Cannot be Empty' })
this.setState({ errorEndDate: true, msgErrorED: 'Valid To Cannot be Empty' })
}
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
......@@ -559,7 +559,7 @@ export default class EditUser extends Component {
<DatePicker
margin="normal"
id="startDate"
label="Start Date"
label="Valid From"
format="dd MMMM yyyy"
value={this.state.tempData === null ? null : this.state.tempData.start_date}
error={this.state.errorStartDate}
......@@ -591,7 +591,7 @@ export default class EditUser extends Component {
<DatePicker
margin="normal"
id="endDate"
label="End Date"
label="Valid To"
format="dd MMMM yyyy"
value={this.state.tempData === null ? null : this.state.tempData.end_date}
error={this.state.errorEndDate}
......
src/container/Otorisasi/UserRole/AddRole.js
View file @ c0a4393c
......@@ -112,9 +112,9 @@ export default class AddRole extends Component {
if (R.isEmpty(this.state.roleName)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role name Cannot be Empty' })
} else if (R.isNil(this.state.startDate)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start date Cannot be Empty' })
this.setState({ errorStartDate: true, msgErrorSD: 'Valid From Cannot be Empty' })
} else if (R.isNil(this.state.endDate)) {
this.setState({ errorEndDate: true, msgErrorED: 'End date Cannot be Empty' })
this.setState({ errorEndDate: true, msgErrorED: 'Valid To Cannot be Empty' })
} else if (this.state.privileges.length < 1) {
this.setState({ alert: true, messageAlert: 'You must choose the Access Rights!!', tipeAlert: 'warning' })
} else {
......@@ -440,7 +440,7 @@ export default class AddRole extends Component {
<DatePicker
margin="normal"
id="startDate"
label="Start Date"
label="Valid From"
format="dd MMMM yyyy"
value={this.state.startDate}
error={this.state.errorStartDate}
......@@ -473,7 +473,7 @@ export default class AddRole extends Component {
<DatePicker
margin="normal"
id="endDate"
label="End Date"
label="Valid To"
format="dd MMMM yyyy"
value={this.state.endDate}
error={this.state.errorEndDate}
......
src/container/Otorisasi/UserRole/EditRole.js
View file @ c0a4393c
......@@ -118,9 +118,9 @@ export default class EditRole extends Component {
if (R.isEmpty(this.state.tempData.role_name)) {
this.setState({ errorRoleName: true, msgErrorRN: 'Role name Cannot be Empty' })
} else if (R.isNil(this.state.tempData.start_date)) {
this.setState({ errorStartDate: true, msgErrorSD: 'Start date Cannot be Empty' })
this.setState({ errorStartDate: true, msgErrorSD: 'Valid From Cannot be Empty' })
} else if (R.isNil(this.state.tempData.end_date)) {
this.setState({ errorEndDate: true, msgErrorED: 'End date Cannot be Empty' })
this.setState({ errorEndDate: true, msgErrorED: 'Valid To Cannot be Empty' })
} else if (this.state.privileges.length < 1) {
this.setState({ alert: true, messageAlert: 'You must choose the Access Rights', tipeAlert: 'warning' })
} else {
......@@ -410,7 +410,7 @@ export default class EditRole extends Component {
<DatePicker
margin="normal"
id="startDate"
label="Start Date"
label="Valid From"
format="dd MMMM yyyy"
value={this.state.tempData === null ? null : this.state.tempData.start_date}
error={this.state.errorStartDate}
......@@ -443,7 +443,7 @@ export default class EditRole extends Component {
<DatePicker
margin="normal"
id="endDate"
label="End Date"
label="Valid To"
format="dd MMMM yyyy"
value={this.state.tempData === null ? null : this.state.tempData.end_date}
error={this.state.errorEndDate}
......
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