Merge pull request #732 from isaacphysics/improvement/customise-coords

Add new coordinate question properties

Author: jacbn

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacCoordinateQuestion.java

@@ -21,7 +21,13 @@ public class IsaacCoordinateQuestion extends IsaacQuestionBase {
     private Integer numberOfDimensions;
 
     private Boolean ordered;  // If true, the order of the coordinates in a choice matters.
+
     private List<String> placeholderValues;
+    private Boolean useBrackets;
+    private String separator;
+    private String[] suffixes;
+    private String buttonText;
+
     private Integer significantFiguresMin;
     private Integer significantFiguresMax;
 
@@ -94,4 +100,80 @@ public List<String> getPlaceholderValues() {
     public void setPlaceholderValues(List<String> placeholderValues) {
         this.placeholderValues = placeholderValues;
     }
+
+    /**
+     * Gets whether to use brackets around the coordinates.
+     *
+     * @return true or null if brackets should be used, false otherwise.
+     */
+    public Boolean getUseBrackets() {
+        return useBrackets;
+    }
+
+    /**
+     * Sets whether to use brackets around the coordinates.
+     *
+     * @param useBrackets
+     *           - whether to use brackets around the coordinates
+     */
+    public void setUseBrackets(final Boolean useBrackets) {
+        this.useBrackets = useBrackets;
+    }
+
+    /**
+     * Gets the separator to use between values.
+     *
+     * @return separator to use between values, or null to default to comma.
+     */
+    public String getSeparator() {
+        return separator;
+    }
+
+    /**
+     * Sets the separator to use between values.
+     *
+     * @param separator
+     *           - separator to use between values
+     */
+    public void setSeparator(final String separator) {
+        this.separator = separator;
+    }
+
+    /**
+     * Gets the suffixes to use after each value.
+     *
+     * @return the suffixes to use after each value.
+     */
+    public String[] getSuffixes() {
+        return suffixes;
+    }
+
+    /**
+     * Sets the suffixes to use after each value.
+     *
+     * @param suffixes
+     *           - suffixes to use after each value
+     */
+    public void setSuffixes(final String[] suffixes) {
+        this.suffixes = suffixes;
+    }
+
+    /**
+     * Gets the text to display on the button used to add additional coordinates.
+     *
+     * @return the button text, or null to use default text.
+     */
+    public String getButtonText() {
+        return buttonText;
+    }
+
+    /**
+     * Sets the text to display on the button used to add additional coordinates.
+     *
+     * @param buttonText
+     *          - button text
+     */
+    public void setButtonText(final String buttonText) {
+        this.buttonText = buttonText;
+    }
 }

src/main/java/uk/ac/cam/cl/dtg/isaac/dto/IsaacCoordinateQuestionDTO.java

@@ -12,6 +12,10 @@ public class IsaacCoordinateQuestionDTO extends IsaacQuestionBaseDTO {
     private Boolean ordered;
 
     private List<String> placeholderValues;
+    private Boolean useBrackets;
+    private String separator;
+    private String[] suffixes;
+    private String buttonText;
 
     public Integer getNumberOfCoordinates() {
         return numberOfCoordinates;
@@ -44,4 +48,80 @@ public List<String> getPlaceholderValues() {
     public void setPlaceholderValues(List<String> placeholderValues) {
         this.placeholderValues = placeholderValues;
     }
+
+    /**
+     * Gets whether to use brackets around the coordinates.
+     *
+     * @return true or null if brackets should be used, false otherwise.
+     */
+    public Boolean getUseBrackets() {
+        return useBrackets;
+    }
+
+    /**
+     * Sets whether to use brackets around the coordinates.
+     *
+     * @param useBrackets
+     *           - whether to use brackets around the coordinates
+     */
+    public void setUseBrackets(final Boolean useBrackets) {
+        this.useBrackets = useBrackets;
+    }
+
+    /**
+     * Gets the separator to use between values.
+     *
+     * @return separator to use between values, or null to default to comma.
+     */
+    public String getSeparator() {
+        return separator;
+    }
+
+    /**
+     * Sets the separator to use between values.
+     *
+     * @param separator
+     *           - the separator to use between values
+     */
+    public void setSeparator(final String separator) {
+        this.separator = separator;
+    }
+
+    /**
+     * Gets the suffixes to use after each value.
+     *
+     * @return suffixes to use after each value.
+     */
+    public String[] getSuffixes() {
+        return suffixes;
+    }
+
+    /**
+     * Sets the suffixes to use after each value.
+     *
+     * @param suffixes
+     *           - suffixes to use after each value
+     */
+    public void setSuffixes(final String[] suffixes) {
+        this.suffixes = suffixes;
+    }
+
+    /**
+     * Gets the text to display on the button used to add additional coordinates.
+     *
+     * @return the button text, or null to use default text.
+     */
+    public String getButtonText() {
+        return buttonText;
+    }
+
+    /**
+     * Sets the text to display on the button used to add additional coordinates.
+     *
+     * @param buttonText
+     *          - button text
+     */
+    public void setButtonText(final String buttonText) {
+        this.buttonText = buttonText;
+    }
 }