@ConfigWebTool

 --add JS ColorPicker to select colors easier
 --add BKUSelectionFrom preview
 --add useMandate checkbox

 --change position of some checkboxes in OA configuration

@MOAID lib
  --change API of BKUFormCustomization utils

1 files changed, 30 insertions, 1 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index 07c07a964..429a05242 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -50,6 +50,7 @@ public class OAGeneralConfig {
 	private String aditionalAuthBlockText = null;
 		
 	private String mandateProfiles = null;
+	private boolean useMandates = false;
 	
 	private boolean isActive = false;
 	private boolean calculateHPI = false;
@@ -175,7 +176,17 @@ public class OAGeneralConfig {
 			
 			Mandates mandates = oaauth.getMandates();
 			if (mandates != null) {
-				mandateProfiles = mandates.getProfiles();
+				
+				if (MiscUtil.isNotEmpty(mandates.getProfiles())) {
+					mandateProfiles = mandates.getProfiles();
+					useMandates = true;
+					
+				} else {
+					mandateProfiles = new String();
+					useMandates = false;
+				}
+				
+				
 			}
 			
 			TemplatesType templates = oaauth.getTemplates();
@@ -553,5 +564,23 @@ public class OAGeneralConfig {
 	 */
 	public void setHideBPKAuthBlock(boolean isHideBPKAuthBlock) {
 		this.isHideBPKAuthBlock = isHideBPKAuthBlock;
+	}
+
+
+	/**
+	 * @return the useMandates
+	 */
+	public boolean isUseMandates() {
+		return useMandates;
+	}
+
+
+	/**
+	 * @param useMandates the useMandates to set
+	 */
+	public void setUseMandates(boolean useMandates) {
+		this.useMandates = useMandates;
 	}	
+	
+	
 }