diff --git a/Model/src/main/java/org/gusdb/wdk/core/api/JsonKeys.java b/Model/src/main/java/org/gusdb/wdk/core/api/JsonKeys.java index a87926997..667b21465 100644 --- a/Model/src/main/java/org/gusdb/wdk/core/api/JsonKeys.java +++ b/Model/src/main/java/org/gusdb/wdk/core/api/JsonKeys.java @@ -60,10 +60,12 @@ public class JsonKeys { public static final String DISPLAY_TEXT = "displayText"; public static final String HELP = "help"; public static final String HTML_HELP = "htmlHelp"; + public static final String SUGGEST_TEXT = "suggestText"; public static final String DESCRIPTION = "description"; public static final String SHORT_DESCRIPTION = "shortDescription"; public static final String SUMMARY = "summary"; public static final String ALIGN = "align"; + public static final String INPUT_TYPE = "inputType"; public static final String TRUNCATE_TO = "truncateTo"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_SORTABLE = "isSortable"; diff --git a/Service/src/main/java/org/gusdb/wdk/service/formatter/ProjectFormatter.java b/Service/src/main/java/org/gusdb/wdk/service/formatter/ProjectFormatter.java index d0abea4be..deaa0ee20 100644 --- a/Service/src/main/java/org/gusdb/wdk/service/formatter/ProjectFormatter.java +++ b/Service/src/main/java/org/gusdb/wdk/service/formatter/ProjectFormatter.java @@ -53,10 +53,12 @@ public static JSONObject getWdkProjectInfo(WdkModel wdkModel, String serviceEndp for (UserProperty prop : User.USER_PROPERTIES.values()) { userProfileProps.put(new JSONObject() .put(JsonKeys.NAME, prop.getName()) + .put(JsonKeys.IS_PUBLIC, prop.isPublic()) .put(JsonKeys.DISPLAY_NAME, prop.getDisplayName()) - .put(JsonKeys.IS_REQUIRED, prop.isRequired()) - .put(JsonKeys.IS_MULTILINE, prop.isMultiLine()) - .put(JsonKeys.IS_PUBLIC, prop.isPublic())); + .put(JsonKeys.HELP, prop.getHelpText()) + .put(JsonKeys.SUGGEST_TEXT, prop.getSuggest()) + .put(JsonKeys.INPUT_TYPE, prop.getInputType().name().toLowerCase()) + .put(JsonKeys.IS_REQUIRED, prop.isRequired())); } return new JSONObject()