Custom Decimals Moar

Example.schema

@@ -2,7 +2,8 @@
 
 // :base gibt die Start-Punkte an und überschreibt die maximal Punkt, wenn ungleich 0
 :base 0.0
-
+// Count of decimal places
+:decimals 1
 // Design für Punkte. Pts ist dabei für die Punkte, PtsText für den Text. die Punkte zählen als Teil des Textes (<li style=PtsText><span style=Pts>'Punkte'</span>Text</li>)
 // full -> best-Case
 :fullPts	color: #0f0; font-weight: bold;

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/HtmlContext.java

@@ -16,6 +16,8 @@ public class HtmlContext
 	public String cbmsFail = "";
 	/** Style for checked Boxes in CheckboxMultiSelect */
 	public String cbmsOk = "";
+	/** Number of Decimals on Points */
+	public int decimals = 1;
 	/** Style for the Points, when the best case Points have been achieved */
 	public String fullPtsStyle = "";
 	/** Style for the Text, when the best case Points have been achieved */
@@ -24,6 +26,7 @@ public class HtmlContext
 	public MathContext mc = MathContext.DECIMAL32;
 	/** Style for the Points, when the worst case Points have been achieved */
 	public String noPtsStyle = "";
+
 	/** Style for the Text, when the best case Points have been achieved */
 	public String noPtsTextStyle = "";
 

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/KorrekturHelper.java

@@ -81,7 +81,7 @@ public class KorrekturHelper
 		kh.frm.setVisible(true);
 	}
 
-	private static LinkedHashSet<Node> parseNodes(String[] lines, int[] lineMap) throws IOException
+	private static LinkedHashSet<Node> parseNodes(String[] lines, int[] lineMap, HtmlContext hc) throws IOException
 	{
 		var roots = new LinkedHashSet<Node>();
 		var path = new LinkedList<Node>();
@@ -97,10 +97,10 @@ public class KorrekturHelper
 					yield new HeaderNode(line.substring(path.size()));
 
 				case "[]": // [] -0.5 Punktabzug
-					yield new CheckboxNode(line.substring(path.size()));
+					yield new CheckboxNode(line.substring(path.size()), hc);
 
 				case "\\": // \ 1.0 Element existiert | Element existiert nicht
-					yield new EitherNode(line.substring(path.size()));
+					yield new EitherNode(line.substring(path.size()), hc);
 
 				case "\\\\": // \\ MultiSelects
 					if (lines.length <= li)
@@ -118,12 +118,12 @@ public class KorrekturHelper
 					if (lines[li + 1].trim().startsWith("[]"))
 					{
 						li = i - 1;
-						yield new CheckboxMultiSelectNode(sb.toString());
+						yield new CheckboxMultiSelectNode(sb.toString(), hc);
 					}
 					else
 					{
 						li = i - 1;
-						yield new RadioMultiSelectNode(sb.toString());
+						yield new RadioMultiSelectNode(sb.toString(), hc);
 					}
 
 				case "":
@@ -200,6 +200,10 @@ public class KorrekturHelper
 						hc.basePoints = new BigDecimal(split[1]);
 						break;
 
+					case ":decimals":
+						hc.decimals = Integer.parseInt(split[1]);
+						break;
+
 					case ":fullPts":
 						hc.fullPtsStyle = split.length > 1 ? split[1] : "";
 						break;
@@ -239,7 +243,7 @@ public class KorrekturHelper
 				lineMap.add(lineNumber);
 			}
 		}
-		return parseNodes(nodeLines.toArray(String[]::new), lineMap.stream().mapToInt(i -> i).toArray());
+		return parseNodes(nodeLines.toArray(String[]::new), lineMap.stream().mapToInt(i -> i).toArray(), hc);
 	}
 
 	private static BigDecimal recursiveAchievedPoints(LinkedHashSet<Node> nodes, MathContext mc)

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/Utils.java

@@ -11,12 +11,13 @@ public class Utils
 	/**
 	 * formats Points for Users
 	 *
-	 * @param bd the {@link BigDecimal} to format
+	 * @param bd       the {@link BigDecimal} to format
+	 * @param decimals decimals
 	 * @return the formatted String (1 decimal place)
 	 */
-	public static String formatPoints(BigDecimal bd)
+	public static String formatPoints(BigDecimal bd, int decimals)
 	{
-		return String.format("%.1f", bd.doubleValue());
+		return String.format("%." + decimals + "f", bd.doubleValue());
 	}
 
 	/**

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/nodes/CheckboxMultiSelectNode.java

@@ -25,8 +25,9 @@ public class CheckboxMultiSelectNode extends AbstractNode
 
 	/**
 	 * @param config the config string to parse
+	 * @param hc     {@link HtmlContext}
 	 */
