Browse code Rationalised normal vs special vs penalty master
1 parent 4440d4b commit c3c0d536b6238c16dfc74ffcc49941673ee120bd Mark George authored on 6 Jun 2023

Showing 13 changed files

• build.gradle
• db/h2.sh
• sql/schema.sql
• sql/test_data.sql
• src/main/java/dao/ResultDAO.java
• src/main/java/dao/ScheduleDAO.java
• src/main/java/model/Criterion.java
• src/main/java/model/Submission.java
• src/main/java/report/FeedbackReportGenerator.java
• src/main/java/schema.sql
• src/main/java/ui/CriterionPanel.java
• src/main/java/ui/MarkingFrame.java
• src/main/resources/marking.properties

Ignore Space Show notes View build.gradle

plugins { id "application"; } def defaultMainClassName = "Main"; application { mainClass = project.hasProperty("mainClass") ? project.getProperty("mainClass") : defaultMainClassName; } compileJava { sourceCompatibility = "1.8"; targetCompatibility = "1.8"; } repositories { mavenCentral() // since the Jasper devs keep using their own custom builds of ancient // versions of other projects we need to add a repository for their // "special" versions. maven { url "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/" } } dependencies { implementation group: "com.h2database", name: "h2", version: "2.1.214"; implementation group: "net.sourceforge.dynamicreports", name: "dynamicreports-core", version: "6.12.1"; implementation group: "org.simplejavamail", name: "simple-java-mail", version: "8.1.0"; implementation group: "com.formdev", name: "flatlaf", version: "3.1.1"; implementation group: "javax.xml.bind", name: "jaxb-api", version: "2.3.1"; implementation group: "org.slf4j", name: "slf4j-api", version: "2.0.7"; implementation group: "ch.qos.logback", name: "logback-classic", version: "1.4.7"; } project.configurations.implementation.setCanBeResolved(true) jar { manifest { attributes ( "Main-Class": "Main", "Class-Path": configurations.implementation.collect { "lib/" + it.name }.join(" ") ) } } /* convenience tasks for working with a project */ tasks.register("copyDependencies", Copy) { group = "Project"; description = "Copy all dependencies into a 'libs' folder in the root of the project."; from configurations.implementation into 'libs/' } tasks.register("createMissingSourceDirs") { group = "Project"; description = "Create all of the missing source directories for this project."; doFirst { sourceSets.each { def sourceRoot -> sourceRoot.allSource.srcDirTrees.each { def sourceDir -> if(!sourceDir.dir.exists()) { println "Creating ${sourceDir}"; mkdir sourceDir.dir; } } } } } tasks.register("deleteEmptySourceDirs") { group = "Project"; description = "Delete empty source directories."; doFirst { sourceSets.each { def sourceRoot -> sourceRoot.allSource.srcDirTrees.each { def sourceDir -> if(sourceDir.dir.exists() && sourceDir.dir.isDirectory() && sourceDir.dir.list().length == 0) { println "Removing empty ${sourceDir}"; sourceDir.dir.delete(); } } } } } tasks.register("openProjectDir") { group = "Project"; description = "Open the project directory in the system file manager."; doFirst { println("Opening: " + file(projectDir)); java.awt.Desktop.getDesktop().open(file(projectDir)); } } tasks.register("openBuildDir") { group = "Project"; description = "Open the project build directory in the system file manager."; doFirst { println("Opening: " + file(buildDir)); java.awt.Desktop.getDesktop().open(file(buildDir)); } } tasks.register("createGitIgnore") { group = "Project"; description = "Create the project's .gitignore file."; def gitIgnored=""" .gradle/ .nb-gradle/ .settings/ nbproject/ build/ bin/ dist/ tmp/ .classpath .project *.zip *.tgz *.tar.gz *.class *.jar .DS_Store !gradle-wrapper.jar """; doLast { def file = new File(projectDir, ".gitignore"); if ( !file.exists() ) { println("Creating .gitignore"); gitIgnored.lines().each { f -> if(!f.trim().isBlank()) { file.append(f.trim()+"\n"); } } } else { println(".gitignore already exists"); } } } plugins { id 'application' } def defaultMainClassName = "Main" application { mainClass = project.hasProperty("mainClass") ? project.getProperty("mainClass") : defaultMainClassName; } compileJava { sourceCompatibility = "1.8"; targetCompatibility = "1.8"; } repositories { mavenCentral() // since the Jasper devs keep using their own custom builds of ancient // versions of other projects we need to add a repository for their // "special" versions. maven { url 'https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/' } } dependencies { implementation group: 'com.h2database', name: 'h2', version: '1.4.200' implementation group: 'net.sourceforge.dynamicreports', name: 'dynamicreports-core', version: '6.12.1' implementation group: 'org.simplejavamail', name: 'simple-java-mail', version: '8.1.0' implementation group: 'com.formdev', name: 'flatlaf', version: '3.1.1' implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7' implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.7' } project.configurations.implementation.setCanBeResolved(true) jar { manifest { attributes ( 'Main-Class': 'Main', 'Class-Path': configurations.implementation.collect { 'lib/' + it.name }.join(' ') ) } } /* convenience tasks for working with a project */ tasks.register("copyDependencies", Copy) { group = "Project"; description = "Copy all dependencies into a 'libs' folder in the root of the project."; from configurations.implementation into 'libs/' } tasks.register("createMissingSourceDirs") { group = "Project"; description = "Create all of the missing source directories for this project."; doFirst { sourceSets.each { def sourceRoot -> sourceRoot.allSource.srcDirTrees.each { def sourceDir -> if(!sourceDir.dir.exists()) { println "Creating ${sourceDir}"; mkdir sourceDir.dir; } } } } } tasks.register("deleteEmptySourceDirs") { group = "Project"; description = "Delete empty source directories."; doFirst { sourceSets.each { def sourceRoot -> sourceRoot.allSource.srcDirTrees.each { def sourceDir -> if(sourceDir.dir.exists() && sourceDir.dir.isDirectory() && sourceDir.dir.list().length == 0) { println "Removing empty ${sourceDir}"; sourceDir.dir.delete(); } } } } } tasks.register("openProjectDir") { group = "Project"; description = "Open the project directory in the system file manager."; doFirst { println("Opening: " + file(projectDir)); java.awt.Desktop.getDesktop().open(file(projectDir)); } } tasks.register("openBuildDir") { group = "Project"; description = "Open the project build directory in the system file manager."; doFirst { println("Opening: " + file(buildDir)); java.awt.Desktop.getDesktop().open(file(buildDir)); } } tasks.register("createGitIgnore") { group = "Project"; description = "Create the project's .gitignore file."; def gitIgnored=""" .gradle/ .nb-gradle/ .settings/ nbproject/ build/ bin/ dist/ tmp/ .classpath .project *.zip *.tgz *.tar.gz *.class *.jar .DS_Store !gradle-wrapper.jar """; doLast { def file = new File(projectDir, ".gitignore"); if ( !file.exists() ) { println("Creating .gitignore"); gitIgnored.lines().each { f -> if(!f.trim().isBlank()) { file.append(f.trim()+"\n"); } } } else { println(".gitignore already exists"); } } }

Ignore Space Show notes View db/h2.sh
#!/bin/sh H2=../libs/h2-2.1.214.jar java -cp "${H2}" org.h2.tools.Console -web -tcp -browser -user sa -url "jdbc:h2:./testing;IFEXISTS=FALSE;AUTO_SERVER=TRUE" #!/bin/sh H2=../libs/h2-1.4.200.jar java -cp "${H2}" org.h2.tools.Console -web -tcp -browser -user sa -url "jdbc:h2:./testing;IFEXISTS=TRUE;AUTO_SERVER=TRUE"

Ignore Space Show notes View sql/schema.sql 0 → 100644

-- drop all objects; CREATE TABLE Assessment ( Name VARCHAR PRIMARY KEY, Out_of NUMERIC(7,3) NOT NULL ); CREATE TABLE Category ( Category VARCHAR PRIMARY KEY, Sort_Order REAL NOT NULL ); CREATE TABLE Editor_Type ( Editor_Type VARCHAR PRIMARY KEY ); INSERT INTO Editor_Type VALUES ('Scale'),('Numeric'); CREATE TABLE Criterion_Type ( Criterion_Type VARCHAR PRIMARY KEY ); INSERT INTO Criterion_Type VALUES ('Normal'),('Special'); CREATE TABLE Criterion ( Criterion VARCHAR PRIMARY KEY, Category VARCHAR NOT NULL, Description VARCHAR NOT NULL, Sort_order REAL NOT NULL, Weight REAL NOT NULL, Min SMALLINT NOT NULL, Max SMALLINT NOT NULL, Editor_Type VARCHAR NOT NULL, Criterion_Type VARCHAR NOT NULL, CONSTRAINT FK_Criterion_Category FOREIGN KEY (Category) REFERENCES Category (Category), CONSTRAINT FK_Criterion_Editor_Type FOREIGN KEY (Editor_Type) REFERENCES Editor_type (Editor_Type), CONSTRAINT FK_Criterion_Criterion_Type FOREIGN KEY (Criterion_Type) REFERENCES Criterion_type (Criterion_Type) ); CREATE TABLE Student ( Submission_ID VARCHAR UNIQUE NOT NULL, Student_ID VARCHAR UNIQUE NOT NULL, Username VARCHAR UNIQUE NOT NULL, First_Name VARCHAR NOT NULL, Last_Name VARCHAR NOT NULL, Email VARCHAR UNIQUE NOT NULL, Send_Feedback BOOLEAN NOT NULL, Email_Sent BOOLEAN NOT NULL, CONSTRAINT PK_Student PRIMARY KEY (Submission_ID) ); CREATE TABLE Submission ( Submission_ID VARCHAR PRIMARY KEY, CONSTRAINT FK_Submission_Student FOREIGN KEY (Submission_ID) REFERENCES Student (Submission_ID) ); CREATE TABLE Result ( Submission_ID VARCHAR NOT NULL, Criterion VARCHAR NOT NULL, Result NUMERIC(10,6) NOT NULL, Comment VARCHAR, CONSTRAINT PK_Result PRIMARY KEY (Submission_ID, Criterion), CONSTRAINT FK_Result_Student FOREIGN KEY (Submission_ID) REFERENCES Submission (Submission_ID), CONSTRAINT FK_Result_Criterion FOREIGN KEY (Criterion) REFERENCES Criterion (Criterion) ); CREATE OR REPLACE VIEW Weighted_Normal AS SELECT Submission_ID, Cast(Sum(Weighted) * ( SELECT Out_Of FROM Assessment) as NUMERIC(10,6)) AS Mark FROM ( SELECT Submission_ID, Result, Weight, Max, (Result / Max * (Weight / ( SELECT Sum(Weight) FROM Criterion WHERE Criterion_Type = 'Normal'))) AS Weighted FROM Result INNER JOIN Criterion ON Result.Criterion = Criterion.Criterion WHERE Criterion_Type = 'Normal') GROUP BY Submission_ID; -- special marks are multiplied by the criterion weight and added to the mark- use -- negative weight for penalties CREATE OR REPLACE VIEW Weighted_Special AS SELECT Submission_id, Cast(Sum(Special) as NUMERIC(10,6)) AS special FROM ( SELECT Submission_id, ( Result * Weight ) AS special FROM Result INNER JOIN Criterion ON Result.Criterion = Criterion.Criterion WHERE Criterion_Type = 'Special' UNION ALL SELECT DISTINCT Submission_id, 0 FROM Result ) GROUP BY Submission_id CREATE OR REPLACE VIEW Weighted_Penalty AS SELECT Submission_ID, Cast(Sum(Penalty) as NUMERIC(10,6)) AS Penalty FROM ( SELECT Submission_ID, ( Result * Weight ) AS Penalty FROM Result INNER JOIN Criterion ON Result.Criterion = Criterion.Criterion WHERE Criterion_Type = 'Penalty' UNION ALL SELECT DISTINCT Submission_ID, 0 FROM Result ) GROUP BY Submission_id; -- version to use when bonus contributes to other assessment (maximum mark CAN be exceeded) CREATE OR REPLACE VIEW Mark AS SELECT Weighted_Normal.Submission_ID, Cast(Round(Mark - Penalty, 3) as NUMERIC(7,3)) AS Mark FROM Weighted_Normal INNER JOIN Weighted_Penalty USING (Submission_ID); -- version to use when bonus contributes only to this assessment (maximum mark can not -- be exceeded) -- CREATE VIEW mark -- AS -- SELECT weighted_mark.submission_id, -- Round( -- Casewhen( -- mark + special <= (SELECT out_of FROM assessment), -- mark + special, -- (SELECT out_of FROM assessment) -- ), -- 5) AS MARK -- FROM weighted_mark -- INNER JOIN weighted_special -- ON weighted_mark.submission_id = weighted_special.submission_id; CREATE VIEW marking_schedule AS SELECT criterion.category, description, weight, max AS OUTOF FROM criterion INNER JOIN category ON category.category = criterion.category ORDER BY category.sort_order, criterion.sort_order; CREATE OR REPLACE VIEW All_Marks ("Student", "Mark", "Penalty", "Special", "Complete", "Email Sent") AS SELECT Submission.Submission_ID, COALESCE(Cast(Round(Mark, 3) AS VARCHAR), ''), COALESCE(Cast(Round(Penalty, 3) AS VARCHAR), ''), COALESCE(Cast(Round(Special, 3) AS VARCHAR), ''), COALESCE(Cast(CASE WHEN Complete THEN 'Yes' ELSE 'No' END AS varchar), ''), COALESCE(Cast(CASE WHEN Email_Sent THEN 'Yes' ELSE 'No' END AS varchar), '') FROM Submission LEFT JOIN Mark USING (Submission_ID) LEFT JOIN Weighted_Special USING (Submission_ID) LEFT JOIN Weighted_Penalty USING (Submission_ID) LEFT JOIN ( SELECT Submission_ID, Count(Criterion) = ( SELECT Count(Criterion) FROM Criterion) AS Complete FROM Result GROUP BY Submission_ID) USING (Submission_ID) LEFT JOIN student USING (Submission_ID); -- view for showing relative weightings as percentages of total mark CREATE OR REPLACE VIEW weighted_schedule AS SELECT cat.category, criterion, description, weight, round(weight / total_weight * 100, 2) AS relative_weight, round(weight / total_weight * ( SELECT out_of FROM assessment), 2) AS out_of FROM criterion crit, ( SELECT sum(weight) AS total_weight FROM criterion WHERE Criterion_Type = 'Normal') INNER JOIN category cat ON crit.category = cat.category WHERE Criterion_Type = 'Normal' ORDER BY cat.sort_order, crit.sort_order; CREATE OR REPLACE VIEW weighted_categories AS SELECT category, round(cast(sum(relative_weight) as real), 2) AS weight, round(cast(sum(relative_weight) / 100 * (select out_of from assessment) as real), 2) AS out_of, FROM WEIGHTED_SCHEDULE GROUP BY category; CREATE OR REPLACE VIEW report AS SELECT a.name AS assessment, a.out_of, s.student_id, s.first_name || ' ' || s.last_name AS name, s.username, cat.category, cat.sort_order AS cat_order, cr.description AS criterion, cr.max AS max, cr.sort_order AS cr_order, r.result, r.comment, round(m.mark, 3) AS mark, round(penalty, 3) as penalty, round(special, 3) as special FROM assessment a JOIN category cat INNER JOIN criterion cr ON cat.category = cr.category INNER JOIN result r ON r.criterion = cr.criterion INNER JOIN Student s ON s.Submission_ID = r.Submission_ID INNER JOIN mark m ON m.submission_id = r.Submission_ID INNER JOIN weighted_special ws on ws.submission_id = r.Submission_ID INNER JOIN Weighted_Penalty wp on wp.submission_id = r.Submission_ID ORDER BY student_id, cat_order, cr_order; -- use this if you want to produce useful category totals (and you don't care -- about weighting for individual criterion) -- UPDATE criterion -- SET weight = Cast(max AS DOUBLE) / (SELECT Count(*) -- FROM criterion);

Ignore Space Show notes View sql/test_data.sql 0 → 100644

INSERT INTO Assessment VALUES ('Testing', 20.0); INSERT INTO Category VALUES ('Stuff', 1.0), ('Things', 2.0), ('Other', 3.0); INSERT INTO Criterion VALUES ('first', 'Stuff', 'Did the first thing', 1.0, 1.0, 0, 5, 'Scale', 'Normal'), ('second', 'Stuff', 'Did the second thing', 2.0, 1.0, 0, 5, 'Scale', 'Normal'), ('third', 'Things', 'Did the third thing', 3.0, 1.0, 0, 5, 'Scale', 'Normal'), ('fourth', 'Things', 'Did the fourth thing', 4.0, 1.0, 0, 5, 'Numeric', 'Normal'), ('bonus', 'Other', 'Did the bonus task', 5.0, 1.0, 0, 5, 'Numeric', 'Special'), ('late', 'Other', 'Penalty for late submission', 6.0, 1.0, 0, 20, 'Numeric', 'Normal'); INSERT INTO Student VALUES ('1111', '1111', 'one', 'Onesy', 'One', 'one@example.com', TRUE, FALSE), ('2222', '2222', 'two', 'Twosy', 'Two', 'two@example.com', TRUE, FALSE); INSERT INTO Submission VALUES ('1111'), ('2222');

Ignore Space Show notes View src/main/java/dao/ResultDAO.java

package dao; import java.math.BigDecimal; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import javax.sql.rowset.CachedRowSet; import javax.sql.rowset.RowSetProvider; import javax.swing.table.TableModel; import model.Criterion; import model.CriterionEditor; import model.Student; import ui.CriterionPanel; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class ResultDAO { private static final Logger logger = Logger.getLogger(ResultDAO.class.getName()); private static Map<String, CriterionEditor> criteria = new HashMap<>(); public void addEditor(Criterion criterion, CriterionPanel criterionEditor) { criteria.put(criterion.getCriterion(), criterionEditor); } public Boolean isComplete() { for (CriterionEditor editor : criteria.values()) { if (!editor.isComplete()) { return Boolean.FALSE; } } return Boolean.TRUE; } public void save(String submissionId) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("merge into result (submission_id, criterion, result, comment) values (?,?,?,?)")) { for (Map.Entry<String, CriterionEditor> entry : criteria.entrySet()) { CriterionEditor editor = entry.getValue(); if (!editor.isComplete()) { continue; } String criterion = entry.getKey(); Double result = editor.getResult(); String comment = editor.getComment(); stmt.setString(1, submissionId); stmt.setString(2, criterion); stmt.setDouble(3, result); stmt.setString(4, comment); stmt.addBatch(); } stmt.executeBatch(); clear(); } } catch (SQLException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } public void load(String submissionId) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from result where submission_id = ?")) { stmt.setString(1, submissionId); ResultSet rs = stmt.executeQuery(); while (rs.next()) { String criterion = rs.getString("criterion"); Double result = rs.getDouble("result"); String comment = rs.getString("comment"); CriterionEditor editor = criteria.get(criterion); editor.setResult(result); editor.setComment(comment); } } } catch (SQLException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } public TableModel getSubmissions() { try ( Connection con = JdbcConnection.getConnection(); Statement stmt = con.createStatement()) { ResultSet rs = stmt.executeQuery("select * from all_marks order by \"Student\""); CachedRowSet crs = RowSetProvider.newFactory().createCachedRowSet(); crs.populate(rs); return new RowSetTableModel(crs); } catch (SQLException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return null; } public Collection<Map<String, ?>> getResult(String studentId) { String sql = "SELECT * FROM report where student_id = ?"; Collection<Map<String, ?>> data = new ArrayList<>(); try ( Connection con = JdbcConnection.getConnection(); PreparedStatement s = con.prepareStatement(sql);) { s.setString(1, studentId); ResultSet rs = s.executeQuery(); while (rs.next()) { Map<String, Object> result = new HashMap<>(); ResultSetMetaData metaData = rs.getMetaData(); int columnCount = metaData.getColumnCount(); for (int i = 1; i <= columnCount; i++) { String columnName = metaData.getColumnName(i); Object value = rs.getObject(columnName); if (value instanceof Number) { value = new BigDecimal(String.valueOf(value)); } result.put(columnName, value); } data.add(result); } return data; } catch (SQLException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); return null; } } public Student findStudent(String submissionId) { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from student where submission_id = ?")) { stmt.setString(1, submissionId); ResultSet rs = stmt.executeQuery(); if (rs.next()) { String id = rs.getString("student_id"); String username = rs.getString("username"); String firstName = rs.getString("first_name"); String lastName = rs.getString("last_name"); String email = rs.getString("email"); Boolean sendFeedback = rs.getBoolean("send_feedback"); Boolean emailSent = rs.getBoolean("email_sent"); Student s = new Student(id, submissionId, username, firstName, lastName, email, sendFeedback, emailSent); return s; } } catch (SQLException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return null; } private void clear() { criteria = new HashMap<>(); } public Collection<Student> getStudents() { List<Student> students = new ArrayList<>(); try ( Connection con = JdbcConnection.getConnection(); PreparedStatement studs = con.prepareStatement("select * from student where student_id in (select distinct student_id from report) order by username")) { ResultSet studsRs = studs.executeQuery(); while (studsRs.next()) { String id = studsRs.getString("student_id"); String submissionId = studsRs.getString("submission_id"); String firstName = studsRs.getString("first_name"); String lastName = studsRs.getString("last_name"); String username = studsRs.getString("username"); String email = studsRs.getString("email"); Boolean sendFeedback = studsRs.getBoolean("send_feedback"); Boolean emailSent = studsRs.getBoolean("email_sent"); Student s = new Student(id, submissionId, username, firstName, lastName, email, sendFeedback, emailSent); students.add(s); } } catch (SQLException ex) { throw new RuntimeException(ex); } return students; } public void mailSent(Student student) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("update student set email_sent = true where student_id = ?");) { stmt.setString(1, student.getId()); stmt.executeUpdate(); con.commit(); } } catch (SQLException ex) { throw new RuntimeException(ex); } } } package dao; import java.math.BigDecimal; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import javax.sql.rowset.CachedRowSet; import javax.sql.rowset.RowSetProvider; import javax.swing.table.TableModel; import model.Criterion; import model.CriterionEditor; import model.Student; import ui.CriterionPanel; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class ResultDAO { private static final Logger logger = Logger.getLogger(ResultDAO.class.getName()); private static Map<String, CriterionEditor> criteria = new HashMap<>(); public void addEditor(Criterion criterion, CriterionPanel criterionEditor) { criteria.put(criterion.getCriterion(), criterionEditor); } public Boolean isComplete() { for (CriterionEditor editor : criteria.values()) { if (!editor.isComplete()) { return Boolean.FALSE; } } return Boolean.TRUE; } public void save(String submissionId) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("merge into result (submission_id, criterion, result, comment) values (?,?,?,?)")) { for (Map.Entry<String, CriterionEditor> entry : criteria.entrySet()) { CriterionEditor editor = entry.getValue(); if (!editor.isComplete()) { continue; } String criterion = entry.getKey(); Double result = editor.getResult(); String comment = editor.getComment(); stmt.setString(1, submissionId); stmt.setString(2, criterion); stmt.setDouble(3, result); stmt.setString(4, comment); stmt.addBatch(); } stmt.executeBatch(); clear(); } } catch (SQLException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } public void load(String submissionId) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from result where submission_id = ?")) { stmt.setString(1, submissionId); ResultSet rs = stmt.executeQuery(); while (rs.next()) { String criterion = rs.getString("criterion"); Double result = rs.getDouble("result"); String comment = rs.getString("comment"); CriterionEditor editor = criteria.get(criterion); editor.setResult(result); editor.setComment(comment); } } } catch (SQLException e) { logger.log(Level.SEVERE, e.getLocalizedMessage(), e); } } public TableModel getSubmissions() { try ( Connection con = JdbcConnection.getConnection(); Statement stmt = con.createStatement()) { ResultSet rs = stmt.executeQuery("select * from allmarks order by \"Student\""); CachedRowSet crs = RowSetProvider.newFactory().createCachedRowSet(); crs.populate(rs); return new RowSetTableModel(crs); } catch (SQLException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return null; } public Collection<Map<String, ?>> getResult(String studentId) { String sql = "SELECT * FROM report where student_id = ?"; Collection<Map<String, ?>> data = new ArrayList<>(); try ( Connection con = JdbcConnection.getConnection(); PreparedStatement s = con.prepareStatement(sql);) { s.setString(1, studentId); ResultSet rs = s.executeQuery(); while (rs.next()) { Map<String, Object> result = new HashMap<>(); ResultSetMetaData metaData = rs.getMetaData(); int columnCount = metaData.getColumnCount(); for (int i = 1; i <= columnCount; i++) { String columnName = metaData.getColumnName(i); Object value = rs.getObject(columnName); if (value instanceof Number) { value = new BigDecimal(String.valueOf(value)); } result.put(columnName, value); } data.add(result); } return data; } catch (SQLException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); return null; } } public Student findStudent(String submissionId) { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from student where submission_id = ?")) { stmt.setString(1, submissionId); ResultSet rs = stmt.executeQuery(); if (rs.next()) { String id = rs.getString("student_id"); String username = rs.getString("username"); String firstName = rs.getString("first_name"); String lastName = rs.getString("last_name"); String email = rs.getString("email"); Boolean sendFeedback = rs.getBoolean("send_feedback"); Boolean emailSent = rs.getBoolean("email_sent"); Student s = new Student(id, submissionId, username, firstName, lastName, email, sendFeedback, emailSent); return s; } } catch (SQLException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return null; } private void clear() { criteria = new HashMap<>(); } public Collection<Student> getStudents() { List<Student> students = new ArrayList<>(); try ( Connection con = JdbcConnection.getConnection(); PreparedStatement studs = con.prepareStatement("select * from student where student_id in (select distinct student_id from report) order by username")) { ResultSet studsRs = studs.executeQuery(); while (studsRs.next()) { String id = studsRs.getString("student_id"); String submissionId = studsRs.getString("submission_id"); String firstName = studsRs.getString("first_name"); String lastName = studsRs.getString("last_name"); String username = studsRs.getString("username"); String email = studsRs.getString("email"); Boolean sendFeedback = studsRs.getBoolean("send_feedback"); Boolean emailSent = studsRs.getBoolean("email_sent"); Student s = new Student(id, submissionId, username, firstName, lastName, email, sendFeedback, emailSent); students.add(s); } } catch (SQLException ex) { throw new RuntimeException(ex); } return students; } public void mailSent(Student student) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("update student set email_sent = true where student_id = ?");) { stmt.setString(1, student.getId()); stmt.executeUpdate(); con.commit(); } } catch (SQLException ex) { throw new RuntimeException(ex); } } }

Ignore Space Show notes View src/main/java/dao/ScheduleDAO.java

package dao; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import model.Criterion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class ScheduleDAO { private static final Logger logger = LoggerFactory.getLogger(ScheduleDAO.class); public List<String> getCategories() { final List<String> categories = new ArrayList<>(); try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select category from category order by sort_order"); ResultSet rs = stmt.executeQuery()) { while (rs.next()) { String category = rs.getString("category"); categories.add(category); } } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return categories; } public List<Criterion> getCriteria(String category) { List<Criterion> criteria = new ArrayList<>(); try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from criterion where category = ? order by sort_order");) { stmt.setString(1, category); ResultSet rs = stmt.executeQuery(); criteria = loadCriteria(rs); } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return criteria; } static List<Criterion> loadCriteria(ResultSet rs) { final List<Criterion> criteria = new ArrayList<>(); try { while (rs.next()) { String criterion = rs.getString("criterion"); String description = rs.getString("description"); Integer min = rs.getInt("min"); Integer max = rs.getInt("max"); String editorType = rs.getString("editor_type"); String criterionType = rs.getString("criterion_type"); criteria.add(new Criterion(criterion, description, min, max, editorType, criterionType)); } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return criteria; } public String getAssessmentName() { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select name from assessment");) { ResultSet rs = stmt.executeQuery(); rs.next(); String name = rs.getString("name"); return name; } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return "Assessment not defined"; } public Integer getComplete() { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select cast((round(cast ((select count(distinct submission_id) * 100 from result) as real)/ select count(submission_id) from submission)) as integer) as complete");) { ResultSet rs = stmt.executeQuery(); rs.next(); Integer complete = rs.getInt("complete"); return complete; } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return 0; } } package dao; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import model.Criterion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class ScheduleDAO { private static final Logger logger = LoggerFactory.getLogger(ScheduleDAO.class); public List<String> getCategories() { final List<String> categories = new ArrayList<>(); try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select category from category order by sort_order"); ResultSet rs = stmt.executeQuery()) { while (rs.next()) { String category = rs.getString("category"); categories.add(category); } } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return categories; } public List<Criterion> getCriteria(String category) { List<Criterion> criteria = new ArrayList<>(); try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from criterion where category = ? order by sort_order");) { stmt.setString(1, category); ResultSet rs = stmt.executeQuery(); criteria = loadCriteria(rs); } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return criteria; } static List<Criterion> loadCriteria(ResultSet rs) { final List<Criterion> criteria = new ArrayList<>(); try { while (rs.next()) { String criterion = rs.getString("criterion"); String description = rs.getString("description"); Integer min = rs.getInt("min"); Integer max = rs.getInt("max"); Boolean special = rs.getBoolean("special"); criteria.add(new Criterion(criterion, description, min, max, special)); } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return criteria; } public String getAssessmentName() { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select name from assessment");) { ResultSet rs = stmt.executeQuery(); rs.next(); String name = rs.getString("name"); return name; } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return "Assessment not defined"; } public Integer getComplete() { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select cast((round(cast ((select count(distinct submission_id) * 100 from result) as real)/ select count(submission_id) from submission)) as integer) as complete");) { ResultSet rs = stmt.executeQuery(); rs.next(); Integer complete = rs.getInt("complete"); return complete; } } catch (SQLException e) { logger.error(e.getLocalizedMessage(), e); } return 0; } }

