diff --git a/pom.xml b/pom.xml index 8f0067f..e7eda77 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,12 @@ mysql-connector-java 8.0.28 + + + org.mariadb.jdbc + mariadb-java-client + 3.0.3 + org.junit.jupiter junit-jupiter-api diff --git a/src/main/java/ru/egspt/Access.java b/src/main/java/ru/egspt/Access.java index f08ecd1..4974923 100644 --- a/src/main/java/ru/egspt/Access.java +++ b/src/main/java/ru/egspt/Access.java @@ -7,7 +7,8 @@ public class Access { * @param link the link to set */ public void setLink(String link) { - this.link = "jdbc:MySQL://" + link + ":3306/moodle"; + //this.link = "jdbc:MySQL://" + link + ":3306/moodle"; + this.link = "jdbc:mariadb://" + link + ":3306/moodle"; } /** * @return the link @@ -39,5 +40,5 @@ public class Access { public String getPassword() { return password; } - + } diff --git a/src/main/java/ru/egspt/implant/Runner.java b/src/main/java/ru/egspt/implant/Runner.java index af3322c..a43cefb 100644 --- a/src/main/java/ru/egspt/implant/Runner.java +++ b/src/main/java/ru/egspt/implant/Runner.java @@ -33,7 +33,6 @@ public class Runner { ArrayList quizes = r.data.getQuizesFromBase(r.base); ArrayList results = r.data.getResultsFromBase(r.base); ArrayList users = r.data.getUsersFromBase(r.base); - } } diff --git a/src/main/sql/script.sql b/src/main/sql/script.sql new file mode 100644 index 0000000..547e6d1 --- /dev/null +++ b/src/main/sql/script.sql @@ -0,0 +1,37 @@ +-- пользователи +SELECT id, username, email FROM mdl_user +-- опросы +SELECT id, name FROM mdl_quiz; +-- попытки /общие данные +SELECT id, quiz, userid, attempt, timestart, timefinish, sumgrades FROM mdl_quiz_attempts; + +-- отчет +WITH pure AS ( + SELECT + mqa.id as pure_id, + mqa.userid as pure_userid, + mqa.attempt as pure_attempt, + FROM_UNIXTIME(mqa.timestart) AS pure_timestart_date, + FROM_UNIXTIME(mqa.timefinish) AS pure_timefinish_date, + mqa.sumgrades as pure_mqa_sumgrades, + mqa.quiz as pure_mqa_quiz, + mq.id as pure_mq_id, + mq.name as pure_mq_name, + mu.id as pure_mu_id, + mu.username as pure_mu_username, + mu.email as pure_mu_email + FROM mdl_quiz_attempts as mqa + LEFT JOIN mdl_quiz as mq on mqa.quiz=mq.id + LEFT JOIN mdl_user as mu on mqa.userid=mu.id + WHERE mqa.userid > 3849 +) +SELECT + pure_id, + pure_userid, + pure_mu_username, + pure_mu_email, + pure_timestart_date, + pure_timefinish_date, + pure_mqa_sumgrades, + pure_mq_name +FROM pure as report; diff --git a/target/classes/ru/egspt/Access.class b/target/classes/ru/egspt/Access.class index a0b813b..c95dcd9 100644 Binary files a/target/classes/ru/egspt/Access.class and b/target/classes/ru/egspt/Access.class differ diff --git a/target/classes/ru/egspt/AccessPane.class b/target/classes/ru/egspt/AccessPane.class index f69b8f9..f5c3965 100644 Binary files a/target/classes/ru/egspt/AccessPane.class and b/target/classes/ru/egspt/AccessPane.class differ diff --git a/target/classes/ru/egspt/App.class b/target/classes/ru/egspt/App.class index f811d02..21da90e 100644 Binary files a/target/classes/ru/egspt/App.class and b/target/classes/ru/egspt/App.class differ diff --git a/target/classes/ru/egspt/Base.class b/target/classes/ru/egspt/Base.class index 06021ed..928f6ec 100644 Binary files a/target/classes/ru/egspt/Base.class and b/target/classes/ru/egspt/Base.class differ diff --git a/target/classes/ru/egspt/BaseControls.class b/target/classes/ru/egspt/BaseControls.class index 38e0b42..24431b7 100644 Binary files a/target/classes/ru/egspt/BaseControls.class and b/target/classes/ru/egspt/BaseControls.class differ diff --git a/target/classes/ru/egspt/Data.class b/target/classes/ru/egspt/Data.class index 3f52e15..6ab154e 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/DataPane.class b/target/classes/ru/egspt/DataPane.class index 639ab9e..019bd45 100644 Binary files a/target/classes/ru/egspt/DataPane.class and b/target/classes/ru/egspt/DataPane.class differ diff --git a/target/classes/ru/egspt/Quiz.class b/target/classes/ru/egspt/Quiz.class index 89b1520..e4fd2a8 100644 Binary files a/target/classes/ru/egspt/Quiz.class and b/target/classes/ru/egspt/Quiz.class differ diff --git a/target/classes/ru/egspt/QuizesTableModel.class b/target/classes/ru/egspt/QuizesTableModel.class index c0f7fb9..79c4a75 100644 Binary files a/target/classes/ru/egspt/QuizesTableModel.class and b/target/classes/ru/egspt/QuizesTableModel.class differ diff --git a/target/classes/ru/egspt/ReportControls.class b/target/classes/ru/egspt/ReportControls.class index 2a47470..618b0b7 100644 Binary files a/target/classes/ru/egspt/ReportControls.class and b/target/classes/ru/egspt/ReportControls.class differ diff --git a/target/classes/ru/egspt/ReportPane.class b/target/classes/ru/egspt/ReportPane.class index 1deac9e..80c1b6e 100644 Binary files a/target/classes/ru/egspt/ReportPane.class and b/target/classes/ru/egspt/ReportPane.class differ diff --git a/target/classes/ru/egspt/ReportTableModel.class b/target/classes/ru/egspt/ReportTableModel.class index 49d186f..a4e892a 100644 Binary files a/target/classes/ru/egspt/ReportTableModel.class and b/target/classes/ru/egspt/ReportTableModel.class differ diff --git a/target/classes/ru/egspt/Result.class b/target/classes/ru/egspt/Result.class index cd80d23..2cd8281 100644 Binary files a/target/classes/ru/egspt/Result.class and b/target/classes/ru/egspt/Result.class differ diff --git a/target/classes/ru/egspt/ResultsTableModel.class b/target/classes/ru/egspt/ResultsTableModel.class index 437e3af..5cd079c 100644 Binary files a/target/classes/ru/egspt/ResultsTableModel.class and b/target/classes/ru/egspt/ResultsTableModel.class differ diff --git a/target/classes/ru/egspt/TagControls.class b/target/classes/ru/egspt/TagControls.class index fdbedd6..8259e5b 100644 Binary files a/target/classes/ru/egspt/TagControls.class and b/target/classes/ru/egspt/TagControls.class differ diff --git a/target/classes/ru/egspt/TagModel.class b/target/classes/ru/egspt/TagModel.class index 07ba474..eea98b6 100644 Binary files a/target/classes/ru/egspt/TagModel.class and b/target/classes/ru/egspt/TagModel.class differ diff --git a/target/classes/ru/egspt/TagPane.class b/target/classes/ru/egspt/TagPane.class index e4acfaf..2f2cca8 100644 Binary files a/target/classes/ru/egspt/TagPane.class and b/target/classes/ru/egspt/TagPane.class differ diff --git a/target/classes/ru/egspt/User.class b/target/classes/ru/egspt/User.class index 942b9bb..b45003d 100644 Binary files a/target/classes/ru/egspt/User.class and b/target/classes/ru/egspt/User.class differ diff --git a/target/classes/ru/egspt/UserListModel.class b/target/classes/ru/egspt/UserListModel.class index 967ae4c..f694b35 100644 Binary files a/target/classes/ru/egspt/UserListModel.class and b/target/classes/ru/egspt/UserListModel.class differ diff --git a/target/classes/ru/egspt/UsersTableModel.class b/target/classes/ru/egspt/UsersTableModel.class index b3df93c..9c62fe7 100644 Binary files a/target/classes/ru/egspt/UsersTableModel.class and b/target/classes/ru/egspt/UsersTableModel.class differ diff --git a/target/classes/ru/egspt/implant/ExtendedUser$1.class b/target/classes/ru/egspt/implant/ExtendedUser$1.class new file mode 100644 index 0000000..4e97366 Binary files /dev/null and b/target/classes/ru/egspt/implant/ExtendedUser$1.class differ diff --git a/target/classes/ru/egspt/implant/ExtendedUser$ExtendedUserBuilder.class b/target/classes/ru/egspt/implant/ExtendedUser$ExtendedUserBuilder.class index 8876518..1a0ab8e 100644 Binary files a/target/classes/ru/egspt/implant/ExtendedUser$ExtendedUserBuilder.class and b/target/classes/ru/egspt/implant/ExtendedUser$ExtendedUserBuilder.class differ diff --git a/target/classes/ru/egspt/implant/ExtendedUser.class b/target/classes/ru/egspt/implant/ExtendedUser.class index ab0d83d..42b29d9 100644 Binary files a/target/classes/ru/egspt/implant/ExtendedUser.class and b/target/classes/ru/egspt/implant/ExtendedUser.class differ diff --git a/target/classes/ru/egspt/implant/Implant.class b/target/classes/ru/egspt/implant/Implant.class index 840be90..593fb55 100644 Binary files a/target/classes/ru/egspt/implant/Implant.class and b/target/classes/ru/egspt/implant/Implant.class differ diff --git a/target/classes/ru/egspt/implant/Runner.class b/target/classes/ru/egspt/implant/Runner.class index 0a3a7b8..c39aea5 100644 Binary files a/target/classes/ru/egspt/implant/Runner.class and b/target/classes/ru/egspt/implant/Runner.class differ diff --git a/target/classes/ru/molokoin/Runner.class b/target/classes/ru/molokoin/Runner.class index 3fa50cb..7aa5d4b 100644 Binary files a/target/classes/ru/molokoin/Runner.class and b/target/classes/ru/molokoin/Runner.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 8c5ea88..034a135 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,20 +1,21 @@ ru\egspt\TagControls.class ru\egspt\ResultsTableModel.class -ru\egspt\User.class ru\egspt\App.class -ru\egspt\QuizesTableModel.class ru\egspt\TagModel.class +ru\egspt\implant\ExtendedUser$1.class ru\egspt\BaseControls.class -ru\egspt\ReportTableModel.class ru\egspt\Result.class ru\egspt\AccessPane.class ru\egspt\DataPane.class ru\egspt\Quiz.class ru\egspt\Access.class ru\egspt\Base.class -ru\egspt\UsersTableModel.class ru\egspt\ReportControls.class ru\egspt\UserListModel.class ru\egspt\TagPane.class ru\egspt\Data.class +ru\egspt\User.class +ru\egspt\QuizesTableModel.class +ru\egspt\ReportTableModel.class +ru\egspt\UsersTableModel.class ru\egspt\ReportPane.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index f5d13f2..cccf51b 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,20 +1,24 @@ -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\TagPane.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\QuizesTableModel.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\TagModel.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\AccessPane.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\BaseControls.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\DataPane.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\Data.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\ReportTableModel.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\ResultsTableModel.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\Access.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\App.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\Base.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\User.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\UsersTableModel.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\ReportControls.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\UserListModel.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\Result.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\TagControls.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\ReportPane.java -c:\Users\devuser\Documents\code\moodle\moodle-anyreport\src\main\java\ru\egspt\Quiz.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\BaseControls.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\implant\ExtendedUser.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\implant\Runner.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\ReportControls.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\TagControls.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\UsersTableModel.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\AccessPane.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\QuizesTableModel.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\ReportPane.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\ReportTableModel.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\implant\Implant.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\Quiz.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\ResultsTableModel.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\Access.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\molokoin\Runner.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\Data.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\Result.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\App.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\DataPane.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\TagModel.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\User.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\TagPane.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\Base.java +c:\Users\devuser\Documents\code\moodle-anyreport\src\main\java\ru\egspt\UserListModel.java diff --git a/target/moodle-anyreport-0.1-jar-with-dependencies.jar b/target/moodle-anyreport-0.1-jar-with-dependencies.jar index bc33660..ce0c497 100644 Binary files a/target/moodle-anyreport-0.1-jar-with-dependencies.jar and b/target/moodle-anyreport-0.1-jar-with-dependencies.jar differ diff --git a/target/moodle-anyreport-0.1.jar b/target/moodle-anyreport-0.1.jar index 704f506..c76dbc6 100644 Binary files a/target/moodle-anyreport-0.1.jar and b/target/moodle-anyreport-0.1.jar differ