-	public CheckboxMultiSelectNode(String config)
+	public CheckboxMultiSelectNode(String config, HtmlContext hc)
 	{
 		var lines = config.split("\n");
 		if (lines.length <= 1)
@@ -58,7 +59,7 @@ public class CheckboxMultiSelectNode extends AbstractNode
 			{ throw new IllegalArgumentException("Expected []"); }
 			points[i - 1] = new BigDecimal(s[1]);
 			text[i - 1] = s[2];
-			rbs[i - 1] = new JCheckBox(Utils.formatPoints(points[i - 1]) + "P - " + text[i - 1]);
+			rbs[i - 1] = new JCheckBox(Utils.formatPoints(points[i - 1], hc.decimals) + "P - " + text[i - 1]);
 			rbs[i - 1].addActionListener(cl);
 			content.add(rbs[i - 1]);
 		}
@@ -124,7 +125,8 @@ public class CheckboxMultiSelectNode extends AbstractNode
 		var sb = new StringBuilder();
 		sb.append("<li").append(hc.styleText(achievedPoints(hc.mc), maxPoints)).append(">");
 		sb.append("<span").append(hc.stylePts(achievedPoints(hc.mc), maxPoints)).append(">");
-		sb.append(Utils.formatPoints(achievedPoints(hc.mc))).append(" / ").append(Utils.formatPoints(maxPoints));
+		sb.append(Utils.formatPoints(achievedPoints(hc.mc), hc.decimals)).append(" / ")
+				.append(Utils.formatPoints(maxPoints, hc.decimals));
 		sb.append("P</span> ");
 		sb.append(baseMsg);
 		sb.append("\n\t<ul style=\"list-style-type: none;margin-top: 0px;margin-bottom:0px\">\n");
@@ -132,7 +134,7 @@ public class CheckboxMultiSelectNode extends AbstractNode
 		{
 			sb.append("\t\t<li").append(hc.cbx(rbs[i])).append(">");
 			sb.append(rbs[i].isSelected() ? "&checkmark; " : "&cross; ");
-			sb.append("(").append(Utils.formatPoints(points[i])).append("P) ");
+			sb.append("(").append(Utils.formatPoints(points[i], hc.decimals)).append("P) ");
 			sb.append(text[i]);
 			sb.append("</li>\n");
 		}

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/nodes/CheckboxNode.java

@@ -21,8 +21,9 @@ public class CheckboxNode extends AbstractNode
 
 	/**
 	 * @param configString config String to parse
+	 * @param hc           {@link HtmlContext}
 	 */
-	public CheckboxNode(String configString)
+	public CheckboxNode(String configString, HtmlContext hc)
 	{
 		if (configString.contains("\n"))
 		{ throw new IllegalArgumentException("Bad config! Found line feed!"); }
@@ -33,7 +34,7 @@ public class CheckboxNode extends AbstractNode
 		{ throw new IllegalArgumentException("Not a [] Node"); }
 		points = new BigDecimal(spl[1]);
 		message = spl[2];
-		cbx = new JCheckBox(Utils.formatPoints(points) + "P " + message);
+		cbx = new JCheckBox(Utils.formatPoints(points, hc.decimals) + "P " + message);
 		cbx.addActionListener(e -> onChange(this));
 		content.add(cbx);
 	}
@@ -70,7 +71,7 @@ public class CheckboxNode extends AbstractNode
 	public String toResultHtml(HtmlContext hc)
 	{
 		return "<li" + hc.styleText(points.signum()) + "><span" + hc.stylePts(points.signum()) + ">"
-				+ Utils.formatPoints(achievedPoints(hc.mc)) + "P</span> " + message + "</li>";
+				+ Utils.formatPoints(achievedPoints(hc.mc), hc.decimals) + "P</span> " + message + "</li>";
 	}
 
 }

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/nodes/EitherNode.java

@@ -25,8 +25,9 @@ public class EitherNode extends AbstractNode
 
 	/**
 	 * @param config the config String
+	 * @param hc     {@link HtmlContext}
 	 */
