fix SQL invert query for subject modules; rename method getAllModules() -> getAllSubjects()

2 files changed, 3 insertions, 3 deletions

diff --git a/src/com.example.portfolio2/com/example/portfolio2/Controller.java b/src/com.example.portfolio2/com/example/portfolio2/Controller.java
index 154cf42..66519ae 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/Controller.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/Controller.java
@@ -92,7 +92,7 @@ class Controller {
 	) {
 
 		// remove chosen option from opposite subject module box
-		for (String sub: store.getAllModules()) {
+		for (String sub: store.getAllSubjects()) {
 			if (sub.equals(subject1.getValue())) {
 				subject2.getItems().remove(
 					subject1.getValue());
diff --git a/src/com.example.portfolio2/com/example/portfolio2/Database.java b/src/com.example.portfolio2/com/example/portfolio2/Database.java
index 0c11e31..22a7c5a 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/Database.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/Database.java
@@ -106,10 +106,10 @@ class Database {
 	/// list of available subject modules
 	///
 	/// @return  names of all subject modules as list of strings
-	List<String> getAllModules() {
+	List<String> getAllSubjects() {
 		return db.query(
 			"SELECT DISTINCT program FROM activity"
-			+ " WHERE program IN ("
+			+ " WHERE program NOT IN ("
 			+ "   SELECT program from activity"
 			+ "   WHERE name LIKE 'BP1 %')",
 			"program");