reproducible Debian: merge all done and all open usertagged bugs together in graph

Signed-off-by: Holger Levsen <holger@layer-acht.org>

1 files changed, 19 insertions, 15 deletions

diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 72075243..55d8c16e 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -31,16 +31,18 @@ for i in reproducible unreproducible FTBFS other ; do
 done
 FIELDS[2]="datum, oldest"
 FIELDS[3]="datum "
-for TAG in $USERTAGS ; do
-	# for this table (#3) bugs with ftbfs tags are ignored _now_…
-	if [ "$TAG" = "ftbfs" ] ; then
-		continue
-	fi
-	FIELDS[3]="${FIELDS[3]}, open_$TAG, done_$TAG"
+for STATE in open_ done_ ; do
+	for TAG in $USERTAGS ; do
+		# for this table (#3) bugs with ftbfs tags are ignored _now_…
+		if [ "$TAG" = "ftbfs" ] ; then
+			continue
+		fi
+		FIELDS[3]="${FIELDS[3]}, ${STATE}$TAG"
+	done
+	# …and added at the end (so they are not ignored but rather sorted this way)
+	# Also note that FIELDS is only used for reading data, not writing.
+	FIELDS[3]="${FIELDS[3]}, ${STATE}ftbfs"
 done
-# …and added at the end (so they are not ignored but rather sorted this way)
-# Also note how FIELDS is only used for reading data, not writing.
-FIELDS[3]="${FIELDS[3]}, open_ftbfs, done_ftbfs"
 FIELDS[4]="datum, packages_with_notes"
 FIELDS[5]="datum, known_issues"
 FIELDS[7]="datum, done_bugs, open_bugs"
@@ -53,12 +55,14 @@ done
 SUM_DONE="$SUM_DONE)"
 SUM_OPEN="$SUM_OPEN)"
 FIELDS[8]="datum "
-for TAG in $USERTAGS ; do
-	# for this table (#8) bugs with ftbfs tags are ignored.
-	if [ "$TAG" = "ftbfs" ] ; then
-		continue
-	fi
-	FIELDS[8]="${FIELDS[8]}, open_$TAG, done_$TAG"
+for STATE in open_ done_ ; do
+	for TAG in $USERTAGS ; do
+		if [ "$TAG" = "ftbfs" ] ; then
+			continue
+		fi
+		FIELDS[8]="${FIELDS[8]}, ${STATE}$TAG"
+	done
+	FIELDS[8]="${FIELDS[8]}, ${STATE}ftbfs"
 done
 FIELDS[9]="datum, done_bugs, open_bugs"
 REPRODUCIBLE_DONE="(0"