Make marking window modal. Fix bugs with incomplete results.

mark.george / marking

Browse code Make marking window modal. Fix bugs with incomplete results.
1 parent 08cb49a commit 9b7e49eb43069b31af97e8d057abee56574ff5a1 Mark George authored on 17 Jun 2022

Patch

Showing 4 changed files

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 / 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 student) { 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, student); 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 student) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select from result where submission_id = ?")) { stmt.setString(1, student); 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); } } } 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 / 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 student) { 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, student); 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 student) { try { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select from result where submission_id = ?")) { stmt.setString(1, student); 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 id) { try ( Connection con = JdbcConnection.getConnection(); PreparedStatement stmt = con.prepareStatement("select * from student where submission_id = ?")) { stmt.setString(1, id); ResultSet rs = stmt.executeQuery(); if (rs.next()) { 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, 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 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, 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/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
 */
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 student) {

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, student);
					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 student) {

try {

try (
				 Connection con = JdbcConnection.getConnection();  PreparedStatement stmt = con.prepareStatement("select * from result where submission_id = ?")) {

stmt.setString(1, student);

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);
		}

}

package dao;

/**
 *
 * @author mark
 */
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 student) {

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, student);
					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 student) {

try {

try (
				 Connection con = JdbcConnection.getConnection();  PreparedStatement stmt = con.prepareStatement("select * from result where submission_id = ?")) {

stmt.setString(1, student);

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();

data.add(result);
			}

return data;

} catch (SQLException ex) {
			logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
			return null;
		}
	}

