1 files changed, 80 insertions, 2 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/UserDatabaseFrom.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/UserDatabaseFrom.java
index 881cdf277..ab08b458a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/UserDatabaseFrom.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/UserDatabaseFrom.java
@@ -2,7 +2,6 @@ package at.gv.egovernment.moa.id.configuration.data;
 
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.util.MiscUtil;
-import at.gv.util.data.BPK;
 
 public class UserDatabaseFrom {
 	
@@ -18,10 +17,14 @@ public class UserDatabaseFrom {
 	private boolean active = false;
 	private boolean admin = false;
 	private boolean passwordActive;
+	private boolean isusernamepasswordallowed = false;
+	private boolean isadminrequest = true;
+	private boolean ismandateuser = false;
+	private boolean isPVPGenerated; 
 	private String userID = null;
 	
 	public UserDatabaseFrom() {
-		
+
 	}
 	
 	public UserDatabaseFrom(UserDatabase db) {
@@ -41,6 +44,26 @@ public class UserDatabaseFrom {
 		active = db.isIsActive();
 		admin = db.isIsAdmin();
 		
+		if (db.isIsUsernamePasswordAllowed() != null)
+			isusernamepasswordallowed = db.isIsUsernamePasswordAllowed();
+		else
+			isusernamepasswordallowed = true;
+		
+		if (db.isIsAdminRequest() != null)
+			isadminrequest = db.isIsAdminRequest();
+		else
+			isadminrequest = false;
+		
+		if (db.isIsMandateUser() != null)
+			ismandateuser = db.isIsMandateUser();
+		else
+			ismandateuser = false;
+		
+		if (db.isIsPVP2Generated() != null)
+			isPVPGenerated = db.isIsPVP2Generated();
+		else
+			isPVPGenerated = false;
+		
 		userID = String.valueOf(db.getHjid());
 	}
 
@@ -247,7 +270,62 @@ public class UserDatabaseFrom {
 	public void setPassword_second(String password_second) {
 		this.password_second = password_second;
 	}
+
+	/**
+	 * @return the isusernamepasswordallowed
+	 */
+	public boolean isIsusernamepasswordallowed() {
+		return isusernamepasswordallowed;
+	}
+
+	/**
+	 * @param isusernamepasswordallowed the isusernamepasswordallowed to set
+	 */
+	public void setIsusernamepasswordallowed(boolean isusernamepasswordallowed) {
+		this.isusernamepasswordallowed = isusernamepasswordallowed;
+	}
+
+	/**
+	 * @return the ismandateuser
+	 */
+	public boolean isIsmandateuser() {
+		return ismandateuser;
+	}
 	
 	
+	/**
+	 * @param ismandateuser the ismandateuser to set
+	 */
+	public void setIsmandateuser(boolean ismandateuser) {
+		this.ismandateuser = ismandateuser;
+	}
+
+	/**
+	 * @return the isadminrequest
+	 */
+	public boolean isIsadminrequest() {
+		return isadminrequest;
+	}
+
+	/**
+	 * @param isadminrequest the isadminrequest to set
+	 */
+	public void setIsadminrequest(boolean isadminrequest) {
+		this.isadminrequest = isadminrequest;
+	}
+
+	/**
+	 * @return the isPVPGenerated
+	 */
+	public boolean isPVPGenerated() {
+		return isPVPGenerated;
+	}
+
+	/**
+	 * @param isPVPGenerated the isPVPGenerated to set
+	 */
+	public void setPVPGenerated(boolean isPVPGenerated) {
+		this.isPVPGenerated = isPVPGenerated;
+	}
 	
 }