resolve modules from SQL query

1 files changed, 7 insertions, 23 deletions

diff --git a/src/com.example.portfolio2/com/example/portfolio2/Database.java b/src/com.example.portfolio2/com/example/portfolio2/Database.java
index d978e83..0c11e31 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/Database.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/Database.java
@@ -17,14 +17,6 @@ class Database {
 	/// database singleton
 	MyDB db = new MyDB();
 
-	/// available subject modules
-	// TODO: replace this dummy placeholder with database query
-	private List<String> Modules = List.of(
-		"Computer Science",
-		"Informatik",
-		"Astrology"
-	);
-
 	/// default constructor
 	// (declared explicitly only to silence javadoc)
 	Database() { }
@@ -34,19 +26,6 @@ class Database {
 		clearParticipation();
 	}
 
-	/// resolve subject module index from name
-	///
-	/// @param name  subject module name
-	/// @return      index of subject module as integer
-	// TODO: replace this dummy placeholder with database query
-	int getModuleIndeks(final String name) {
-		if (name == null) {
-			return -1;
-		}
-
-		return Modules.indexOf(name);
-	}
-
 	/// resolve activity index from name
 	///
 	/// @param name  activity name
@@ -126,9 +105,14 @@ class Database {
 
 	/// list of available subject modules
 	///
-	/// @return  names of all subject moduless as list of strings
+	/// @return  names of all subject modules as list of strings
 	List<String> getAllModules() {
-		return Modules;
+		return db.query(
+			"SELECT DISTINCT program FROM activity"
+			+ " WHERE program IN ("
+			+ "   SELECT program from activity"
+			+ "   WHERE name LIKE 'BP1 %')",
+			"program");
 	}
 
 	/// list of available activities