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 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/com.example.portfolio2/com/example/portfolio2/Database.java b/src/com.example.portfolio2/com/example/portfolio2/Database.java index 059bb3e..a4a9271 100644 --- a/src/com.example.portfolio2/com/example/portfolio2/Database.java +++ b/src/com.example.portfolio2/com/example/portfolio2/Database.java @@ -17,7 +17,7 @@ class Database { /// default constructor // (declared explicitly only to silence javadoc) - Database() {} + Database() { } /// clear the participation database at program launch void initialize() { @@ -29,17 +29,18 @@ class Database { /// @param name activity name /// @return index of activity as integer int getActivityIndeks(final String name) { - if(name ==null) return -1; - ArrayList<String> result = db.query("select indeks from activity a where name is '"+name+"';", "indeks"); - return Integer.parseInt(result.getFirst()); + if (name == null) + return -1; + ArrayList<String> result = db.query("select indeks from activity a where name is '" + name + "';", "indeks"); + return Integer.parseInt(result.getFirst()); } /// insert activity into participation /// /// @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 @@ -67,10 +68,13 @@ class Database { /// /// @param program programme name /// @return ECTS points as String - String getSumEcts(final String program){ - 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"); - if (result.isEmpty()) return "0"; + String getSumEcts(final String program) { + 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"); + if (result.isEmpty()) + return "0"; + return result.getFirst(); } |