Ignore Space Show notes View src/main/java/model/Criterion.java

package model; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class Criterion { private final String criterion; private final String description; private final Integer min; private final Integer max; private final String editorType; private final String criterionType; private Double result; private String comment; public Criterion(String criterion, String description, Integer min, Integer max, String editorType, String criterionType) { this.criterion = criterion; this.description = description; this.min = min; this.max = max; this.editorType = editorType; this.criterionType = criterionType; } public Double getResult() { return result; } public void setResult(Double result) { this.result = result; } public String getComment() { return comment; } public void setComment(String comment) { this.comment = comment; } public String getCriterion() { return criterion; } public String getDescription() { return description; } public Integer getMin() { return min; } public Integer getMax() { return max; } public String getEditorType() { return editorType; } public String getCriterionType() { return criterionType; } public Boolean isScale() { return this.editorType.equalsIgnoreCase("scale"); } public Boolean isNormal() { return this.criterionType.equalsIgnoreCase("normal"); } } package model; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class Criterion { private final String criterion; private final String description; private final Integer min; private final Integer max; private final Boolean isSpecial; private Double result; private String comment; public Criterion(String criterion, String description, Integer min, Integer max, Boolean isSpecial) { this.criterion = criterion; this.description = description; this.min = min; this.max = max; this.isSpecial = isSpecial; } public String getCriterion() { return criterion; } public String getDescription() { return description; } public Double getResult() { return result; } public void setResult(Double result) { this.result = result; } public String getComment() { return comment; } public void setComment(String comment) { this.comment = comment; } public Integer getMin() { return min; } public Integer getMax() { return max; } public Boolean isIsSpecial() { return isSpecial; } }