public Student findStudent(String id) {

try (
			 Connection con = JdbcConnection.getConnection();  PreparedStatement stmt = con.prepareStatement("select * from student where submission_id = ?")) {

stmt.setString(1, id);

ResultSet rs = stmt.executeQuery();

if (rs.next()) {

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, 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<>();
	}

ResultSet studsRs = studs.executeQuery();

while (studsRs.next()) {
				String id = studsRs.getString("student_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, 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/Student.java
package model; /** * * @author Mark George <mark.george@otago.ac.nz> / public class Student { private String id; private String submissionId; private String username; private String firstName; private String lastName; private String email; private Boolean sendFeedback; private Boolean emailSent; public Student() { } public Student(String id, String submissionId, String username, String firstName, String lastName, String email, Boolean sendFeedback, Boolean emailSent) { this.id = id; this.submissionId = submissionId; this.username = username; this.firstName = firstName; this.lastName = lastName; this.email = email; this.sendFeedback = sendFeedback; this.emailSent = emailSent; } public String getSubmissionId() { return submissionId; } public void setSubmissionId(String submissionId) { this.submissionId = submissionId; } public String getLastName() { return lastName; } public void setLastName(String lastName) { this.lastName = lastName; } public String getFirstName() { return firstName; } public void setFirstName(String firstName) { this.firstName = firstName; } public String getId() { return id; } public void setId(String id) { this.id = id; } public String getUsername() { return username; } public void setUsername(String username) { this.username = username; } public String getEmail() { return email; } public void setEmail(String email) { this.email = email; } public Boolean getSendFeedback() { return sendFeedback; } public void setSendFeedback(Boolean sendFeedback) { this.sendFeedback = sendFeedback; } public Boolean getEmailSent() { return emailSent; } public void setEmailSent(Boolean emailSent) { this.emailSent = emailSent; } @Override public String toString() { return "Student{" + "id='" + id + '\'' + ", username='" + username + '\'' + ", firstName='" + firstName + '\'' + ", lastName='" + lastName + '\'' + ", email='" + email + '\'' + ", sendFeedback=" + sendFeedback + ", emailSent=" + emailSent + '}'; } } package model; /* * * @author Mark George <mark.george@otago.ac.nz> */ public class Student { private String id; private String username; private String firstName; private String lastName; private String email; private Boolean sendFeedback; private Boolean emailSent; public Student() { } public Student(String id, String username, String firstName, String lastName, String email, Boolean sendFeedback, Boolean emailSent) { this.id = id; this.username = username; this.firstName = firstName; this.lastName = lastName; this.email = email; this.sendFeedback = sendFeedback; this.emailSent = emailSent; } public String getLastName() { return lastName; } public void setLastName(String lastName) { this.lastName = lastName; } public String getFirstName() { return firstName; } public void setFirstName(String firstName) { this.firstName = firstName; } public String getId() { return id; } public void setId(String id) { this.id = id; } public String getUsername() { return username; } public void setUsername(String username) { this.username = username; } public String getEmail() { return email; } public void setEmail(String email) { this.email = email; } public Boolean getSendFeedback() { return sendFeedback; } public void setSendFeedback(Boolean sendFeedback) { this.sendFeedback = sendFeedback; } public Boolean getEmailSent() { return emailSent; } public void setEmailSent(Boolean emailSent) { this.emailSent = emailSent; } @Override public String toString() { return "Student{" + "id='" + id + '\'' + ", username='" + username + '\'' + ", firstName='" + firstName + '\'' + ", lastName='" + lastName + '\'' + ", email='" + email + '\'' + ", sendFeedback=" + sendFeedback + ", emailSent=" + emailSent + '}'; } }

Ignore Space Show notes View

src/main/java/model/Student.java

package model;

/**
 *
 * @author Mark George <mark.george@otago.ac.nz>
 */
public class Student {

private String id;
	private String submissionId;
	private String username;
	private String firstName;
	private String lastName;
	private String email;
	private Boolean sendFeedback;
	private Boolean emailSent;

public Student() {
	}

public Student(String id, String submissionId, String username, String firstName, String lastName, String email, Boolean sendFeedback, Boolean emailSent) {
		this.id = id;
		this.submissionId = submissionId;
		this.username = username;
		this.firstName = firstName;
		this.lastName = lastName;
		this.email = email;
		this.sendFeedback = sendFeedback;
		this.emailSent = emailSent;
	}

public String getSubmissionId() {
		return submissionId;
	}

public void setSubmissionId(String submissionId) {
		this.submissionId = submissionId;
	}

public String getLastName() {
		return lastName;
	}

public void setLastName(String lastName) {
		this.lastName = lastName;
	}

public String getFirstName() {
		return firstName;
	}

public void setFirstName(String firstName) {
		this.firstName = firstName;
	}

public String getId() {
		return id;
	}

public void setId(String id) {
		this.id = id;
	}

public String getUsername() {
		return username;
	}

public void setUsername(String username) {
		this.username = username;
	}

public String getEmail() {
		return email;
	}

public void setEmail(String email) {
		this.email = email;
	}

public Boolean getSendFeedback() {
		return sendFeedback;
	}

public void setSendFeedback(Boolean sendFeedback) {
		this.sendFeedback = sendFeedback;
	}

public Boolean getEmailSent() {
		return emailSent;
	}

public void setEmailSent(Boolean emailSent) {
		this.emailSent = emailSent;
	}

@Override
	public String toString() {
		return "Student{"
			+ "id='" + id + '\''
			+ ", username='" + username + '\''
			+ ", firstName='" + firstName + '\''
			+ ", lastName='" + lastName + '\''
			+ ", email='" + email + '\''
			+ ", sendFeedback=" + sendFeedback
			+ ", emailSent=" + emailSent
			+ '}';
	}
}

package model;

/**
 *
 * @author Mark George <mark.george@otago.ac.nz>
 */
public class Student {

private String id;
	private String username;
	private String firstName;
	private String lastName;
	private String email;
	private Boolean sendFeedback;
	private Boolean emailSent;

public Student() {
	}

public Student(String id, String username, String firstName, String lastName, String email, Boolean sendFeedback, Boolean emailSent) {
		this.id = id;
		this.username = username;
		this.firstName = firstName;
		this.lastName = lastName;
		this.email = email;
		this.sendFeedback = sendFeedback;
		this.emailSent = emailSent;
	}

public String getLastName() {
		return lastName;
	}

public void setLastName(String lastName) {
		this.lastName = lastName;
	}

public String getFirstName() {
		return firstName;
	}

public void setFirstName(String firstName) {
		this.firstName = firstName;
	}

public String getId() {
		return id;
	}

public void setId(String id) {
		this.id = id;
	}

public String getUsername() {
		return username;
	}

public void setUsername(String username) {
		this.username = username;
	}

public String getEmail() {
		return email;
	}

public void setEmail(String email) {
		this.email = email;
	}

public Boolean getSendFeedback() {
		return sendFeedback;
	}

public void setSendFeedback(Boolean sendFeedback) {
		this.sendFeedback = sendFeedback;
	}

public Boolean getEmailSent() {
		return emailSent;
	}

public void setEmailSent(Boolean emailSent) {
		this.emailSent = emailSent;
	}

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 / 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; } } 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 */ 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 { Double result = Double.valueOf(txtSpecial.getText()); 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"); } } catch (NumberFormatException ex) { JOptionPane.showMessageDialog(null, txtSpecial.getText() + " is not a valid number", "Invalid Number", JOptionPane.ERROR_MESSAGE); throw new RuntimeException(ex.getLocalizedMessage()); } return Double.valueOf(txtSpecial.getText()); } } @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/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
 */
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;
	}

}

package ui;

/**
 *
 * @author mark
 */
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());

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);
		}

