diff --git a/pom copy.xml b/pom copy.xml deleted file mode 100644 index 4331c9d..0000000 --- a/pom copy.xml +++ /dev/null @@ -1,214 +0,0 @@ - - 4.0.0 - ru.egspt - moodle-anyreport - 0.1 - jar - - 1.8 - 1.8 - UTF-8 - 5.6.0 - 3.0.0-M3 - 3.1.2 - 8.39 - 3.0.0-M5 - 0.8.4 - 3.0.0 - - 0% - 0% - 20 - 5 - - - - org.apache.poi - poi - 5.2.2 - - - org.apache.poi - poi-ooxml - 5.2.2 - - - org.apache.poi - poi-ooxml-schemas - 4.1.2 - - - org.apache.poi - poi-scratchpad - 5.2.2 - - - org.apache.poi - ooxml-schemas - 1.1 - - - org.apache.logging.log4j - log4j-to-slf4j - 2.8.2 - - - org.apache.cassandra - cassandra-all - 4.0.3 - - - mysql - mysql-connector-java - 8.0.28 - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - - enforce - - - - - 3.6.3 - - - true - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - com.github.ngeor - checkstyle-rules - 4.8.0 - - - - com/github/ngeor/checkstyle.xml - true - ${skipTests} - - - - checkstyle - validate - - check - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - pre-unit-test - - prepare-agent - - - - post-unit-test - test - - report - - - - check-unit-test - test - - check - - - ${project.build.directory}/jacoco.exec - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${jacoco.unit-tests.limit.instruction-ratio} - - - BRANCH - COVEREDRATIO - ${jacoco.unit-tests.limit.branch-ratio} - - - - - CLASS - - - COMPLEXITY - TOTALCOUNT - ${jacoco.unit-tests.limit.class-complexity} - - - - - METHOD - - - COMPLEXITY - TOTALCOUNT - ${jacoco.unit-tests.limit.method-complexity} - - - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - - diff --git a/pom.xml b/pom.xml index 5931135..8f0067f 100644 --- a/pom.xml +++ b/pom.xml @@ -171,24 +171,30 @@ org.apache.maven.plugins - maven-shade-plugin + maven-assembly-plugin + package - shade + single - - true - - - org.baeldung.executable.ExecutableMavenJar - - - - - - + + + + + + + ru.egspt.App + + + + + jar-with-dependencies + + + + + diff --git a/src/main/java/ru/egspt/ReportPane.java b/src/main/java/ru/egspt/ReportPane.java index 5614286..e270a25 100644 --- a/src/main/java/ru/egspt/ReportPane.java +++ b/src/main/java/ru/egspt/ReportPane.java @@ -16,7 +16,7 @@ public class ReportPane extends JPanel { private JPanel reportTablePane = new JPanel(); private ReportTableModel reportTableModel; private JTable reportTable; - private JPanel reportTextPane = new JPanel(); + //private JPanel reportTextPane = new JPanel(); private JPanel reportControlsPane = new JPanel(); private JButton getExcellReportButton = new JButton(); private JFileChooser reportPathChooser = null; @@ -59,7 +59,7 @@ public class ReportPane extends JPanel { reportTable.getColumnModel().getColumn(i).setHeaderValue(reportTableModel.getHeader()[i]); i++; } - reportTable.setAutoResizeMode(reportTable.AUTO_RESIZE_OFF); + reportTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); JScrollPane scrollPane = new JScrollPane(reportTable, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); reportTablePane.setLayout(new BorderLayout()); diff --git a/src/main/java/ru/egspt/ReportTableModel.java b/src/main/java/ru/egspt/ReportTableModel.java index 06c0c9b..c1577c4 100644 --- a/src/main/java/ru/egspt/ReportTableModel.java +++ b/src/main/java/ru/egspt/ReportTableModel.java @@ -290,7 +290,7 @@ public class ReportTableModel extends AbstractTableModel{ XSSFSheet sheet = book.getSheetAt(0); int height = sheet.getLastRowNum();//количество строк в таблице Row row = sheet.getRow(0); - int wide = row.getLastCellNum();//количество столбцов в таблице (первые 5 столбцов должны жестко соответствовать шаблону) + //int wide = row.getLastCellNum();//количество столбцов в таблице (первые 5 столбцов должны жестко соответствовать шаблону) //перебираем строки файла int i = 0; while (i < height){ diff --git a/target/classes/ru/egspt/ReportPane.class b/target/classes/ru/egspt/ReportPane.class index fb1f311..1deac9e 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 b81eada..5cf6a24 100644 Binary files a/target/classes/ru/egspt/ReportTableModel.class and b/target/classes/ru/egspt/ReportTableModel.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..21091cb --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Mon Jun 27 14:37:18 MSK 2022 +version=0.1 +groupId=ru.egspt +artifactId=moodle-anyreport 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 new file mode 100644 index 0000000..8c5ea88 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,20 @@ +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\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\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 new file mode 100644 index 0000000..f5d13f2 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,20 @@ +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 diff --git a/target/moodle-anyreport-0.1-jar-with-dependencies.jar b/target/moodle-anyreport-0.1-jar-with-dependencies.jar new file mode 100644 index 0000000..ac7b1d2 Binary files /dev/null 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 new file mode 100644 index 0000000..75a0592 Binary files /dev/null and b/target/moodle-anyreport-0.1.jar differ