Show notes View src/main/java/model/Submission.java 100644 → 0

/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package model; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class Submission { private String submissionID; private Boolean marked; public Submission() { } public Submission(String submissionID, Boolean marked) { this.submissionID = submissionID; this.marked = marked; } public String getSubmissionID() { return submissionID; } public void setSubmissionID(String submissionID) { this.submissionID = submissionID; } public Boolean isMarked() { return marked; } public void setMarked(Boolean marked) { this.marked = marked; } }

Ignore Space Show notes View src/main/java/report/FeedbackReportGenerator.java

package report; import dao.MarkingProperties; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.math.BigDecimal; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Collection; import java.util.Map; import javax.swing.JOptionPane; import model.Student; import static net.sf.dynamicreports.report.builder.DynamicReports.cmp; import static net.sf.dynamicreports.report.builder.DynamicReports.field; import static net.sf.dynamicreports.report.builder.DynamicReports.grp; import static net.sf.dynamicreports.report.builder.DynamicReports.margin; import static net.sf.dynamicreports.report.builder.DynamicReports.report; import static net.sf.dynamicreports.report.builder.DynamicReports.stl; import static net.sf.dynamicreports.report.builder.DynamicReports.template; import static net.sf.dynamicreports.report.builder.DynamicReports.type; import net.sf.dynamicreports.report.builder.FieldBuilder; import net.sf.dynamicreports.report.builder.component.HorizontalListBuilder; import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder; import net.sf.dynamicreports.report.builder.style.StyleBuilder; import net.sf.dynamicreports.report.constant.HorizontalTextAlignment; import net.sf.dynamicreports.report.constant.LineStyle; import net.sf.dynamicreports.report.constant.VerticalTextAlignment; import net.sf.dynamicreports.report.exception.DRException; import net.sf.jasperreports.engine.data.JRMapCollectionDataSource; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class FeedbackReportGenerator { private final Collection<Map<String, ?>> data; private final String outputDirectory; private final String fileNamePrefix; private final String title; private final String footer; public FeedbackReportGenerator(Collection<Map<String, ?>> data, String outputDirectory, String fileNamePrefix, String title, String footer) { this.data = data; this.outputDirectory = outputDirectory; this.fileNamePrefix = fileNamePrefix; this.title = title; this.footer = footer; } public void generate(Student student) { if (!Files.exists(Paths.get(this.outputDirectory))) { JOptionPane.showMessageDialog(null, "Report folder does not exist. Please create it.\n\nPath should be:\n" + this.outputDirectory, "Report Folder Does Not Exist", JOptionPane.WARNING_MESSAGE); throw new RuntimeException("Report folder does not exist"); } StyleBuilder labelSty = stl.style() .bold() .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); StyleBuilder valSty = stl.style() .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); StyleBuilder markSty = stl.style() .bold() .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); StyleBuilder criterionSty = stl.style() .bold() .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); FieldBuilder<String> assessment = field("ASSESSMENT", type.stringType()); FieldBuilder<BigDecimal> outOf = field("OUT_OF", type.bigDecimalType()); FieldBuilder<String> id = field("STUDENT_ID", type.stringType()); FieldBuilder<String> name = field("NAME", type.stringType()); FieldBuilder<BigDecimal> mark = field("MARK", type.bigDecimalType()); FieldBuilder<BigDecimal> special = field("SPECIAL", type.bigDecimalType()); FieldBuilder<String> category = field("CATEGORY", type.stringType()); CustomGroupBuilder categoryGroup = grp.group(category) .setStyle(stl.style().bold().setFontSize(13)); FieldBuilder<String> criterion = field("CRITERION", type.stringType()); FieldBuilder<BigDecimal> result = field("RESULT", type.bigDecimalType()); FieldBuilder<BigDecimal> max = field("MAX", type.bigDecimalType()); FieldBuilder<String> comment = field("COMMENT", type.stringType()); HorizontalListBuilder marksHeader; HorizontalListBuilder marksDetails; if (MarkingProperties.reportShowMax()) { marksHeader = cmp.horizontalList().add( cmp.text("").setStyle(criterionSty).setWidth(50), cmp.text("Mark").setStyle(markSty).setWidth(4), cmp.text("/").setStyle(labelSty).setWidth(1), cmp.horizontalGap(5), cmp.text("Out Of").setStyle(valSty).setWidth(4) ); marksDetails = cmp.horizontalList() .add( cmp.text(criterion).setStyle(criterionSty).setWidth(50), cmp.text(result).setStyle(markSty).setWidth(4), cmp.text("/").setStyle(labelSty).setWidth(1), cmp.horizontalGap(5), cmp.text(max).setStyle(valSty).setWidth(4) ); } else { marksHeader = cmp.horizontalList().add( cmp.text("").setStyle(criterionSty).setWidth(50), cmp.text("Mark").setStyle(markSty).setWidth(4) ); marksDetails = cmp.horizontalList().add( cmp.text(criterion).setStyle(criterionSty).setWidth(50), cmp.text(result).setStyle(markSty).setWidth(4) ); } try { // header report() .setTemplate(template().setPageMargin(margin(50))) .setDataSource(new JRMapCollectionDataSource(data)) .title( cmp.text(title).setStyle(stl.style().setFontSize(14).bold()), cmp.verticalGap(10), cmp.horizontalList() .add( cmp.text("Assessment:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(assessment).setStyle(valSty) ) .newRow().add( cmp.text("ID:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(id).setStyle(valSty) ) .newRow().add( cmp.text("Name:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(name).setStyle(valSty) ) .newRow().add( cmp.text("Mark:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(mark).setStyle(valSty) ) .newRow().add( cmp.text("Out of:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(outOf).setStyle(valSty) ) .newRow().add( cmp.text("Bonus:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(special).setStyle(valSty) ) .newRow().add( cmp.text("").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text("(bonus not included in the above mark)").setStyle(valSty) ), cmp.verticalGap(15) ) // details .groupBy(categoryGroup).groupHeader(categoryGroup, marksHeader, cmp.line().setPen(stl.pen(2.0f, LineStyle.DOUBLE))) .detail( cmp.verticalGap(1), marksDetails, cmp.horizontalList( cmp.horizontalGap(11), cmp.text(comment).removeLineWhenBlank() ).setMinHeight(0), cmp.verticalGap(1), cmp.line().setPen(stl.penThin()) ) .groupFooter(categoryGroup, cmp.verticalGap(18)) .summary(cmp.text(footer)) .pageFooter(cmp.pageXofY().setStyle(stl.style().bold())) .toPdf(new FileOutputStream(outputDirectory + "/" + fileNamePrefix + "-" + student.getId() + ".pdf")); } catch (FileNotFoundException | DRException ex) { throw new RuntimeException(ex); } } } package report; import dao.MarkingProperties; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.math.BigDecimal; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Collection; import java.util.Map; import javax.swing.JOptionPane; import model.Student; import static net.sf.dynamicreports.report.builder.DynamicReports.cmp; import static net.sf.dynamicreports.report.builder.DynamicReports.field; import static net.sf.dynamicreports.report.builder.DynamicReports.grp; import static net.sf.dynamicreports.report.builder.DynamicReports.margin; import static net.sf.dynamicreports.report.builder.DynamicReports.report; import static net.sf.dynamicreports.report.builder.DynamicReports.stl; import static net.sf.dynamicreports.report.builder.DynamicReports.template; import static net.sf.dynamicreports.report.builder.DynamicReports.type; import net.sf.dynamicreports.report.builder.FieldBuilder; import net.sf.dynamicreports.report.builder.component.HorizontalListBuilder; import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder; import net.sf.dynamicreports.report.builder.style.StyleBuilder; import net.sf.dynamicreports.report.constant.HorizontalTextAlignment; import net.sf.dynamicreports.report.constant.LineStyle; import net.sf.dynamicreports.report.constant.VerticalTextAlignment; import net.sf.dynamicreports.report.exception.DRException; import net.sf.jasperreports.engine.data.JRMapCollectionDataSource; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class FeedbackReportGenerator { private final Collection<Map<String, ?>> data; private final String outputDirectory; private final String fileNamePrefix; private final String title; private final String footer; public FeedbackReportGenerator(Collection<Map<String, ?>> data, String outputDirectory, String fileNamePrefix, String title, String footer) { this.data = data; this.outputDirectory = outputDirectory; this.fileNamePrefix = fileNamePrefix; this.title = title; this.footer = footer; } public void generate(Student student) { if (!Files.exists(Paths.get(this.outputDirectory))) { JOptionPane.showMessageDialog(null, "Report folder does not exist. Please create it.\n\nPath should be:\n" + this.outputDirectory, "Report Folder Does Not Exist", JOptionPane.WARNING_MESSAGE); throw new RuntimeException("Report folder does not exist"); } StyleBuilder labelSty = stl.style() .bold() .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); StyleBuilder valSty = stl.style() .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); StyleBuilder markSty = stl.style() .bold() .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); StyleBuilder criterionSty = stl.style() .bold() .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT) .setVerticalTextAlignment(VerticalTextAlignment.MIDDLE); FieldBuilder<String> assessment = field("ASSESSMENT", type.stringType()); FieldBuilder<BigDecimal> outOf = field("OUT_OF", type.bigDecimalType()); FieldBuilder<String> id = field("STUDENT_ID", type.stringType()); FieldBuilder<String> name = field("NAME", type.stringType()); FieldBuilder<BigDecimal> mark = field("MARK", type.bigDecimalType()); FieldBuilder<String> category = field("CATEGORY", type.stringType()); CustomGroupBuilder categoryGroup = grp.group(category) .setStyle(stl.style().bold().setFontSize(13)); FieldBuilder<String> criterion = field("CRITERION", type.stringType()); FieldBuilder<BigDecimal> result = field("RESULT", type.bigDecimalType()); FieldBuilder<BigDecimal> max = field("MAX", type.bigDecimalType()); FieldBuilder<String> comment = field("COMMENT", type.stringType()); HorizontalListBuilder marksHeader; HorizontalListBuilder marksDetails; if (MarkingProperties.reportShowMax()) { marksHeader = cmp.horizontalList().add( cmp.text("").setStyle(criterionSty).setWidth(50), cmp.text("Mark").setStyle(markSty).setWidth(4), cmp.text("/").setStyle(labelSty).setWidth(1), cmp.horizontalGap(5), cmp.text("Max").setStyle(valSty).setWidth(3) ); marksDetails = cmp.horizontalList() .add( cmp.text(criterion).setStyle(criterionSty).setWidth(50), cmp.text(result).setStyle(markSty).setWidth(4), cmp.text("/").setStyle(labelSty).setWidth(1), cmp.horizontalGap(5), cmp.text(max).setStyle(valSty).setWidth(3) ); } else { marksHeader = cmp.horizontalList().add( cmp.text("").setStyle(criterionSty).setWidth(50), cmp.text("Mark").setStyle(markSty).setWidth(4) ); marksDetails = cmp.horizontalList().add( cmp.text(criterion).setStyle(criterionSty).setWidth(50), cmp.text(result).setStyle(markSty).setWidth(4) ); } try { // header report() .setTemplate(template().setPageMargin(margin(50))) .setDataSource(new JRMapCollectionDataSource(data)) .title( cmp.text(title).setStyle(stl.style().setFontSize(14).bold()), cmp.verticalGap(10), cmp.horizontalList() .add( cmp.text("Assessment:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(assessment).setStyle(valSty) ) .newRow().add( cmp.text("ID:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(id).setStyle(valSty) ) .newRow().add( cmp.text("Name:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(name).setStyle(valSty) ) .newRow().add( cmp.text("Mark:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(mark).setStyle(valSty) ) .newRow().add( cmp.text("Out of:").setStyle(labelSty).setWidth(18), cmp.horizontalGap(5), cmp.text(outOf).setStyle(valSty) ), cmp.verticalGap(15) ) // details .groupBy(categoryGroup).groupHeader(categoryGroup, marksHeader, cmp.line().setPen(stl.pen(2.0f, LineStyle.DOUBLE))) .detail( cmp.verticalGap(1), marksDetails, cmp.horizontalList( cmp.horizontalGap(11), cmp.text(comment).removeLineWhenBlank() ).setMinHeight(0), cmp.verticalGap(1), cmp.line().setPen(stl.penThin()) ) .groupFooter(categoryGroup, cmp.verticalGap(18)) .summary(cmp.text(footer)) // .summary(cmp.text("The mark for the bonus tasks is only applied if you lost marks in other components (including the UML diagrams and security audit). In other words, your total mark is capped at 25.")) .pageFooter(cmp.pageXofY().setStyle(stl.style().bold())) // .show() .toPdf(new FileOutputStream(outputDirectory + "/" + fileNamePrefix + "-" + student.getId() + ".pdf")); } catch (FileNotFoundException | DRException ex) { throw new RuntimeException(ex); } } }

Show notes View src/main/java/schema.sql 100644 → 0

CREATE TABLE assessment ( name varchar PRIMARY KEY, out_of double NOT NULL ); CREATE TABLE category ( category varchar PRIMARY KEY, sort_order smallint ); CREATE TABLE criterion ( criterion varchar PRIMARY KEY, category varchar NOT NULL, description varchar NOT NULL, sort_order smallint, weight real, min smallint, max smallint, special boolean, CONSTRAINT fk_criterion_category FOREIGN KEY (category) REFERENCES category (category) ); CREATE TABLE submission ( submission_id varchar PRIMARY KEY ); CREATE TABLE student ( submission_id varchar UNIQUE, student_id varchar UNIQUE, username varchar UNIQUE, first_name varchar, last_name varchar, email varchar UNIQUE, send_feedback boolean, email_sent boolean ); CREATE TABLE result ( submission_id varchar NOT NULL, criterion varchar NOT NULL, result real NOT NULL, comment varchar, CONSTRAINT pk_result PRIMARY KEY (submission_id, criterion), CONSTRAINT fk_result_student FOREIGN KEY (submission_id) REFERENCES submission (submission_id), CONSTRAINT fk_result_criterion FOREIGN KEY (criterion) REFERENCES criterion (criterion) ); CREATE VIEW weighted_mark AS SELECT submission_id, Sum(weighted) * ( SELECT out_of FROM assessment) AS MARK FROM ( SELECT submission_id, result, weight, max, (result / max * (weight / ( SELECT Sum(weight) FROM criterion WHERE NOT special))) AS WEIGHTED FROM result INNER JOIN criterion ON result.criterion = criterion.criterion WHERE NOT special) GROUP BY submission_id; -- special marks are multiplied by the criterion weight and added to the mark - use -- negative weight for penalties CREATE VIEW weighted_special AS SELECT submission_id, Sum(special) AS special FROM ( SELECT submission_id, (result * weight) AS special FROM result INNER JOIN criterion ON result.criterion = criterion.criterion WHERE special UNION ALL SELECT DISTINCT submission_id, 0 FROM result) GROUP BY submission_id -- version to use when bonus contributes to other assessment (maximum mark CAN be -- exceeded) CREATE VIEW mark AS SELECT weighted_mark.submission_id, Round(mark + special, 3) AS MARK FROM weighted_mark INNER JOIN weighted_special ON weighted_mark.submission_id = weighted_special.submission_id; -- version to use when bonus contributes only to this assessment (maximum mark can not -- be exceeded) -- CREATE VIEW mark -- AS -- SELECT weighted_mark.submission_id, -- Round( -- Casewhen( -- mark + special <= (SELECT out_of FROM assessment), -- mark + special, -- (SELECT out_of FROM assessment) -- ), -- 5) AS MARK -- FROM weighted_mark -- INNER JOIN weighted_special -- ON weighted_mark.submission_id = weighted_special.submission_id; CREATE VIEW marking_schedule AS SELECT criterion.category, description, weight, max AS OUTOF FROM criterion INNER JOIN category ON category.category = criterion.category ORDER BY category.sort_order, criterion.sort_order; CREATE VIEW allmarks ("Student", "Weighted Mark", "Marking Complete", "Email Sent") AS SELECT submission.submission_id, COALESCE(Cast(Round(mark, 2) AS VARCHAR), ''), COALESCE(Cast(complete AS varchar), ''), COALESCE(Cast(email_sent AS varchar), '') FROM submission LEFT JOIN mark USING (submission_id) LEFT JOIN ( SELECT submission_id, Count(criterion) = ( SELECT Count(criterion) FROM criterion) AS complete FROM result GROUP BY submission_id) USING (submission_id) LEFT JOIN student USING (submission_id); -- view for showing relative weightings as percentages of total mark CREATE VIEW weighted_schedule AS SELECT cat.category, criterion, description, weight, special, round(weight / total_weight * 100, 2) AS relative_weight, round(weight / total_weight * ( SELECT out_of FROM assessment), 2) AS out_of FROM criterion crit, ( SELECT sum(weight) AS total_weight FROM criterion WHERE NOT special) INNER JOIN category cat ON crit.category = cat.category ORDER BY cat.sort_order, crit.sort_order; CREATE VIEW weighted_categories AS SELECT category, round(sum(relative_weight), 1) AS weight FROM WEIGHTED_SCHEDULE WHERE NOT special GROUP BY category; CREATE VIEW report AS SELECT a.name AS assessment, a.out_of, s.student_id, s.first_name || ' ' || s.last_name AS name, s.username, cat.category, cat.sort_order AS cat_order, cr.description AS criterion, cr.max AS max, cr.sort_order AS cr_order, r.result, r.comment, round(m.mark, 3) AS mark FROM assessment a JOIN category cat INNER JOIN criterion cr ON cat.category = cr.category INNER JOIN result r ON r.criterion = cr.criterion INNER JOIN student s ON r.submission_id = s.submission_id INNER JOIN mark m ON r.submission_id = m.submission_id ORDER BY student_id, cat_order, cr_order; -- use this if you want to produce useful category totals (and you don't care -- about weighting for individual criterion) -- UPDATE criterion -- SET weight = Cast(max AS DOUBLE) / (SELECT Count(*) -- FROM criterion);

Ignore Space Show notes View src/main/java/ui/CriterionPanel.java

package ui; import java.awt.Dimension; import java.awt.Font; import model.CriterionEditor; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SwingUtilities; import model.Criterion; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class CriterionPanel extends JPanel implements CriterionEditor { private RadioGroup radioGroup = null; private final JTextArea txtComment; private final Criterion criterion; private final JButton clearBtn; private JTextField txtNumeric = null; private static Dimension selectedSize; @SuppressWarnings("Convert2Lambda") public CriterionPanel(Criterion criterion) { this.criterion = criterion; this.setLayout(new GridBagLayout()); // label is left aligned and full width GridBagConstraints gbc = new GridBagConstraints(); gbc.gridx = 0; gbc.gridy = 0; gbc.gridwidth = 3; gbc.weightx = 1; gbc.fill = GridBagConstraints.HORIZONTAL; gbc.insets = new Insets(0, 0, 5, 0); this.add(new JLabel(criterion.getDescription()), gbc); // clear mark buttonleft aligned, but doesn't grow gbc = new GridBagConstraints(); gbc.gridx = 0; gbc.gridy = 1; clearBtn = new JButton("X"); this.add(clearBtn, gbc); // mark component is left aligned, but doesn't grow gbc = new GridBagConstraints(); gbc.gridx = 1; gbc.gridy = 1; if (criterion.isScale()) { radioGroup = new RadioGroup(criterion.getMin(), criterion.getMax()); this.add(radioGroup, gbc); } else { gbc.insets.left = 20; gbc.insets.right = 20; gbc.fill = GridBagConstraints.HORIZONTAL; txtNumeric = new JTextField(); txtNumeric.setToolTipText("Out of " + criterion.getMax()); this.add(txtNumeric, gbc); } // text area is right aligned, but grows in both directions gbc = new GridBagConstraints(); gbc.gridx = 2; gbc.gridy = 1; gbc.weightx = 1; gbc.weighty = 1; gbc.fill = GridBagConstraints.BOTH; txtComment = new JTextArea(); txtComment.setWrapStyleWord(true); txtComment.setLineWrap(true); JScrollPane scrollPane = new JScrollPane(); scrollPane.setViewportView(txtComment); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); // Dimensions are necessary to prevent the semi-famous "text area grows infinitely" bug. // Unfortunately this also means we can't let the layout manager figure out the correct // size dynamically... txtComment.setMinimumSize(new Dimension(10, 20)); txtComment.setPreferredSize(new Dimension(10, 100)); // need to hardcode height which is annoying... scrollPane.setPreferredSize(new Dimension(10, 20)); txtComment.addFocusListener(new FocusAdapter() { @Override public void focusGained(FocusEvent fe) { super.focusGained(fe); CriterionPanel selectedPanel = CriterionPanel.this; MarkingFrame frame = (MarkingFrame) SwingUtilities.getWindowAncestor(selectedPanel); if (frame.getExpandable()) { selectedPanel.setPreferredSize(new Dimension(10, 150)); selectedPanel.invalidate(); SwingUtilities.getWindowAncestor(selectedPanel).pack(); } } @Override public void focusLost(FocusEvent fe) { super.focusLost(fe); CriterionPanel selectedPanel = CriterionPanel.this; MarkingFrame frame = (MarkingFrame) SwingUtilities.getWindowAncestor(selectedPanel); if (frame.getExpandable()) { selectedPanel.setPreferredSize(selectedSize); selectedPanel.invalidate(); SwingUtilities.getWindowAncestor(selectedPanel).pack(); } } }); clearBtn.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { if (!criterion.isScale()) { radioGroup.clearSelection(); } else { txtNumeric.setText(""); } } }); Font font = txtComment.getFont(); Font biggerFont = font.deriveFont(14f); txtComment.setFont(biggerFont); this.add(scrollPane, gbc); } @Override public String getComment() { return txtComment.getText().trim(); } @Override // TODO: switch to BigDeciamal public Double getResult() { if (criterion.isScale()) { Integer result = radioGroup.getSelected(); return result != null ? Double.valueOf(result) : null; } else { try { String val = txtNumeric.getText(); if (val.isBlank()) { // mark not entered, so return null return null; } Double result = Double.valueOf(val); if (result < criterion.getMin() || result > criterion.getMax()) { JOptionPane.showMessageDialog(null, txtNumeric.getText() + " is not within the exected range.\n\nMinimum: " + criterion.getMin() + "\nMaximum: " + criterion.getMax(), "Invalid Number", JOptionPane.ERROR_MESSAGE); throw new RuntimeException("Number is not within expected range"); } return Double.valueOf(txtNumeric.getText()); } catch (NumberFormatException ex) { JOptionPane.showMessageDialog(null, txtNumeric.getText() + " is not a valid number", "Invalid Number", JOptionPane.ERROR_MESSAGE); throw new RuntimeException(ex.getLocalizedMessage()); } } } @Override public boolean isComplete() { return getResult() != null; } @Override public void setComment(String comment) { txtComment.setText(comment); } @Override public void setResult(Double result) { if (criterion.isScale()) { radioGroup.setSelected(result.intValue()); } else { txtNumeric.setText(String.valueOf(result)); } } public void setZero() { setResult(0.0); } public void setMax() { setResult(Double.valueOf(criterion.getMax())); } public Criterion getCriterion() { return criterion; } } package ui; import java.awt.Dimension; import java.awt.Font; import model.CriterionEditor; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SwingUtilities; import model.Criterion; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class CriterionPanel extends JPanel implements CriterionEditor { private RadioGroup radioGroup = null; private final JTextArea txtComment; private final Criterion criterion; private final JButton clearBtn; private JTextField txtSpecial = null; private static Dimension selectedSize; @SuppressWarnings("Convert2Lambda") public CriterionPanel(Criterion criterion) { this.criterion = criterion; this.setLayout(new GridBagLayout()); // label is left aligned and full width GridBagConstraints gbc = new GridBagConstraints(); gbc.gridx = 0; gbc.gridy = 0; gbc.gridwidth = 3; gbc.weightx = 1; gbc.fill = GridBagConstraints.HORIZONTAL; gbc.insets = new Insets(0, 0, 5, 0); this.add(new JLabel(criterion.getDescription()), gbc); // clear mark buttonleft aligned, but doesn't grow gbc = new GridBagConstraints(); gbc.gridx = 0; gbc.gridy = 1; clearBtn = new JButton("X"); this.add(clearBtn, gbc); // mark component is left aligned, but doesn't grow gbc = new GridBagConstraints(); gbc.gridx = 1; gbc.gridy = 1; if (!criterion.isIsSpecial()) { radioGroup = new RadioGroup(criterion.getMin(), criterion.getMax()); this.add(radioGroup, gbc); } else { gbc.insets.left = 20; gbc.insets.right = 20; gbc.fill = GridBagConstraints.HORIZONTAL; txtSpecial = new JTextField(); this.add(txtSpecial, gbc); } // text area is right aligned, but grows in both directions gbc = new GridBagConstraints(); gbc.gridx = 2; gbc.gridy = 1; gbc.weightx = 1; gbc.weighty = 1; gbc.fill = GridBagConstraints.BOTH; txtComment = new JTextArea(); txtComment.setWrapStyleWord(true); txtComment.setLineWrap(true); JScrollPane scrollPane = new JScrollPane(); scrollPane.setViewportView(txtComment); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); // Dimensions are necessary to prevent the semi-famous "text area grows infinitely" bug. // Unfortunately this also means we can't let the layout manager figure out the correct // size dynamically... txtComment.setMinimumSize(new Dimension(10, 20)); txtComment.setPreferredSize(new Dimension(10, 100)); // need to hardcode height which is annoying... scrollPane.setPreferredSize(new Dimension(10, 20)); txtComment.addFocusListener(new FocusAdapter() { @Override public void focusGained(FocusEvent fe) { super.focusGained(fe); CriterionPanel selectedPanel = CriterionPanel.this; MarkingFrame frame = (MarkingFrame) SwingUtilities.getWindowAncestor(selectedPanel); if (frame.getExpandable()) { selectedPanel.setPreferredSize(new Dimension(10, 150)); selectedPanel.invalidate(); SwingUtilities.getWindowAncestor(selectedPanel).pack(); } } @Override public void focusLost(FocusEvent fe) { super.focusLost(fe); CriterionPanel selectedPanel = CriterionPanel.this; MarkingFrame frame = (MarkingFrame) SwingUtilities.getWindowAncestor(selectedPanel); if (frame.getExpandable()) { selectedPanel.setPreferredSize(selectedSize); selectedPanel.invalidate(); SwingUtilities.getWindowAncestor(selectedPanel).pack(); } } }); clearBtn.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { if (!criterion.isIsSpecial()) { radioGroup.clearSelection(); } else { txtSpecial.setText(""); } } }); Font font = txtComment.getFont(); Font biggerFont = font.deriveFont(14f); txtComment.setFont(biggerFont); this.add(scrollPane, gbc); } @Override public String getComment() { return txtComment.getText().trim(); } @Override public Double getResult() { if (!criterion.isIsSpecial()) { Integer result = radioGroup.getSelected(); return result != null ? Double.valueOf(result) : null; } else { try { String val = txtSpecial.getText(); if (val.isBlank()) { // mark not entered, so return null return null; } Double result = Double.valueOf(val); if (result < criterion.getMin() || result > criterion.getMax()) { JOptionPane.showMessageDialog(null, txtSpecial.getText() + " is not within the exected range.\n\nMinimum: " + criterion.getMin() + "\nMaximum: " + criterion.getMax(), "Invalid Number", JOptionPane.ERROR_MESSAGE); throw new RuntimeException("Number is not within expected range"); } return Double.valueOf(txtSpecial.getText()); } catch (NumberFormatException ex) { JOptionPane.showMessageDialog(null, txtSpecial.getText() + " is not a valid number", "Invalid Number", JOptionPane.ERROR_MESSAGE); throw new RuntimeException(ex.getLocalizedMessage()); } } } @Override public boolean isComplete() { return getResult() != null; } @Override public void setComment(String comment) { txtComment.setText(comment); } @Override public void setResult(Double result) { if (!criterion.isIsSpecial()) { radioGroup.setSelected(result.intValue()); } else { txtSpecial.setText(String.valueOf(result)); } } public void setZero() { setResult(0.0); } public void setMax() { setResult(Double.valueOf(criterion.getMax())); } public Criterion getCriterion() { return criterion; } }

Ignore Space Show notes View src/main/java/ui/MarkingFrame.java

package ui; import dao.MarkingProperties; import dao.ResultDAO; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collection; import java.util.List; import java.util.Map; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import model.Criterion; import model.Student; import report.FeedbackReportGenerator; import report.SendReport; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class MarkingFrame extends JDialog { private Student student; private final JPanel schedulePane; private final ResultDAO resultDao = new ResultDAO(); private final JLabel lblStudent; private final JLabel lblAssessment; private final SubmissionFrame parent; private final String assessment; private final JCheckBox cbExpandable; @SuppressWarnings("Convert2Lambda") public MarkingFrame(SubmissionFrame parent, String assessment) { this.setModal(true); this.parent = parent; this.assessment = assessment; // add scroll pane to the root JScrollPane scrollPane = new JScrollPane(); JPanel contentPane = new JPanel(); JPanel titlePane = new JPanel(); cbExpandable = new JCheckBox("Expand Text Areas?", false); scrollPane.setViewportView(contentPane); scrollPane.getVerticalScrollBar().setUnitIncrement(16); getContentPane().add(titlePane, java.awt.BorderLayout.NORTH); getContentPane().add(scrollPane, java.awt.BorderLayout.CENTER); titlePane.setLayout(new BorderLayout()); lblStudent = new JLabel("Student"); Font newFont = lblStudent.getFont().deriveFont(Font.BOLD, 15); lblStudent.setFont(newFont); lblAssessment = new JLabel("Assessment"); lblAssessment.setFont(newFont); titlePane.add(BorderLayout.WEST, lblStudent); titlePane.add(BorderLayout.EAST, lblAssessment); // add other panes schedulePane = new JPanel(); JPanel buttonPane = new JPanel(); contentPane.setLayout(new BorderLayout()); contentPane.add(schedulePane, BorderLayout.CENTER); contentPane.add(buttonPane, BorderLayout.SOUTH); schedulePane.setLayout(new BoxLayout(schedulePane, BoxLayout.Y_AXIS)); // add buttons JButton btnSave = new JButton("Save"); btnSave.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { save(); } }); // add buttons JButton btnCancel = new JButton("Cancel"); btnCancel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { dispose(); } }); JButton btnMin = new JButton("Min"); btnMin.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { min(); } }); JButton btnMax = new JButton("Max"); btnMax.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { max(); } }); JButton btnEmail = new JButton("Save & Email"); btnEmail.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { email(); } }); buttonPane.add(btnMin); buttonPane.add(btnMax); buttonPane.add(btnCancel); if (MarkingProperties.isEmailEnabled()) { buttonPane.add(btnEmail); } buttonPane.add(btnSave); buttonPane.add(cbExpandable); } public void addCategory(String category, List<Criterion> criteria) { schedulePane.add(new CategoryPanel(category, criteria)); } private void save() { if (!resultDao.isComplete()) { int res = JOptionPane.showConfirmDialog(MarkingFrame.this, "You haven't entered values for all criteria. Are you sure you want save?", "Incomplete", JOptionPane.OK_CANCEL_OPTION); if (JOptionPane.OK_OPTION == res) { resultDao.save(student.getSubmissionId()); parent.refresh(); dispose(); } } else { resultDao.save(student.getSubmissionId()); parent.refresh(); Collection<Map<String, ?>> result = resultDao.getResult(student.getId()); if (result.isEmpty()) { // marking is incomplete, so don't try to show a mark dispose(); return; } Map<String, ?> mark = result.iterator().next(); JOptionPane.showMessageDialog(this, "Mark: " + mark.get("MARK") +"\n" + "Bonus: " + mark.get("SPECIAL")); dispose(); } } private void min() { Component[] components = schedulePane.getComponents(); for (Component component : components) { if (component instanceof CategoryPanel) { CategoryPanel cp = (CategoryPanel) component; Component[] categories = cp.getComponents(); for (Component criterion : categories) { if (criterion instanceof CriterionPanel) { CriterionPanel c = (CriterionPanel) criterion; c.setZero(); } } } } } private void max() { Component[] components = schedulePane.getComponents(); for (Component component : components) { if (component instanceof CategoryPanel) { CategoryPanel cp = (CategoryPanel) component; Component[] categories = cp.getComponents(); for (Component criterion : categories) { if (criterion instanceof CriterionPanel) { CriterionPanel c = (CriterionPanel) criterion; if (c.getCriterion().isNormal() ) { c.setMax(); } else { c.setZero(); } } } } } } public void load(String submissionId) { student = new ResultDAO().findStudent(submissionId); lblStudent.setText(student.getFirstName() + " " + student.getLastName() + " (" + student.getId() + ")"); lblAssessment.setText(assessment); resultDao.load(submissionId); } public void display() { this.setPreferredSize(new Dimension(600, 980)); this.pack(); this.setVisible(true); } public void createReport() { try { new FeedbackReportGenerator(new ResultDAO().getResult(student.getId()), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix(), MarkingProperties.reportTitle(), MarkingProperties.reportFooter()).generate(student); } catch (Exception ex) { throw new RuntimeException(ex); } } public void emailReport() { String report = MarkingProperties.reportPath() + "/" + MarkingProperties.attachmentFilePrefix() + "-" + student.getId() + ".pdf"; new SendReport().sendReport(student, report); } @SuppressWarnings("Convert2Lambda") private void email() { save(); new Thread(new Runnable() { @Override public void run() { createReport(); emailReport(); } }).start(); } public boolean getExpandable() { return this.cbExpandable.isSelected(); } } package ui; import dao.MarkingProperties; import dao.ResultDAO; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collection; import java.util.List; import java.util.Map; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import model.Criterion; import model.Student; import report.FeedbackReportGenerator; import report.SendReport; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class MarkingFrame extends JDialog { private Student student; private final JPanel schedulePane; private final ResultDAO resultDao = new ResultDAO(); private final JLabel lblStudent; private final JLabel lblAssessment; private final SubmissionFrame parent; private final String assessment; private final JCheckBox cbExpandable; @SuppressWarnings("Convert2Lambda") public MarkingFrame(SubmissionFrame parent, String assessment) { this.setModal(true); this.parent = parent; this.assessment = assessment; // add scroll pane to the root JScrollPane scrollPane = new JScrollPane(); JPanel contentPane = new JPanel(); JPanel titlePane = new JPanel(); cbExpandable = new JCheckBox("Expand Text Areas?", false); scrollPane.setViewportView(contentPane); scrollPane.getVerticalScrollBar().setUnitIncrement(16); getContentPane().add(titlePane, java.awt.BorderLayout.NORTH); getContentPane().add(scrollPane, java.awt.BorderLayout.CENTER); titlePane.setLayout(new BorderLayout()); lblStudent = new JLabel("Student"); Font newFont = lblStudent.getFont().deriveFont(Font.BOLD, 15); lblStudent.setFont(newFont); lblAssessment = new JLabel("Assessment"); lblAssessment.setFont(newFont); titlePane.add(BorderLayout.WEST, lblStudent); titlePane.add(BorderLayout.EAST, lblAssessment); // add other panes schedulePane = new JPanel(); JPanel buttonPane = new JPanel(); contentPane.setLayout(new BorderLayout()); contentPane.add(schedulePane, BorderLayout.CENTER); contentPane.add(buttonPane, BorderLayout.SOUTH); schedulePane.setLayout(new BoxLayout(schedulePane, BoxLayout.Y_AXIS)); // add buttons JButton btnSave = new JButton("Save"); btnSave.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { save(); } }); // add buttons JButton btnCancel = new JButton("Cancel"); btnCancel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { dispose(); } }); JButton btnMin = new JButton("Min"); btnMin.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { min(); } }); JButton btnMax = new JButton("Max"); btnMax.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { max(); } }); JButton btnEmail = new JButton("Save & Email"); btnEmail.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { email(); } }); buttonPane.add(btnMin); buttonPane.add(btnMax); buttonPane.add(btnCancel); if (MarkingProperties.isEmailEnabled()) { buttonPane.add(btnEmail); } buttonPane.add(btnSave); buttonPane.add(cbExpandable); } public void addCategory(String category, List<Criterion> criteria) { schedulePane.add(new CategoryPanel(category, criteria)); } private void save() { if (!resultDao.isComplete()) { int res = JOptionPane.showConfirmDialog(MarkingFrame.this, "You haven't entered values for all criteria. Are you sure you want save?", "Incomplete", JOptionPane.OK_CANCEL_OPTION); if (JOptionPane.OK_OPTION == res) { resultDao.save(student.getSubmissionId()); parent.refresh(); dispose(); } } else { resultDao.save(student.getSubmissionId()); parent.refresh(); Collection<Map<String, ?>> result = resultDao.getResult(student.getId()); if (result.isEmpty()) { // marking is incomplete, so don't try to show a mark dispose(); return; } String mark = result.iterator().next().get("MARK").toString(); JOptionPane.showMessageDialog(this, "Mark is " + mark); dispose(); } } private void min() { Component[] components = schedulePane.getComponents(); for (Component component : components) { if (component instanceof CategoryPanel) { CategoryPanel cp = (CategoryPanel) component; Component[] categories = cp.getComponents(); for (Component criterion : categories) { if (criterion instanceof CriterionPanel) { CriterionPanel c = (CriterionPanel) criterion; c.setZero(); } } } } } private void max() { Component[] components = schedulePane.getComponents(); for (Component component : components) { if (component instanceof CategoryPanel) { CategoryPanel cp = (CategoryPanel) component; Component[] categories = cp.getComponents(); for (Component criterion : categories) { if (criterion instanceof CriterionPanel) { CriterionPanel c = (CriterionPanel) criterion; if (!c.getCriterion().isIsSpecial()) { c.setMax(); } else { c.setZero(); } } } } } } public void load(String submissionId) { student = new ResultDAO().findStudent(submissionId); lblStudent.setText(student.getFirstName() + " " + student.getLastName() + " (" + student.getId() + ")"); lblAssessment.setText(assessment); resultDao.load(submissionId); } public void display() { this.setPreferredSize(new Dimension(600, 980)); this.pack(); this.setVisible(true); } public void createReport() { try { new FeedbackReportGenerator(new ResultDAO().getResult(student.getId()), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix(), MarkingProperties.reportTitle(), MarkingProperties.reportFooter()).generate(student); } catch (Exception ex) { throw new RuntimeException(ex); } } public void emailReport() { String report = MarkingProperties.reportPath() + "/" + MarkingProperties.attachmentFilePrefix() + "-" + student.getId() + ".pdf"; new SendReport().sendReport(student, report); } @SuppressWarnings("Convert2Lambda") private void email() { save(); new Thread(new Runnable() { @Override public void run() { createReport(); emailReport(); } }).start(); } public boolean getExpandable() { return this.cbExpandable.isSelected(); } }

Ignore Space Show notes View src/main/resources/marking.properties

jdbc.url=jdbc:h2:./db/testing;IFEXISTS=TRUE;AUTO_SERVER=TRUE # output dir for generated reports report.dir=/tmp/reports # local testing smtp.host=localhost smtp.port=2525 smtp.user.name=n/a smtp.tls=false # real server #smtp.host=smtp.staff.otago.ac.nz #smtp.port=587 #smtp.user.name=geoma48p #smtp.tls=true marker.name=Mark George marker.email=mark.george@otago.ac.nz cc.email=cc@example.com attachment.email.name=testing.pdf attachment.file.prefix=milestone2 assessment.description=Milestone 2 # does email button appear in UI enable.email=true # email delay in seconds (rate limiting) email.delay=5 # show maximum on report report.showmax=true report.title=INFO202: Developing Information Systems 2\nAssessment Feedback report.footer=Your mark is calculated by dividing the mark for each criterion by the maximum for that criterion, then multiplying by a weight (not shown in this report, but available on request), and then adding all of the weighted marks together. The weightings are based on the size, complexity, and importance of the criterion. paper.code=INFO202 jdbc.url=jdbc:h2:./db/testing;IFEXISTS=TRUE;AUTO_SERVER=TRUE # output dir for generated reports report.dir=/tmp/reports # local testing smtp.host=localhost smtp.port=2525 smtp.user.name=na smtp.tls=false # real server #smtp.host=smtp.staff.otago.ac.nz #smtp.port=587 #smtp.user.name=geoma48p #smtp.tls=true marker.name=Mark George marker.email=mark.george@otago.ac.nz cc.email=cc@example.com attachment.email.name=testing.pdf attachment.file.prefix=milestone2 assessment.description=Milestone 2 # does email button appear in UI enable.email=true # email delay in seconds (rate limiting) email.delay=5 # show maximum on report report.showmax=true report.title=INFO202: Developing Information Systems 2\nAssessment Feedback report.footer=Your mark is calculated by dividing the mark for each criterion by the maximum for that criterion, then multiplying by a weight (not shown in this report, but available on request), and then adding all of the weighted marks together. The weightings are based on the size, complexity, and importance of the criterion. paper.code=INFO202

Show line notes below