txtComment = new JTextArea();
		txtComment.setWrapStyleWord(true);
		txtComment.setLineWrap(true);

JScrollPane scrollPane = new JScrollPane();
		scrollPane.setViewportView(txtComment);
		scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);

txtComment.addFocusListener(new FocusAdapter() {

});

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 {
				Double result = Double.valueOf(txtSpecial.getText());
				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");
				}
			} catch (NumberFormatException ex) {
				JOptionPane.showMessageDialog(null, txtSpecial.getText() + " is not a valid number", "Invalid Number", JOptionPane.ERROR_MESSAGE);
				throw new RuntimeException(ex.getLocalizedMessage());
			}
			return Double.valueOf(txtSpecial.getText());
		}
	}

@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 / public class MarkingFrame extends JDialog { private Student student; private String submissionKey; 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(this.submissionKey); parent.refresh(); Collection<Map<String, ?>> result = resultDao.getResult(student.getSubmissionId()); 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 id) { this.submissionKey = id; student = new ResultDAO().findStudent(id); lblStudent.setText(student.getFirstName() + " " + student.getLastName() + " (" + student.getId() + ")"); lblAssessment.setText(assessment); resultDao.load(this.submissionKey); } public void display() { this.setPreferredSize(new Dimension(600, 980)); this.pack(); this.setVisible(true); } public void createReport() { try { new FeedbackReportGenerator(new ResultDAO().getResult(student.getSubmissionId()), 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.List; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFrame; 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 */ public class MarkingFrame extends JFrame { private Student student; private String submissionKey; 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.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.getId()); parent.refresh(); dispose(); } } else { resultDao.save(this.submissionKey); parent.refresh(); String mark = resultDao.getResult(student.getId()).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 id) { this.submissionKey = id; student = new ResultDAO().findStudent(id); lblStudent.setText(student.getFirstName() + " " + student.getLastName() + " (" + student.getId() + ")"); lblAssessment.setText(assessment); resultDao.load(this.submissionKey); } 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/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
 */
public class MarkingFrame extends JDialog {

private Student student;
	private String submissionKey;

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(this.submissionKey);
			parent.refresh();
			Collection<Map<String, ?>> result = resultDao.getResult(student.getSubmissionId());
			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 id) {
		this.submissionKey = id;
		student = new ResultDAO().findStudent(id);

lblStudent.setText(student.getFirstName() + " " + student.getLastName() + " (" + student.getId() + ")");
		lblAssessment.setText(assessment);
		resultDao.load(this.submissionKey);
	}

public void display() {
		this.setPreferredSize(new Dimension(600, 980));
		this.pack();
		this.setVisible(true);
	}

public void createReport() {
		try {
			new FeedbackReportGenerator(new ResultDAO().getResult(student.getSubmissionId()), 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.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JFrame;
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
 */
public class MarkingFrame extends JFrame {

private Student student;
	private String submissionKey;

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.parent = parent;