-	public EitherNode(String config)
+	public EitherNode(String config, HtmlContext hc)
 	{
 		if (config.contains("\n"))
 		{ throw new IllegalArgumentException("Bad config! Found line feed!"); }
@@ -42,14 +43,15 @@ public class EitherNode extends AbstractNode
 		messageFail = spl.length == 3 ? null : spl.length == 4 ? spl[3].substring(1).trim() : spl[4];
 		if (points.signum() > 0)
 		{
-			btn_ok = new JRadioButton(Utils.formatPoints(points) + "P " + messageOK);
+			btn_ok = new JRadioButton(Utils.formatPoints(points, hc.decimals) + "P " + messageOK);
 			btn_fail = new JRadioButton(
-					Utils.ptsToString(BigDecimal.ZERO) + "P " + (messageFail == null ? messageOK : messageFail));
+					Utils.formatPoints(BigDecimal.ZERO, hc.decimals) + "P " + (messageFail == null ? messageOK : messageFail));
 		}
 		else
 		{
-			btn_ok = new JRadioButton(Utils.formatPoints(BigDecimal.ZERO) + "P " + messageOK);
-			btn_fail = new JRadioButton(Utils.formatPoints(points) + "P " + (messageFail == null ? messageOK : messageFail));
+			btn_ok = new JRadioButton(Utils.formatPoints(BigDecimal.ZERO, hc.decimals) + "P " + messageOK);
+			btn_fail = new JRadioButton(
+					Utils.formatPoints(points, hc.decimals) + "P " + (messageFail == null ? messageOK : messageFail));
 		}
 		btn_ok.addActionListener(e -> onChange(this));
 		btn_fail.addActionListener(e -> onChange(this));
@@ -127,8 +129,8 @@ public class EitherNode extends AbstractNode
 		}
 		return "<li" + hc.styleText(signum) + ">" + //
 				"<span" + hc.stylePts(signum) + ">" + //
-				Utils.formatPoints(achievedPoints(hc.mc)) + //
-				(points.signum() < 0 ? "" : " / " + Utils.formatPoints(maximumPoints())) + "P" + //
+				Utils.formatPoints(achievedPoints(hc.mc), hc.decimals) + //
+				(points.signum() < 0 ? "" : " / " + Utils.formatPoints(maximumPoints(), hc.decimals)) + "P" + //
 				"</span> " + //
 				(points.signum() < 0 ? btn_fail.isSelected() ? messageOK : messageFail
 						: btn_fail.isSelected() ? messageFail : messageOK)

src/main/java/de/tuDortmund/cs/rvs/pingger/korrekturHelper/nodes/RadioMultiSelectNode.java

@@ -28,8 +28,9 @@ public class RadioMultiSelectNode extends AbstractNode
 
 	/**
 	 * @param config the config string to parse
+	 * @param hc     htmlContext
 	 */
-	public RadioMultiSelectNode(String config)
+	public RadioMultiSelectNode(String config, HtmlContext hc)
 	{
 		var lines = config.split("\n");
 		if (lines.length <= 1)
@@ -60,7 +61,7 @@ public class RadioMultiSelectNode extends AbstractNode
 			{ throw new IllegalArgumentException("Expected exactly 1 \\t"); }
 			points[i - 1] = new BigDecimal(s[0]);
 			text[i - 1] = s[1];
-			rbs[i - 1] = new JRadioButton(Utils.formatPoints(points[i - 1]) + "P - " + text[i - 1]);
+			rbs[i - 1] = new JRadioButton(Utils.formatPoints(points[i - 1], hc.decimals) + "P - " + text[i - 1]);
 			rbs[i - 1].addActionListener(cl);
 			content.add(rbs[i - 1]);
 			bg.add(rbs[i - 1]);
@@ -131,12 +132,14 @@ public class RadioMultiSelectNode extends AbstractNode
 		{
 			return "<li" + hc.styleText(BigDecimal.ZERO, maxPoints) + ">" + //
 					"<span" + hc.stylePts(achievedPoints(hc.mc), maxPoints) + ">" + //
-					Utils.formatPoints(BigDecimal.ZERO) + " / " + Utils.formatPoints(maxPoints) + "P</span> " + //
+					Utils.formatPoints(BigDecimal.ZERO, hc.decimals) + " / " + Utils.formatPoints(maxPoints, hc.decimals)
+					+ "P</span> " + //
 					(baseMsg == null ? "" : baseMsg) + "</li>";
 		}
 		return "<li" + hc.styleText(achievedPoints(hc.mc), maxPoints) + ">" + //
 				"<span" + hc.stylePts(achievedPoints(hc.mc), maxPoints) + "> " + //
-				Utils.formatPoints(achievedPoints(hc.mc)) + " / " + Utils.formatPoints(maxPoints) + "P</span> " + //
+				Utils.formatPoints(achievedPoints(hc.mc), hc.decimals) + " / " + Utils.formatPoints(maxPoints, hc.decimals)
+				+ "P</span> " + //
 				(baseMsg == null ? text[getSelected()] : baseMsg + " (" + text[getSelected()] + ")") + "</li>";
 	}