diff options
Diffstat (limited to 'src/com.example.portfolio2/com/example/portfolio2/Database.java')
| -rw-r--r-- | src/com.example.portfolio2/com/example/portfolio2/Database.java | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/com.example.portfolio2/com/example/portfolio2/Database.java b/src/com.example.portfolio2/com/example/portfolio2/Database.java index a6a144a..6edcfed 100644 --- a/src/com.example.portfolio2/com/example/portfolio2/Database.java +++ b/src/com.example.portfolio2/com/example/portfolio2/Database.java @@ -32,7 +32,10 @@ class Database { if (name == null) { return -1; } - ArrayList<String> result = db.query("select indeks from activity a where name is '" + name + "';", "indeks"); + ArrayList<String> result = db.query( + "select indeks from activity a" + + " where name is '" + name + "';", + "indeks"); return Integer.parseInt(result.getFirst()); } @@ -41,7 +44,8 @@ class Database { /// /// @param activityIndex index of activity void addParticipation(final int activityIndex) { - db.cmd("insert into participation values(123, " + activityIndex + ");"); + db.cmd("insert into participation values(123, " + + activityIndex + ");"); } /// list currently participating activities @@ -49,7 +53,11 @@ class Database { /// @param program programme name /// @return names of participating activities ArrayList<String> getParticipation(final String program) { - return db.query("select name from participation p inner join activity a on p.indeks = a.indeks where program is '" + program + "';", "name"); + return db.query( + "select name from participation p" + + " inner join activity a on p.indeks = a.indeks" + + " where program is '" + program + "';", + "name"); } /// purge participation database @@ -62,7 +70,10 @@ class Database { /// @param program programme name /// @return names of contained activities ArrayList<String> selectProgram(final String program) { - return db.query("select name from activity where program is '" + program + "';", "name"); + return db.query( + "select name from activity" + + " where program is '" + program + "';", + "name"); } /// sum of ECTS points under the given category @@ -73,7 +84,16 @@ class Database { if (program == null) { return "0"; } - ArrayList<String> result = db.query("select sum(activity.ects) as total_ects,student.name from student left outer join participation on student.studid = participation.studid inner join activity on participation.indeks = activity.indeks where program is '" + program + "' group by student.studid ;", "total_ects"); + ArrayList<String> result = db.query( + "select sum(activity.ects)" + + " as total_ects,student.name" + + " from student left outer join participation" + + " on student.studid = participation.studid" + + " inner join activity" + + " on participation.indeks = activity.indeks" + + " where program is '" + program + "'" + + " group by student.studid ;", + "total_ects"); if (result.isEmpty()) { return "0"; } |