Browse code Add support for group/team marking. Other minor tweaks. master
1 parent d8d343c commit dc9c05c9c8968a18f6173ed1bac31a7567926058 Mark George authored 24 days ago

Showing 12 changed files

• README.md
• db/h2.sh
• sql/schema.sql
• sql/test_data.sql
• src/main/java/Main.java
• src/main/java/dao/ResultDAO.java
• src/main/java/model/Submission.java
• src/main/java/ui/BatchMailer.form
• src/main/java/ui/BatchMailer.java
• src/main/java/ui/CriterionPanel.java
• src/main/java/ui/MarkingFrame.java
• src/main/resources/marking.properties

Ignore Space Show notes View README.md

Marking System ============== A marking system intended to support a wide variety of assessments (or at least the ones that Mark has to deal with). Editor types: * `Scale` - Likert scale. * `Numeric` - Text input for decimal numbers. Criterion types: * `Normal` - the mark will be weighted and included in the total. * `Special` - the mark will not be weighted and is NOT included in the total. This is useful for bonus marks that can be applied across multiple assessments. Also useful if we are just recording marks and don't care about the totals (such as exam marking where we are marking a subset of an exam). * `Penalty` - the mark will NOT be weighted and is SUBTRACTED from the total. Useful for late submission penalties. # Setup ## Individual Assessment 1. Enter students into Student table. Leave Team_ID as null. 1. Enter submission into Submission table. Use whatever you want in the Name column - probably want the student's name. ## Team/Group Assessment 1. Enter teams into Team table. 1. Enter team ID and Name into Submission table. 1. Enter students into Student table and link to Team table via Team_ID. 1. Modify Report view to use Team_ID for Student instead of Submission_ID ## Penalties For things like late penalties. 1. Add a criterion. Set the `Weight` to 1.0. Set the `Min` to 0, and the `Max` to the maximum mark. Set the `Editor_Type` to `Numeric` and the `Criterion_Type` to `Penalty`. ## Bonus/Special Marks For marks that are handled seperately from this assessment. 1. Add a criterion. Set the `Weight` to 1.0. Set the `Editor_Type` to `Numeric` and the `Criterion_Type` to `Special`. Marking System ============== A marking system intended to support a wide variety of assessments (or at least the ones that Mark has to deal with). Editor types: * `Scale` - Likert scale. * `Numeric` - Text input for decimal numbers. Criterion types: * `Normal` - the mark will be weighted and included in the total. * `Special` - the mark will not be weighted and is NOT included in the total. This is useful for bonus marks that can be applied across multiple assessments. Also useful if we are just recording marks and don't care about the totals (such as exam marking where we are marking a subset of an exam). * `Penalty` - the mark will NOT be weighted and is SUBTRACTED from the total. Useful for late submission penalties.

Ignore Space Show notes View db/h2.sh
#!/bin/sh H2=../libs/h2-2.2.224.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-2.2.220.jar java -cp "${H2}" org.h2.tools.Console -web -tcp -browser -user sa -url "jdbc:h2:./testing;IFEXISTS=FALSE;AUTO_SERVER=TRUE"

Ignore Space Show notes View sql/schema.sql

-- 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'),('Penalty'); 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 DEFAULT TRUE, Email_Sent BOOLEAN NOT NULL DEFAULT FALSE, CONSTRAINT PK_Student PRIMARY KEY (Submission_ID) ); CREATE TABLE Submission ( Submission_ID VARCHAR PRIMARY KEY, Name VARCHAR NOT NULL, 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, case when mark - penalty > 0 then cast(round(Mark - Penalty,3) as NUMERIC(7,3)) else 0 end 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 ("Submission", "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); create or replace view unmarked as select * from submission where submission_id not in (select distinct submission_id from result); -- 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'),('Penalty'); 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 DEFAULT TRUE, Email_Sent BOOLEAN NOT NULL DEFAULT FALSE, 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, case when mark - penalty > 0 then cast(round(Mark - Penalty,3) as NUMERIC(7,3)) else 0 end 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); create view unmarked as select * from student where submission_id not in (select distinct submission_id from result)

Ignore Space Show notes View sql/test_data.sql

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', 'Penalty'); 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', 'Onesy One'), ('2222', 'Twosy Two'); 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/Main.java

