diff --git a/src/main/java/ru/egspt/Data.java b/src/main/java/ru/egspt/Data.java index 03cc478..8467b28 100644 --- a/src/main/java/ru/egspt/Data.java +++ b/src/main/java/ru/egspt/Data.java @@ -24,7 +24,7 @@ public class Data extends UserListModel { */ public ArrayList getQuizesFromBase(Base base) { ArrayList q = new ArrayList<>(); - String querry = "SELECT id, name, timelimit FROM mdl_quiz"; + String querry = "SELECT id, name FROM mdl_quiz"; ResultSet rs = base.querry(querry); try { while (rs.next()){ @@ -86,38 +86,9 @@ public class Data extends UserListModel { /** * @return полный перечень результатов из базы */ - /** - * - * @param base - * @return - - public ArrayList getResultsFromBase(Base base) { - ArrayList r = new ArrayList<>(); - String querry = "SELECT id, quiz, userid, grade, timemodified FROM mdl_quiz_grades"; - ResultSet rs = base.querry(querry); - try { - while (rs.next()){ - int id = rs.getInt("id"); - int quizid = rs.getInt("quiz"); - int userid = rs.getInt("userid"); - double grade = rs.getDouble("grade"); - Long time = rs.getLong("timemodified"); - Result result = new Result(id, quizid, userid, grade, time); - r.add(result); - } - } - catch (Exception ex){ - System.err.println ("Подключение к серверу баз данных не установлено ... "); - ex.printStackTrace(); - System.out.println (ex); - } - return r; - } - */ - public ArrayList getResultsFromBase(Base base) { ArrayList r = new ArrayList<>(); - String querry = "SELECT id, quiz, userid, attempt, timestart, timefinish, timemodified, sumgrades FROM mdl_quiz_attempts"; + String querry = "SELECT id, quiz, userid, attempt, timestart, timefinish, sumgrades FROM mdl_quiz_attempts"; ResultSet rs = base.querry(querry); try { while (rs.next()){ diff --git a/target/classes/ru/egspt/Data.class b/target/classes/ru/egspt/Data.class index 1c446de..3f52e15 100644 Binary files a/target/classes/ru/egspt/Data.class and b/target/classes/ru/egspt/Data.class differ