diff --git a/src/main/java/ru/egspt/Data.java b/src/main/java/ru/egspt/Data.java index e5f11e7..03cc478 100644 --- a/src/main/java/ru/egspt/Data.java +++ b/src/main/java/ru/egspt/Data.java @@ -86,7 +86,12 @@ public class Data extends UserListModel { /** * @return полный перечень результатов из базы */ - public ArrayList getResultsFromBase(Base base) { + /** + * + * @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); @@ -108,6 +113,32 @@ public class Data extends UserListModel { } 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"; + 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("sumgrades"); + Long timestartAt = rs.getLong("timestart"); + Long timefinishAt = rs.getLong("timefinish"); + Long time = timefinishAt - timestartAt; + 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 getResultsByUsers(ArrayList results, ArrayList users){ ArrayList r = new ArrayList<>(); //перебор результатов diff --git a/src/main/java/ru/egspt/ReportTableModel.java b/src/main/java/ru/egspt/ReportTableModel.java index c1577c4..4ebd43d 100644 --- a/src/main/java/ru/egspt/ReportTableModel.java +++ b/src/main/java/ru/egspt/ReportTableModel.java @@ -165,6 +165,7 @@ public class ReportTableModel extends AbstractTableModel{ d[userCurr][headerCurr] = report.getResults().get(resultCurr).getGrade(); //формируем ячейку time Long time = report.getResults().get(resultCurr).getTime(); + // String t = LocalTime.MIN.plusSeconds(time).toString(); d[userCurr][headerCurr + 1] = t; } diff --git a/target/classes/ru/egspt/Data.class b/target/classes/ru/egspt/Data.class index 3b5f9bc..1c446de 100644 Binary files a/target/classes/ru/egspt/Data.class and b/target/classes/ru/egspt/Data.class differ diff --git a/target/classes/ru/egspt/ReportTableModel.class b/target/classes/ru/egspt/ReportTableModel.class index 5cf6a24..601a3fc 100644 Binary files a/target/classes/ru/egspt/ReportTableModel.class and b/target/classes/ru/egspt/ReportTableModel.class differ