Updated Validation for User Save or Update

RamAlapure · RamAlapure · commit 4ac58123df58 · 2017-05-21T01:38:00.000+05:30
diff --git a/src/main/java/com/codetreatise/controller/UserController.java b/src/main/java/com/codetreatise/controller/UserController.java
@@ -156,23 +156,26 @@ private void saveUser(ActionEvent event){
     	if(validate("First Name", getFirstName(), "[a-zA-Z]+") &&
     	   validate("Last Name", getLastName(), "[a-zA-Z]+") &&
     	   emptyValidation("DOB", dob.getEditor().getText().isEmpty()) && 
-    	   emptyValidation("Role", getRole() == null) &&
-    	   validate("Email", getEmail(), "[a-zA-Z0-9][a-zA-Z0-9._]*@[a-zA-Z0-9]+([.][a-zA-Z]+)+") &&
-    	   emptyValidation("Password", getPassword().isEmpty())){
+    	   emptyValidation("Role", getRole() == null) ){
     		
     		if(userId.getText() == null || userId.getText() == ""){
-    			User user = new User();
-    			user.setFirstName(getFirstName());
-    			user.setLastName(getLastName());
-    			user.setDob(getDob());
-    			user.setGender(getGender());
-    			user.setRole(getRole());
-    			user.setEmail(getEmail());
-    			user.setPassword(getPassword());
-    			
-    			User newUser = userService.save(user);
+    			if(validate("Email", getEmail(), "[a-zA-Z0-9][a-zA-Z0-9._]*@[a-zA-Z0-9]+([.][a-zA-Z]+)+") &&
+    				emptyValidation("Password", getPassword().isEmpty())){
+    				
+    				User user = new User();
+        			user.setFirstName(getFirstName());
+        			user.setLastName(getLastName());
+        			user.setDob(getDob());
+        			user.setGender(getGender());
+        			user.setRole(getRole());
+        			user.setEmail(getEmail());
+        			user.setPassword(getPassword());
+        			
+        			User newUser = userService.save(user);
+        			
+        			saveAlert(newUser);
+    			}
     			
-    			saveAlert(newUser);
     		}else{
     			User user = userService.find(Long.parseLong(userId.getText()));
     			user.setFirstName(getFirstName());
@@ -206,13 +209,7 @@ private void deleteUsers(ActionEvent event){
     	loadUserDetails();
     }
     
-    @FXML
-    private void test(ActionEvent event){
-    	testAlert();
-    }
-    
-
-	private void clearFields() {
+   	private void clearFields() {
 		userId.setText(null);
 		firstName.clear();
 		lastName.clear();
@@ -242,15 +239,6 @@ private void updateAlert(User user){
 		alert.showAndWait();
 	}
 	
-	private void testAlert(){
-		
-		Alert alert = new Alert(AlertType.INFORMATION);
-		alert.setTitle("Test Dialog");
-		alert.setHeaderText(null);
-		alert.setContentText("Test alert context test ?");
-		alert.showAndWait();
-	}
-	
 	private String getGenderTitle(String gender){
 		return (gender.equals("Male")) ? "his" : "her";
 	}