import com.formdev.flatlaf.FlatDarkLaf; import ui.SubmissionFrame; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class Main { private static final float VERSION = 1.1f; @SuppressWarnings("Convert2Lambda") public static void main(String args[]) throws Exception { System.out.println("\nVERSION: " + VERSION+"\n"); FlatDarkLaf.setup(); java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { SubmissionFrame frame = new SubmissionFrame(); frame.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { System.exit(0); } }); frame.setVisible(true); } }); } } import com.formdev.flatlaf.FlatDarkLaf; import ui.SubmissionFrame; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class Main { @SuppressWarnings("Convert2Lambda") public static void main(String args[]) throws Exception { FlatDarkLaf.setup(); java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { SubmissionFrame frame = new SubmissionFrame(); frame.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { System.exit(0); } }); frame.setVisible(true); } }); } }

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 model.Submission; 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 \"Submission\""); 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; } public Submission findSubmission(String submissionId) { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select name from submission where submission_id = ?")) { stmt.setString(1, submissionId); ResultSet rs = stmt.executeQuery(); if (rs.next()) { String name = rs.getString("name"); Submission s = new Submission(submissionId, name); 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 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); } } }

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

package model; /** * * @author Mark George */ public class Submission { private String submissionId; private String name; public Submission() { } public Submission(String submissionId, String name) { this.submissionId = submissionId; this.name = name; } public String getSubmissionId() { return submissionId; } public void setSubmissionId(String submissionId) { this.submissionId = submissionId; } public String getName() { return name; } public void setName(String name) { this.name = name; } }

Ignore Space Show notes View src/main/java/ui/BatchMailer.form

<?xml version="1.0" encoding="UTF-8" ?> <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> <Properties> <Property name="defaultCloseOperation" type="int" value="2"/> </Properties> <SyntheticProperties> <SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="generateCenter" type="boolean" value="false"/> </SyntheticProperties> <AuxValues> <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/> <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/> <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> </AuxValues> <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="0" attributes="0"> <Component id="jScrollPane1" pref="588" max="32767" attributes="0"/> <Group type="102" alignment="0" attributes="0"> <Component id="btnStart" min="-2" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/> <Component id="btnStop" min="-2" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/> <Component id="btnReports" min="-2" max="-2" attributes="0"/> <EmptySpace max="32767" attributes="0"/> <Component id="btnClose" min="-2" pref="82" max="-2" attributes="0"/> </Group> </Group> <EmptySpace max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> <DimensionLayout dim="1"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Component id="jScrollPane1" pref="545" max="32767" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> <Component id="btnClose" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnStop" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnStart" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnReports" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> </Layout> <SubComponents> <Container class="javax.swing.JScrollPane" name="jScrollPane1"> <Properties> <Property name="name" type="java.lang.String" value="jScrollPane1" noResource="true"/> </Properties> <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> <SubComponents> <Component class="javax.swing.JTextArea" name="txtMessages"> <Properties> <Property name="columns" type="int" value="20"/> <Property name="rows" type="int" value="5"/> <Property name="name" type="java.lang.String" value="txtMessages" noResource="true"/> </Properties> </Component> </SubComponents> </Container> <Component class="javax.swing.JButton" name="btnClose"> <Properties> <Property name="text" type="java.lang.String" value="Close"/> <Property name="name" type="java.lang.String" value="btnClose" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCloseActionPerformed"/> </Events> </Component> <Component class="javax.swing.JButton" name="btnStop"> <Properties> <Property name="text" type="java.lang.String" value="Cancel Sending"/> <Property name="name" type="java.lang.String" value="btnStop" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStopActionPerformed"/> </Events> </Component> <Component class="javax.swing.JButton" name="btnStart"> <Properties> <Property name="text" type="java.lang.String" value="Start Sending"/> <Property name="name" type="java.lang.String" value="btnStart" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStartActionPerformed"/> </Events> </Component> <Component class="javax.swing.JButton" name="btnReports"> <Properties> <Property name="text" type="java.lang.String" value="Generate Reports Only "/> <Property name="name" type="java.lang.String" value="btnReports" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnReportsActionPerformed"/> </Events> </Component> </SubComponents> </Form> <?xml version="1.0" encoding="UTF-8" ?> <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> <Properties> <Property name="defaultCloseOperation" type="int" value="2"/> </Properties> <SyntheticProperties> <SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="generateCenter" type="boolean" value="false"/> </SyntheticProperties> <AuxValues> <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/> <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/> <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> </AuxValues> <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="0" attributes="0"> <Component id="jScrollPane1" pref="588" max="32767" attributes="0"/> <Group type="102" alignment="0" attributes="0"> <Component id="btnStart" min="-2" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/> <Component id="btnStop" min="-2" max="-2" attributes="0"/> <EmptySpace max="32767" attributes="0"/> <Component id="btnClose" min="-2" pref="82" max="-2" attributes="0"/> </Group> </Group> <EmptySpace max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> <DimensionLayout dim="1"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Component id="jScrollPane1" pref="545" max="32767" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> <Component id="btnClose" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnStop" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnStart" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> </Layout> <SubComponents> <Container class="javax.swing.JScrollPane" name="jScrollPane1"> <Properties> <Property name="name" type="java.lang.String" value="jScrollPane1" noResource="true"/> </Properties> <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> <SubComponents> <Component class="javax.swing.JTextArea" name="txtMessages"> <Properties> <Property name="columns" type="int" value="20"/> <Property name="rows" type="int" value="5"/> <Property name="name" type="java.lang.String" value="txtMessages" noResource="true"/> </Properties> </Component> </SubComponents> </Container> <Component class="javax.swing.JButton" name="btnClose"> <Properties> <Property name="text" type="java.lang.String" value="Close"/> <Property name="name" type="java.lang.String" value="btnClose" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCloseActionPerformed"/> </Events> </Component> <Component class="javax.swing.JButton" name="btnStop"> <Properties> <Property name="text" type="java.lang.String" value="Cancel Sending"/> <Property name="name" type="java.lang.String" value="btnStop" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStopActionPerformed"/> </Events> </Component> <Component class="javax.swing.JButton" name="btnStart"> <Properties> <Property name="text" type="java.lang.String" value="Start Sending"/> <Property name="name" type="java.lang.String" value="btnStart" noResource="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStartActionPerformed"/> </Events> </Component> </SubComponents> </Form>

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

package ui; import dao.MarkingProperties; import dao.ResultDAO; import jakarta.mail.AuthenticationFailedException; import java.net.ConnectException; import java.util.Collection; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import javax.swing.JOptionPane; import model.Student; import org.slf4j.LoggerFactory; import report.FeedbackReportGenerator; import report.SendReport; import static report.TimeStamp.getTimeStamp; /** * * @author Mark George <mark.george@otago.ac.nz> */ public final class BatchMailer extends javax.swing.JDialog { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(BatchMailer.class); private Boolean stopped = false; /** * Creates new form BatchMailer */ public BatchMailer(java.awt.Window parent, boolean modal) { super(parent); this.setModal(modal); initComponents(); addMessage("FROM: " + MarkingProperties.markerEmail()); addMessage("CC: " + MarkingProperties.ccEmail()); addMessage(""); } /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { jScrollPane1 = new javax.swing.JScrollPane(); txtMessages = new javax.swing.JTextArea(); btnClose = new javax.swing.JButton(); btnStop = new javax.swing.JButton(); btnStart = new javax.swing.JButton(); btnReports = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); jScrollPane1.setName("jScrollPane1"); // NOI18N txtMessages.setColumns(20); txtMessages.setRows(5); txtMessages.setName("txtMessages"); // NOI18N jScrollPane1.setViewportView(txtMessages); btnClose.setText("Close"); btnClose.setName("btnClose"); // NOI18N btnClose.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnCloseActionPerformed(evt); } }); btnStop.setText("Cancel Sending"); btnStop.setName("btnStop"); // NOI18N btnStop.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnStopActionPerformed(evt); } }); btnStart.setText("Start Sending"); btnStart.setName("btnStart"); // NOI18N btnStart.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnStartActionPerformed(evt); } }); btnReports.setText("Generate Reports Only "); btnReports.setName("btnReports"); // NOI18N btnReports.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnReportsActionPerformed(evt); } }); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 588, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(btnStart) .addGap(18, 18, 18) .addComponent(btnStop) .addGap(18, 18, 18) .addComponent(btnReports) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(btnClose, javax.swing.GroupLayout.PREFERRED_SIZE, 82, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 545, Short.MAX_VALUE) .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnClose) .addComponent(btnStop) .addComponent(btnStart) .addComponent(btnReports)) .addContainerGap()) ); pack(); }// </editor-fold>//GEN-END:initComponents private void btnStopActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStopActionPerformed int result = JOptionPane.showConfirmDialog(this, "Stop sending emails?", "Stop Sending?", JOptionPane.YES_NO_OPTION); // did the user click the yes button? if (result == JOptionPane.YES_OPTION) { this.stopped = true; addMessage("Stopped. Messages that are in the process of being retried will continue to be retried."); } }//GEN-LAST:event_btnStopActionPerformed public void addMessage(String message) { txtMessages.append(message + "\n"); } private void btnStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStartActionPerformed CompletableFuture.runAsync(() -> { Collection<Student> students = new ResultDAO().getStudents(); for (Student student : students) { if (stopped) { break; } if (!student.getSendFeedback() || student.getEmailSent()) { continue; } String title = MarkingProperties.reportTitle(); String footer = MarkingProperties.reportFooter(); new FeedbackReportGenerator(new ResultDAO().getResult(student.getId()), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix(), title, footer).generate(student); String report = MarkingProperties.reportPath() + "/" + MarkingProperties.attachmentFilePrefix() + "-" + student.getId() + ".pdf"; if (MarkingProperties.isEmailEnabled()) { try { new SendReport(BatchMailer.this).sendReport(student, report, true); } catch (AuthenticationFailedException ex) { addMessage("Authentication failed. Click 'Start Sending' to try again.\n"); return; } catch (ConnectException ex) { addMessage("Could not connect to SMTP server!\n"); return; } try { int delay = MarkingProperties.emailDelay(); TimeUnit.SECONDS.sleep(delay); // delay to minimise triggering rate limiting } catch (InterruptedException e) { logger.error(e.getLocalizedMessage(), e); } } } addMessage(""); addMessage(getTimeStamp() + " - Done\n"); }); }//GEN-LAST:event_btnStartActionPerformed private void btnCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCloseActionPerformed dispose(); }//GEN-LAST:event_btnCloseActionPerformed private void btnReportsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnReportsActionPerformed CompletableFuture.runAsync(() -> { Collection<Student> students = new ResultDAO().getStudents(); for (Student student : students) { if (stopped) { break; } String title = MarkingProperties.reportTitle(); String footer = MarkingProperties.reportFooter(); addMessage("Generating report for " + student.getSubmissionId()); new FeedbackReportGenerator(new ResultDAO().getResult(student.getId()), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix(), title, footer).generate(student); } addMessage(""); addMessage(getTimeStamp() + " - Done\n"); }); }//GEN-LAST:event_btnReportsActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnClose; private javax.swing.JButton btnReports; private javax.swing.JButton btnStart; private javax.swing.JButton btnStop; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextArea txtMessages; // End of variables declaration//GEN-END:variables } package ui; import dao.MarkingProperties; import dao.ResultDAO; import jakarta.mail.AuthenticationFailedException; import java.net.ConnectException; import java.util.Collection; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import javax.swing.JOptionPane; import model.Student; import org.slf4j.LoggerFactory; import report.FeedbackReportGenerator; import report.SendReport; import static report.TimeStamp.getTimeStamp; /** * * @author Mark George <mark.george@otago.ac.nz> */ public final class BatchMailer extends javax.swing.JDialog { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(BatchMailer.class); private Boolean stopped = false; /** * Creates new form BatchMailer */ public BatchMailer(java.awt.Window parent, boolean modal) { super(parent); this.setModal(modal); initComponents(); addMessage("FROM: " + MarkingProperties.markerEmail()); addMessage("CC: " + MarkingProperties.ccEmail()); addMessage(""); } /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { jScrollPane1 = new javax.swing.JScrollPane(); txtMessages = new javax.swing.JTextArea(); btnClose = new javax.swing.JButton(); btnStop = new javax.swing.JButton(); btnStart = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); jScrollPane1.setName("jScrollPane1"); // NOI18N txtMessages.setColumns(20); txtMessages.setRows(5); txtMessages.setName("txtMessages"); // NOI18N jScrollPane1.setViewportView(txtMessages); btnClose.setText("Close"); btnClose.setName("btnClose"); // NOI18N btnClose.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnCloseActionPerformed(evt); } }); btnStop.setText("Cancel Sending"); btnStop.setName("btnStop"); // NOI18N btnStop.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnStopActionPerformed(evt); } }); btnStart.setText("Start Sending"); btnStart.setName("btnStart"); // NOI18N btnStart.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnStartActionPerformed(evt); } }); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 588, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(btnStart) .addGap(18, 18, 18) .addComponent(btnStop) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(btnClose, javax.swing.GroupLayout.PREFERRED_SIZE, 82, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 545, Short.MAX_VALUE) .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnClose) .addComponent(btnStop) .addComponent(btnStart)) .addContainerGap()) ); pack(); }// </editor-fold>//GEN-END:initComponents private void btnStopActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStopActionPerformed int result = JOptionPane.showConfirmDialog(this, "Stop sending emails?", "Stop Sending?", JOptionPane.YES_NO_OPTION); // did the user click the yes button? if (result == JOptionPane.YES_OPTION) { this.stopped = true; addMessage("Stopped. Messages that are in the process of being retried will continue to be retried."); } }//GEN-LAST:event_btnStopActionPerformed public void addMessage(String message) { txtMessages.append(message + "\n"); } private void btnStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStartActionPerformed CompletableFuture.runAsync(() -> { Collection<Student> students = new ResultDAO().getStudents(); for (Student student : students) { if (stopped) { break; } if (!student.getSendFeedback() || student.getEmailSent()) { continue; } String title = MarkingProperties.reportTitle(); String footer = MarkingProperties.reportFooter(); new FeedbackReportGenerator(new ResultDAO().getResult(student.getId()), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix(), title, footer).generate(student); String report = MarkingProperties.reportPath() + "/" + MarkingProperties.attachmentFilePrefix() + "-" + student.getId() + ".pdf"; if (MarkingProperties.isEmailEnabled()) { try { new SendReport(BatchMailer.this).sendReport(student, report, true); } catch(AuthenticationFailedException ex) { addMessage("Authentication failed. Click 'Start Sending' to try again.\n"); return; } catch(ConnectException ex) { addMessage("Could not connect to SMTP server!\n"); return; } try { int delay = MarkingProperties.emailDelay(); TimeUnit.SECONDS.sleep(delay); // delay to minimise triggering rate limiting } catch (InterruptedException e) { logger.error(e.getLocalizedMessage(), e); } } } addMessage(""); addMessage(getTimeStamp() + " - Done\n"); }); }//GEN-LAST:event_btnStartActionPerformed private void btnCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCloseActionPerformed dispose(); }//GEN-LAST:event_btnCloseActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnClose; private javax.swing.JButton btnStart; private javax.swing.JButton btnStop; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextArea txtMessages; // End of variables declaration//GEN-END:variables }

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

package ui; import dao.MarkingProperties; 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((float)MarkingProperties.textAreaFontSize()); 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); // scroll to top txtComment.setCaretPosition(0); } @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 dao.MarkingProperties; 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(MarkingProperties.textAreaFontSize()); 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; } }

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

package ui; import dao.MarkingProperties; import dao.ResultDAO; import jakarta.mail.AuthenticationFailedException; 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.net.ConnectException; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; 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 model.Submission; import report.FeedbackReportGenerator; import report.SendReport; /** * * @author Mark George <mark.george@otago.ac.nz> */ public class MarkingFrame extends JDialog { private Student student; private Submission submission; 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; private boolean isComplete = false; @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) { saveAndEmail(); } }); 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()) { this.isComplete = false; 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 { this.isComplete = true; resultDao.save(submission.getSubmissionId()); parent.refresh(); Collection<Map<String, ?>> result = resultDao.getResult(submission.getSubmissionId()); 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) { submission = new ResultDAO().findSubmission(submissionId); lblStudent.setText(submissionId + " (" + submission.getName()+")"); 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"; try { new SendReport(this).sendReport(student, report, false); JOptionPane.showMessageDialog(this, "Email sent."); } catch (AuthenticationFailedException ex) { setVisible(true); } catch (ConnectException ex) { // ignored } } @SuppressWarnings("Convert2Lambda") private void saveAndEmail() { save(); // only send email if the marking is complete if (isComplete) { CompletableFuture.runAsync(() -> { createReport(); emailReport(); }); } } public boolean getExpandable() { return this.cbExpandable.isSelected(); } } package ui; import dao.MarkingProperties; import dao.ResultDAO; import jakarta.mail.AuthenticationFailedException; 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.net.ConnectException; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; 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; private boolean isComplete = false; @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) { saveAndEmail(); } }); 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()) { this.isComplete = false; 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 { this.isComplete = true; 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"; try { new SendReport(this).sendReport(student, report, false); JOptionPane.showMessageDialog(this, "Email sent."); } catch (AuthenticationFailedException ex) { setVisible(true); } catch (ConnectException ex) { // ignored } } @SuppressWarnings("Convert2Lambda") private void saveAndEmail() { save(); // only send email if the marking is complete if (isComplete) { CompletableFuture.runAsync(() -> { createReport(); emailReport(); }); } } 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=testing assessment.description=Testing # does email button appear in UI enable.email=true # email delay in seconds (rate limiting) email.delay=0 # show maximum on report report.showmax=true report.title=Some Report Title\nSecond Line of Titl;e report.footer=Some long winded description of how the marks are calculated. paper.code=INFOXYZ textarea.fontsize = 24 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 textarea.fontsize = 12

Show line notes below