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

standarisasi validasi

See merge request !189

src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js

@@ -112,11 +112,11 @@ export default class CreateUnitBisnis extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.name)) {
-            this.setState({ errorName: true, msgErrorName: 'Business unit is required.' })
+            this.setState({ errorName: true, msgErrorName: 'Business unit Cannot be Empty.' })
         } else if (R.isEmpty(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date Cannot be Empty.' })
         } else if (R.isEmpty(this.state.endDate) || this.state.endDate === null) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required.' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date Cannot be Empty.' })
         } else {
             let payload = {
                 "business_unit_id": this.state.id,
@@ -130,11 +130,11 @@ export default class CreateUnitBisnis extends Component {
 
     validasiCreate() {
         if (R.isEmpty(this.state.name)) {
-            this.setState({ errorName: true, msgErrorName: 'Business unit is required.' })
+            this.setState({ errorName: true, msgErrorName: 'Business unit Cannot be Empty.' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date is required.' })
+            this.setState({ errorStartDate: true, msgErrorStartDate: 'Start date Cannot be Empty.' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date is required.' })
+            this.setState({ errorEndDate: true, msgErrorEndDate: 'End date Cannot be Empty.' })
         } else {
             let payload = {
                 "business_unit_name": this.state.name,

src/container/Profile.js

@@ -78,7 +78,7 @@ export default class Profile extends Component {
 
     validasi() {
         if (this.state.oldPassword == "") {
-            this.setState({ errorOldPassword: true, msgOldPassword: 'Old password is required.' })
+            this.setState({ errorOldPassword: true, msgOldPassword: 'Old password Cannot be Empty.' })
         } else if (this.state.oldPassword.length < 8) {
             this.setState({ errorOldPassword: true, msgOldPassword: 'Old password minimum 8 characters.' })
         } else if (this.isEmail(this.state.oldPassword)) {
@@ -86,7 +86,7 @@ export default class Profile extends Component {
         } else if (!this.isRegex(this.state.oldPassword)) {
             this.setState({ errorOldPassword: true, msgOldPassword: 'Old password must be a combination of characters, letters and numbers.' })
         } else if (this.state.password.trim() == "") {
-            this.setState({ errorPassword: true, msgPassword: 'Password is required.' })
+            this.setState({ errorPassword: true, msgPassword: 'Password Cannot be Empty.' })
         } else if (this.state.password.length < 8) {
             this.setState({ errorPassword: true, msgPassword: 'Password minimum 8 characters.' })
         } else if (this.isEmail(this.state.password)) {
@@ -94,7 +94,7 @@ export default class Profile extends Component {
         } else if (!this.isRegex(this.state.password)) {
             this.setState({ errorPassword: true, msgPassword: 'Password must be a combination of characters, letters and numbers.' })
         } else if (this.state.confirmPassword.trim() == "") {
-            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation is required.' })
+            this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation Cannot be Empty.' })
         } else if (this.state.confirmPassword.length < 8) {
             this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation of at least 8 characters.' })
         } else if (this.isEmail(this.state.confirmPassword)) {