Handle incorrect password. Thread around report generation. Dialogs -> Frames.

mark.george / marking

Browse code Handle incorrect password. Thread around report generation. Dialogs -> Frames.
1 parent 0632910 commit f36b4556d090ea3d4f4ce376534391a648a80b18 Mark George authored on 8 Oct 2017

Patch

Showing 11 changed files

Ignore Space Show notes View nbproject/private/private.xml
<?xml version="1.0" encoding="UTF-8"?> <project-private xmlns="http://www.netbeans.org/ns/project-private/1"> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <group> <file>file:/home/mark/work/projects/marking/src/ui/MarkingFrame.java</file> <file>file:/home/mark/work/projects/marking/src/marking.properties</file> <file>file:/home/mark/work/projects/marking/src/ui/SubmissionFrame.java</file> <file>file:/home/mark/work/projects/marking/src/report/FeedbackReportGenerator.java</file> <file>file:/home/mark/work/projects/marking/src/dao/JdbcConnection.java</file> <file>file:/home/mark/work/projects/marking/src/report/SendReport.java</file> </group> </open-files> </project-private> <?xml version="1.0" encoding="UTF-8"?> <project-private xmlns="http://www.netbeans.org/ns/project-private/1"> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <group/> </open-files> </project-private>

Ignore Space Show notes View

nbproject/private/private.xml

Ignore Space Show notes View src/Main.java
import java.awt.Color; import javax.swing.UIManager; import ui.SubmissionFrame; /** * * @author mark / public class Main { public static void main(String args[]) throws Exception { UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"); UIManager.put("control", new Color(50, 50, 50)); UIManager.put("nimbusBase", new Color(60, 60, 60)); UIManager.put("nimbusBlueGrey", new Color(60, 60, 60)); UIManager.put("nimbusFocus", new Color(90, 90, 90)); UIManager.put("nimbusLightBackground", new Color(70, 70, 70)); UIManager.put("text", new Color(230, 230, 230)); java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { SubmissionFrame dialog = new SubmissionFrame(); dialog.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { System.exit(0); } }); dialog.setVisible(true); } }); } } import java.awt.Color; import javax.swing.UIManager; import ui.SubmissionDialog; /* * * @author mark */ public class Main { public static void main(String args[]) throws Exception { UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"); UIManager.put("control", new Color(50, 50, 50)); UIManager.put("nimbusBase", new Color(60, 60, 60)); UIManager.put("nimbusBlueGrey", new Color(60, 60, 60)); UIManager.put("nimbusFocus", new Color(90, 90, 90)); UIManager.put("nimbusLightBackground", new Color(70, 70, 70)); UIManager.put("text", new Color(230, 230, 230)); java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { SubmissionDialog dialog = new SubmissionDialog(); dialog.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { System.exit(0); } }); dialog.setVisible(true); } }); } }

Ignore Space Show notes View

src/Main.java

Ignore Space Show notes View src/dao/MarkingProperties.java
package dao; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; import javax.swing.JOptionPane; /** * * @author mark / @SuppressWarnings("StaticNonFinalUsedInInitialization") public class MarkingProperties { private static Properties properties = null; static { if (properties == null) { properties = new Properties(); try { // production properties.load(new FileInputStream("marking.properties")); } catch (IOException ex1) { try { // development properties.load(MarkingProperties.class.getResourceAsStream("/marking.properties")); } catch (IOException ex2) { JOptionPane.showMessageDialog(null, "marking.properties not found!"); } } } } public static String jdbcUri() { return properties.getProperty("jdbc.url"); } public static String reportPath() { return properties.getProperty("report.dir"); } public static String attachmentEmailName() { return properties.getProperty("attachment.email.name"); } public static String attachmentFilePrefix() { return properties.getProperty("attachment.file.prefix"); } public static String assessmentDescription() { return properties.getProperty("assessment.description"); } public static Boolean isEmailEnabled() { return properties.getProperty("enable.email").trim().equalsIgnoreCase("true"); } public static String idType() { return properties.getProperty("id.type"); } public static String smtpHost() { return properties.getProperty("smtp.host"); } public static String smtpUserName() { return properties.getProperty("smtp.user.name"); } public static Integer smtpPort() { return new Integer(properties.getProperty("smtp.port")); } } package dao; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; import javax.swing.JOptionPane; /* * * @author mark */ @SuppressWarnings("StaticNonFinalUsedInInitialization") public class MarkingProperties { private static Properties properties = null; static { if (properties == null) { properties = new Properties(); try { // production properties.load(new FileInputStream("marking.properties")); } catch (IOException ex1) { try { // development properties.load(MarkingProperties.class.getResourceAsStream("/marking.properties")); } catch (IOException ex2) { JOptionPane.showMessageDialog(null, "marking.properties not found!"); } } } } public static String jdbcUri() { return properties.getProperty("jdbc.url"); } public static String reportPath() { return properties.getProperty("report.dir"); } public static String attachmentEmailName() { return properties.getProperty("attachment.email.name"); } public static String attachmentFilePrefix() { return properties.getProperty("attachment.file.prefix"); } public static String assessmentDescription() { return properties.getProperty("assessment.description"); } public static Boolean isEmailEnabled() { return properties.getProperty("enable.email").trim().equalsIgnoreCase("true"); } public static String idType() { return properties.getProperty("id.type"); } public static String smtpHost() { return properties.getProperty("smtp.host"); } public static Integer smtpPort() { return new Integer(properties.getProperty("smtp.port")); } }

Ignore Space Show notes View

src/dao/MarkingProperties.java

package dao;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
import javax.swing.JOptionPane;

/**
 *
 * @author mark
 */
@SuppressWarnings("StaticNonFinalUsedInInitialization")
public class MarkingProperties {

private static Properties properties = null;

static {
		if (properties == null) {

properties = new Properties();
			try {
				// production
				properties.load(new FileInputStream("marking.properties"));
			} catch (IOException ex1) {
				try {
					// development
					properties.load(MarkingProperties.class.getResourceAsStream("/marking.properties"));
				} catch (IOException ex2) {
					JOptionPane.showMessageDialog(null, "marking.properties not found!");
				}
			}
		}
	}

public static String jdbcUri() {
		return properties.getProperty("jdbc.url");
	}

public static String reportPath() {
		return properties.getProperty("report.dir");
	}

public static String attachmentEmailName() {
		return properties.getProperty("attachment.email.name");
	}

public static String attachmentFilePrefix() {
		return properties.getProperty("attachment.file.prefix");
	}

public static String assessmentDescription() {
		return properties.getProperty("assessment.description");
	}

public static Boolean isEmailEnabled() {
		return properties.getProperty("enable.email").trim().equalsIgnoreCase("true");
	}

public static String idType() {
		return properties.getProperty("id.type");
	}

public static String smtpHost() {
		return properties.getProperty("smtp.host");
	}

public static String smtpUserName() {
		return properties.getProperty("smtp.user.name");
	}

public static Integer smtpPort() {
		return new Integer(properties.getProperty("smtp.port"));
	}

}

package dao;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
import javax.swing.JOptionPane;

/**
 *
 * @author mark
 */
@SuppressWarnings("StaticNonFinalUsedInInitialization")
public class MarkingProperties {

private static Properties properties = null;

static {
		if (properties == null) {

public static String jdbcUri() {
		return properties.getProperty("jdbc.url");
	}

public static String reportPath() {
		return properties.getProperty("report.dir");
	}

public static String attachmentEmailName() {
		return properties.getProperty("attachment.email.name");
	}

public static String attachmentFilePrefix() {
		return properties.getProperty("attachment.file.prefix");
	}

public static String assessmentDescription() {
		return properties.getProperty("assessment.description");
	}

public static Boolean isEmailEnabled() {
		return properties.getProperty("enable.email").trim().equalsIgnoreCase("true");
	}

public static String idType() {
		return properties.getProperty("id.type");
	}
	
	public static String smtpHost() {
		return properties.getProperty("smtp.host");
	}
	
	public static Integer smtpPort() {
		return new Integer(properties.getProperty("smtp.port"));
	}
	
}

Ignore Space Show notes View src/marking.properties
jdbc.url=jdbc:h2:tcp://localhost/~/work/202/2017/marking/project/milestone1/db/marking;IFEXISTS=TRUE # output dir for generated reports report.dir=/tmp/reports #smtp.host=localhost #smtp.port=2525 smtp.host=smtp.staff.otago.ac.nz smtp.port=587 smpt.user.name=geoma48p #attachment.email.name=INFO202-milestone1.pdf #attachment.file.prefix=milestone1 assessment.description=Milestone 1 # does email button appear in UI enable.email=true # students identified by id or username id.type=username jdbc.url=jdbc:h2:tcp://localhost/~/work/202/2017/marking/project/milestone1/db/marking;IFEXISTS=TRUE # output dir for generated reports report.dir=/tmp/reports smtp.host=localhost smtp.port=2525 #smtp.host=smtp.staff.otago.ac.nz #smtp.port=587 attachment.email.name=INFO202-milestone1.pdf attachment.file.prefix=milestone1 assessment.description=Milestone 1 # does email button appear in UI enable.email=true # students identified by id or username id.type=username

Ignore Space Show notes View

src/marking.properties

Ignore Space Show notes View src/report/SendReport.java
package report; import dao.MarkingProperties; import javax.activation.FileDataSource; import javax.swing.JOptionPane; import javax.swing.JPasswordField; import model.Student; import org.simplejavamail.email.Email; import org.simplejavamail.email.EmailBuilder; import org.simplejavamail.mailer.Mailer; import org.simplejavamail.mailer.config.TransportStrategy; /** * * @author Mark George <mark.george@otago.ac.nz> / public class SendReport { private static String password = null; public void sendReport(Student student, String reportFileName) { String assessment = MarkingProperties.assessmentDescription(); String file = MarkingProperties.attachmentEmailName(); String message = "Hi " + student.getName() + ".\n" + "\n" + "Here is our feedback from marking your INFO202 " + assessment + " project. The feedback is in the attached PDF document.\n" + "\n" + "Cheers,\n" + "Mark"; Email email = new EmailBuilder() .from("Mark George", "mark.george@otago.ac.nz") .to(student.getEmail()) .cc("mark.george@otago.ac.nz") .subject("INFO202 " + assessment + " Result") .text(message) .build(); email.addAttachment(file, new FileDataSource(reportFileName)); try { String userName = MarkingProperties.smtpUserName(); if (password == null) { String result = getPassword("Staff E-Mail Password"); if (result != null) { password = result; new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), userName, password, TransportStrategy.SMTP_TLS).sendMail(email); } } else { new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), userName, password, TransportStrategy.SMTP_TLS).sendMail(email); } } catch (Exception ex) { JOptionPane.showMessageDialog(null, "Error sending email - password wrong?", "Mail Error", JOptionPane.ERROR_MESSAGE); password = null; } } public static String getPassword(String prompt) { JPasswordField txtPasswd = new JPasswordField(); int resp = JOptionPane.showConfirmDialog(null, txtPasswd, prompt, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE); if (resp == JOptionPane.OK_OPTION) { return new String(txtPasswd.getPassword()); } return null; } } package report; import dao.MarkingProperties; import javax.activation.FileDataSource; import javax.swing.JOptionPane; import javax.swing.JPasswordField; import model.Student; import org.simplejavamail.email.Email; import org.simplejavamail.email.EmailBuilder; import org.simplejavamail.mailer.Mailer; import org.simplejavamail.mailer.config.TransportStrategy; /* * * @author Mark George <mark.george@otago.ac.nz> */ public class SendReport { private static String password = null; public void sendReport(Student student, String reportFileName) { String assessment = MarkingProperties.assessmentDescription(); String file = MarkingProperties.attachmentEmailName(); String message = "Hi " + student.getName() + ".\n" + "\n" + "Here is our feedback from marking your INFO202 " + assessment + " project. The feedback is in the attached PDF document.\n" + "\n" + "Cheers,\n" + "Mark"; Email email = new EmailBuilder() .from("Mark George", "mark.george@otago.ac.nz") .to(student.getEmail()) .cc("mark.george@otago.ac.nz") .subject("INFO202 " + assessment + " Result") .text(message) .build(); email.addAttachment(file, new FileDataSource(reportFileName)); if (password == null) { String result = getPassword("Staff E-Mail Password"); if (result != null) { password = result; new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), "geoma48p", password, TransportStrategy.SMTP_TLS).sendMail(email); } } else { new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), "geoma48p", password, TransportStrategy.SMTP_TLS).sendMail(email); } } public static String getPassword(String prompt) { JPasswordField txtPasswd = new JPasswordField(); int resp = JOptionPane.showConfirmDialog(null, txtPasswd, prompt, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE); if (resp == JOptionPane.OK_OPTION) { return new String(txtPasswd.getPassword()); } return null; } }

Ignore Space Show notes View

src/report/SendReport.java

package report;

import dao.MarkingProperties;
import javax.activation.FileDataSource;
import javax.swing.JOptionPane;
import javax.swing.JPasswordField;
import model.Student;
import org.simplejavamail.email.Email;
import org.simplejavamail.email.EmailBuilder;
import org.simplejavamail.mailer.Mailer;
import org.simplejavamail.mailer.config.TransportStrategy;

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

private static String password = null;

public void sendReport(Student student, String reportFileName) {

String assessment = MarkingProperties.assessmentDescription();
		String file = MarkingProperties.attachmentEmailName();

String message
				  = "Hi " + student.getName() + ".\n"
				  + "\n"
				  + "Here is our feedback from marking your INFO202 " + assessment + " project.  The feedback is in the attached PDF document.\n"
				  + "\n"
				  + "Cheers,\n"
				  + "Mark";

Email email = new EmailBuilder()
				  .from("Mark George", "mark.george@otago.ac.nz")
				  .to(student.getEmail())
				  .cc("mark.george@otago.ac.nz")
				  .subject("INFO202 " + assessment + " Result")
				  .text(message)
				  .build();

email.addAttachment(file, new FileDataSource(reportFileName));

try {

String userName = MarkingProperties.smtpUserName();

if (password == null) {
				String result = getPassword("Staff E-Mail Password");
				if (result != null) {
					password = result;
					new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), userName, password, TransportStrategy.SMTP_TLS).sendMail(email);
				}
			} else {
				new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), userName, password, TransportStrategy.SMTP_TLS).sendMail(email);
			}
		} catch (Exception ex) {
			JOptionPane.showMessageDialog(null, "Error sending email - password wrong?", "Mail Error", JOptionPane.ERROR_MESSAGE);
			password = null;
		}

}

public static String getPassword(String prompt) {
		JPasswordField txtPasswd = new JPasswordField();
		int resp = JOptionPane.showConfirmDialog(null, txtPasswd, prompt,
				  JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
		if (resp == JOptionPane.OK_OPTION) {
			return new String(txtPasswd.getPassword());
		}
		return null;
	}

}

package report;

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

private static String password = null;

public void sendReport(Student student, String reportFileName) {

String assessment = MarkingProperties.assessmentDescription();
		String file = MarkingProperties.attachmentEmailName();

String message
				= "Hi " + student.getName() + ".\n"
				+ "\n"
				+ "Here is our feedback from marking your INFO202 " + assessment + " project.  The feedback is in the attached PDF document.\n"
				+ "\n"
				+ "Cheers,\n"
				+ "Mark";

Email email = new EmailBuilder()
				.from("Mark George", "mark.george@otago.ac.nz")
				.to(student.getEmail())
				.cc("mark.george@otago.ac.nz")
				.subject("INFO202 " + assessment + " Result")
				.text(message)
				.build();

email.addAttachment(file, new FileDataSource(reportFileName));

if (password == null) {
			String result = getPassword("Staff E-Mail Password");
			if (result != null) {
				password = result;
				new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), "geoma48p", password, TransportStrategy.SMTP_TLS).sendMail(email);
			}
		} else {
			new Mailer(MarkingProperties.smtpHost(), MarkingProperties.smtpPort(), "geoma48p", password, TransportStrategy.SMTP_TLS).sendMail(email);
		}

}

public static String getPassword(String prompt) {
		JPasswordField txtPasswd = new JPasswordField();
		int resp = JOptionPane.showConfirmDialog(null, txtPasswd, prompt,
				JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
		if (resp == JOptionPane.OK_OPTION) {
			return new String(txtPasswd.getPassword());
		}
		return null;
	}

}

Ignore Space Show notes View src/schema.sql
CREATE TABLE assessment ( name VARCHAR PRIMARY KEY, bonus_weight DOUBLE NOT NULL, outof DOUBLE NOT NULL ); CREATE TABLE category ( category VARCHAR PRIMARY KEY, sort_order SMALLINT ); CREATE TABLE criterion ( criterion VARCHAR PRIMARY KEY, category VARCHAR NOT NULL, description VARCHAR NOT NULL, sort_order SMALLINT, weight REAL, min SMALLINT, max SMALLINT, special BOOLEAN, CONSTRAINT fk_criterion_category FOREIGN KEY(category) REFERENCES category( category) ); CREATE TABLE submission ( student VARCHAR PRIMARY KEY ); CREATE TABLE result ( student VARCHAR NOT NULL, criterion VARCHAR NOT NULL, result REAL NOT NULL, comment VARCHAR, CONSTRAINT pk_result PRIMARY KEY(student, criterion), CONSTRAINT fk_result_student FOREIGN KEY(student) REFERENCES submission( student), CONSTRAINT fk_result_criterion FOREIGN KEY(criterion) REFERENCES criterion( criterion) ); CREATE VIEW weighted_mark AS SELECT student, Sum(weighted) * (SELECT outof FROM assessment) AS MARK FROM (SELECT student, result, weight, max, ( result / max * ( weight / (SELECT Sum(weight) FROM criterion WHERE NOT special) ) ) AS WEIGHTED FROM result INNER JOIN criterion ON result.criterion = criterion.criterion WHERE NOT special) GROUP BY student; -- UNION is a hack to ensure we always get something even if there are no special criterion CREATE VIEW weighted_special AS SELECT student, Sum(special) * (SELECT bonus_weight FROM assessment) AS special FROM ( SELECT student, result AS SPECIAL FROM result INNER JOIN criterion ON criterion.criterion = result.criterion WHERE special UNION ALL SELECT DISTINCT student, 0 FROM result ) GROUP BY student; # version to use when bonus contributes only to this assessment (maximum mark can not be exceeded) CREATE VIEW mark AS SELECT weighted_mark.student, Round(Casewhen(mark + special <= (SELECT outof FROM assessment), mark + special, ( SELECT outof FROM assessment)), 5) AS MARK FROM weighted_mark INNER JOIN weighted_special ON weighted_mark.student = weighted_special.student; # version to use when bonus contributes to other assessment (maximum mark CAN be exceeded) CREATE VIEW mark AS SELECT weighted_mark.student, Round(mark + special, 2) AS MARK FROM weighted_mark INNER JOIN weighted_special ON weighted_mark.student = weighted_special.student; 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 TABLE PUBLIC.STUDENTS( STUDENTID VARCHAR primary key, NAME VARCHAR, USERCODE VARCHAR, email VARCHAR, SEND_FEEDBACK BOOLEAN ) CREATE VIEW allmarks("Student", "Weighted Mark", "Marking Complete") AS SELECT submission.student, COALESCE(Cast(Round(mark, 2) AS VARCHAR), '') AS mark, COALESCE(Cast(complete AS VARCHAR), '') AS complete FROM submission LEFT JOIN mark ON submission.student = mark.student LEFT JOIN (SELECT student, Count(criterion) = (SELECT Count(criterion) FROM criterion) AS complete FROM result GROUP BY student) c ON submission.student = c.student; -- 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); -- view for showing relative weightings as percentages of total mark create view weighted_schedule as select cat.category, criterion, description, weight, special, round(weight / total_weight 100, 2) as relative_weight, round(weight / total_weight * max, 2) as out_of from criterion crit, (select sum(weight) as total_weight from criterion where not special) inner join category cat on crit.category = cat.category order by cat.sort_order, crit.sort_order create view weighted_categories as select category,round(sum(relative_weight),1) as weight FROM WEIGHTED_SCHEDULE where not special group by category --recorded by studentid create view report as select a.name as assessment, a.outof, s.studentid, s.name, s.usercode, cat.category, cat.sort_order as cat_order, cr.description as criterion, cr.max as max, cr.sort_order as cr_order, r.result,r.comment, round(m.mark,3) as mark from assessment a join category cat inner join criterion cr on cat.category = cr.category inner join result r on r.criterion=cr.criterion inner join students s on cast(r.student as integer)=cast(s.studentid as integer) inner join mark m on cast(m.student as integer)=cast(s.studentid as integer) order by studentid, cat_order,cr_order --recorded by usercode create view report as select a.name as assessment, a.outof, s.studentid, s.name, s.usercode, cat.category, cat.sort_order as cat_order, cr.description as criterion, cr.max as max, cr.sort_order as cr_order, r.result,r.comment, round(m.mark,3) as mark from assessment a join category cat inner join criterion cr on cat.category = cr.category inner join result r on r.criterion=cr.criterion inner join students s on r.student =s.usercode inner join mark m on r.student = m.student order by studentid, cat_order,cr_order CREATE TABLE assessment ( name VARCHAR PRIMARY KEY, bonus_weight DOUBLE NOT NULL, outof DOUBLE NOT NULL ); CREATE TABLE category ( category VARCHAR PRIMARY KEY, sort_order SMALLINT ); CREATE TABLE criterion ( criterion VARCHAR PRIMARY KEY, category VARCHAR NOT NULL, description VARCHAR NOT NULL, sort_order SMALLINT, weight REAL, min SMALLINT, max SMALLINT, special BOOLEAN, CONSTRAINT fk_criterion_category FOREIGN KEY(category) REFERENCES category( category) ); CREATE TABLE submission ( student VARCHAR PRIMARY KEY ); CREATE TABLE result ( student VARCHAR NOT NULL, criterion VARCHAR NOT NULL, result REAL NOT NULL, comment VARCHAR, CONSTRAINT pk_result PRIMARY KEY(student, criterion), CONSTRAINT fk_result_student FOREIGN KEY(student) REFERENCES submission( student), CONSTRAINT fk_result_criterion FOREIGN KEY(criterion) REFERENCES criterion( criterion) ); CREATE VIEW weighted_mark AS SELECT student, Sum(weighted) * (SELECT outof FROM assessment) AS MARK FROM (SELECT student, result, weight, max, ( result / max * ( weight / (SELECT Sum(weight) FROM criterion WHERE NOT special) ) ) AS WEIGHTED FROM result INNER JOIN criterion ON result.criterion = criterion.criterion WHERE NOT special) GROUP BY student; -- UNION is a hack to ensure we always get something even if there are no special criterion CREATE VIEW weighted_special AS SELECT student, Sum(special) * (SELECT bonus_weight FROM assessment) AS special FROM ( SELECT student, result AS SPECIAL FROM result INNER JOIN criterion ON criterion.criterion = result.criterion WHERE special UNION ALL SELECT DISTINCT student, 0 FROM result ) GROUP BY student; CREATE VIEW mark AS SELECT weighted_mark.student, Round(Casewhen(mark + special <= (SELECT outof FROM assessment), mark + special, ( SELECT outof FROM assessment)), 5) AS MARK FROM weighted_mark INNER JOIN weighted_special ON weighted_mark.student = weighted_special.student; 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 TABLE PUBLIC.STUDENTS( STUDENTID VARCHAR primary key, NAME VARCHAR, USERCODE VARCHAR, email VARCHAR, SEND_FEEDBACK BOOLEAN ) CREATE VIEW feedback AS SELECT student, category.category, comment FROM criterion INNER JOIN result ON result.criterion = criterion.criterion INNER JOIN category ON criterion.category = category.category WHERE comment <> '' ORDER BY category.sort_order, criterion.sort_order; CREATE VIEW allmarks("Student", "Weighted Mark", "Marking Complete") AS SELECT submission.student, COALESCE(Cast(Round(mark, 2) AS VARCHAR), '') AS mark, COALESCE(Cast(complete AS VARCHAR), '') AS complete FROM submission LEFT JOIN mark ON submission.student = mark.student LEFT JOIN (SELECT student, Count(criterion) = (SELECT Count(criterion) FROM criterion) AS complete FROM result GROUP BY student) c ON submission.student = c.student; -- 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); -- view for showing relative weightings as percentages of total mark create view weighted_schedule as select cat.category, criterion, description, weight, special, round(weight / total_weight 100, 2) as relative_weight from criterion crit, (select sum(weight) as total_weight from criterion where not special) inner join category cat on crit.category = cat.category order by cat.sort_order, crit.sort_order create view weighted_categories as select category,round(sum(relative_weight),1) as weight FROM WEIGHTED_SCHEDULE where not special group by category --recorded by studentid create view report as select a.name as assessment, a.outof, s.studentid, s.name, s.usercode, cat.category, cat.sort_order as cat_order, cr.description as criterion, cr.max as max, cr.sort_order as cr_order, r.result,r.comment, round(m.mark,3) as mark from assessment a join category cat inner join criterion cr on cat.category = cr.category inner join result r on r.criterion=cr.criterion inner join students s on cast(r.student as integer)=cast(s.studentid as integer) inner join mark m on cast(m.studentid as integer)=cast(s.studentid as integer) order by studentid, cat_order,cr_order --recorded by usercode create view report as select a.name as assessment, a.outof, s.studentid, s.name, s.usercode, cat.category, cat.sort_order as cat_order, cr.description as criterion, cr.max as max, cr.sort_order as cr_order, r.result,r.comment, round(m.mark,3) as mark from assessment a join category cat inner join criterion cr on cat.category = cr.category inner join result r on r.criterion=cr.criterion inner join students s on r.student =s.usercode inner join mark m on r.student = m.student order by studentid, cat_order,cr_order

Ignore Space Show notes View

src/schema.sql

CREATE TABLE assessment
  (
     name         VARCHAR PRIMARY KEY,
     bonus_weight DOUBLE NOT NULL,
     outof        DOUBLE NOT NULL
  );

CREATE TABLE category
  (
     category   VARCHAR PRIMARY KEY,
     sort_order SMALLINT
  );

CREATE TABLE criterion
  (
     criterion   VARCHAR PRIMARY KEY,
     category    VARCHAR NOT NULL,
     description VARCHAR NOT NULL,
     sort_order  SMALLINT,
     weight      REAL,
     min         SMALLINT,
     max         SMALLINT,
     special     BOOLEAN,
     CONSTRAINT fk_criterion_category FOREIGN KEY(category) REFERENCES category(
     category)
  );

CREATE TABLE submission
  (
     student VARCHAR PRIMARY KEY
  );

CREATE TABLE result
  (
     student   VARCHAR NOT NULL,
     criterion VARCHAR NOT NULL,
     result    REAL NOT NULL,
     comment   VARCHAR,
     CONSTRAINT pk_result PRIMARY KEY(student, criterion),
     CONSTRAINT fk_result_student FOREIGN KEY(student) REFERENCES submission(
     student),
     CONSTRAINT fk_result_criterion FOREIGN KEY(criterion) REFERENCES criterion(
     criterion)
  );

CREATE VIEW weighted_mark
AS
  SELECT student,
         Sum(weighted) * (SELECT outof
                          FROM   assessment) AS MARK
  FROM   (SELECT student,
                 result,
                 weight,
                 max,
                 ( result / max * ( weight / (SELECT Sum(weight)
                                              FROM   criterion
                                              WHERE  NOT special) ) ) AS
                 WEIGHTED
          FROM   result
                 INNER JOIN criterion
                         ON result.criterion = criterion.criterion
          WHERE  NOT special)
  GROUP  BY student;

-- UNION is a hack to ensure we always get something even if there are no special criterion
CREATE VIEW weighted_special
AS
  SELECT student,
         Sum(special) * (SELECT bonus_weight
                         FROM   assessment) AS special
  FROM
         (
				SELECT student,
						 result AS SPECIAL
				FROM   result
						 INNER JOIN criterion
									ON criterion.criterion = result.criterion
				WHERE  special

UNION ALL

SELECT DISTINCT student, 0
				FROM   result
         )

GROUP  BY student;

# version to use when bonus contributes only to this assessment (maximum mark can not be exceeded)
CREATE VIEW mark
AS
  SELECT weighted_mark.student,
         Round(Casewhen(mark + special <= (SELECT outof
                                           FROM   assessment), mark + special, (
               SELECT
               outof
               FROM
               assessment)), 5) AS MARK
  FROM   weighted_mark
         INNER JOIN weighted_special
                 ON weighted_mark.student = weighted_special.student;

# version to use when bonus contributes to other assessment (maximum mark CAN be exceeded)
CREATE VIEW mark
AS
  SELECT weighted_mark.student,
         Round(mark + special, 2) AS MARK
  FROM   weighted_mark
         INNER JOIN weighted_special
                 ON weighted_mark.student = weighted_special.student;

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 TABLE PUBLIC.STUDENTS(
    STUDENTID VARCHAR primary key,
    NAME VARCHAR,
    USERCODE VARCHAR,
		email VARCHAR,
    SEND_FEEDBACK BOOLEAN
)

CREATE VIEW allmarks("Student", "Weighted Mark", "Marking Complete")
AS
	SELECT submission.student,
			 COALESCE(Cast(Round(mark, 2) AS VARCHAR), '') AS mark,
			 COALESCE(Cast(complete AS VARCHAR), '')       AS complete
	FROM   submission
			 LEFT JOIN mark
					  ON submission.student = mark.student
			 LEFT JOIN (SELECT student, Count(criterion) = (SELECT Count(criterion) FROM criterion)
							AS complete
							FROM result
							GROUP BY student) c ON submission.student = c.student;

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

-- view for showing relative weightings as percentages of total mark
create view weighted_schedule as
select cat.category, criterion, description, weight, special, round(weight / total_weight * 100, 2) as relative_weight, round(weight / total_weight * max, 2) as out_of
from criterion crit, (select sum(weight) as total_weight from criterion where not special)
inner join category cat on crit.category = cat.category
order by cat.sort_order, crit.sort_order

create view weighted_categories as
select category,round(sum(relative_weight),1) as weight FROM WEIGHTED_SCHEDULE where not special group by category

--recorded by studentid
create view report as
select
	a.name as assessment, a.outof,
	s.studentid, s.name, s.usercode,
	cat.category, cat.sort_order as cat_order,
	cr.description as criterion, cr.max as max, cr.sort_order as cr_order,
	r.result,r.comment,
	round(m.mark,3) as mark
from assessment a
	join category cat
	inner join criterion cr on cat.category = cr.category
	inner join result r on r.criterion=cr.criterion
	inner join students s on cast(r.student as integer)=cast(s.studentid as integer)
	inner join mark m on cast(m.student as integer)=cast(s.studentid as integer)
order by studentid, cat_order,cr_order

--recorded by usercode
create view report as
select
	a.name as assessment, a.outof,
	s.studentid, s.name, s.usercode,
	cat.category, cat.sort_order as cat_order,
	cr.description as criterion, cr.max as max, cr.sort_order as cr_order,
	r.result,r.comment,
	round(m.mark,3) as mark
from assessment a
	join category cat
	inner join criterion cr on cat.category = cr.category
	inner join result r on r.criterion=cr.criterion
	inner join students s on r.student =s.usercode
	inner join mark m on r.student = m.student
order by studentid, cat_order,cr_order

CREATE TABLE assessment
  (
     name         VARCHAR PRIMARY KEY,
     bonus_weight DOUBLE NOT NULL,
     outof        DOUBLE NOT NULL
  );

CREATE TABLE category
  (
     category   VARCHAR PRIMARY KEY,
     sort_order SMALLINT
  );

CREATE TABLE submission
  (
     student VARCHAR PRIMARY KEY
  );

UNION ALL

SELECT DISTINCT student, 0
				FROM   result
         )

GROUP  BY student;

CREATE VIEW mark
AS
  SELECT weighted_mark.student,
         Round(Casewhen(mark + special <= (SELECT outof
                                           FROM   assessment), mark + special, (
               SELECT
               outof
               FROM
               assessment)), 5) AS MARK
  FROM   weighted_mark
         INNER JOIN weighted_special
                 ON weighted_mark.student = weighted_special.student;

CREATE TABLE PUBLIC.STUDENTS(
    STUDENTID VARCHAR primary key,
    NAME VARCHAR,
    USERCODE VARCHAR,
		email VARCHAR,
    SEND_FEEDBACK BOOLEAN
)

CREATE VIEW feedback
AS
  SELECT student,
         category.category,
         comment
  FROM   criterion
         INNER JOIN result
                 ON result.criterion = criterion.criterion
         INNER JOIN category
                 ON criterion.category = category.category
  WHERE  comment <> ''
  ORDER  BY category.sort_order,
            criterion.sort_order;

-- view for showing relative weightings as percentages of total mark
create view weighted_schedule as
select cat.category, criterion, description, weight, special, round(weight / total_weight * 100, 2) as relative_weight
from criterion crit, (select sum(weight) as total_weight from criterion where not special)
inner join category cat on crit.category = cat.category
order by cat.sort_order, crit.sort_order

create view weighted_categories as
select category,round(sum(relative_weight),1) as weight FROM WEIGHTED_SCHEDULE where not special group by category

--recorded by studentid
create view report as
select
	a.name as assessment, a.outof,
	s.studentid, s.name, s.usercode,
	cat.category, cat.sort_order as cat_order,
	cr.description as criterion, cr.max as max, cr.sort_order as cr_order,
	r.result,r.comment,
	round(m.mark,3) as mark
from assessment a
	join category cat
	inner join criterion cr on cat.category = cr.category
	inner join result r on r.criterion=cr.criterion
	inner join students s on cast(r.student as integer)=cast(s.studentid as integer)
	inner join mark m on cast(m.studentid as integer)=cast(s.studentid as integer)
order by studentid, cat_order,cr_order

Ignore Space Show notes View src/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.List; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.BoxLayout; import javax.swing.JButton; 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 String id; private Student student; private final JPanel schedulePane; private final ResultDAO result = new ResultDAO(); private final JLabel lblStudent; private final JLabel lblAssessment; private final SubmissionFrame parent; private final String assessment; public MarkingFrame(SubmissionFrame parent, String assessment) { this.parent = parent; // super(parent); // setModal(true); this.assessment = assessment; // add scroll pane to the root JScrollPane scrollPane = new JScrollPane(); JPanel contentPane = new JPanel(); JPanel titlePane = new JPanel(); 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); } public void addCategory(String category, List<Criterion> criteria) { schedulePane.add(new CategoryPanel(category, criteria)); } private void save() { if (!result.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) { result.save(id); parent.refresh(id); dispose(); } } else { result.save(id); parent.refresh(id); 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.id = id; String idType = MarkingProperties.idType(); student = idType.equals("id") ? new ResultDAO().findStudentById(new Integer(id)) : new ResultDAO().findStudentByUserCode(id); lblStudent.setText(student.getName()); lblAssessment.setText(assessment); result.load(id); } public void display() { this.setPreferredSize(new Dimension(600, 980)); this.pack(); this.setVisible(true); } public void createReport() { try { new FeedbackReportGenerator(new ResultDAO().getResult(id), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix()).generate(student); } catch (Exception ex) { Logger.getLogger(MarkingFrame.class.getName()).log(Level.SEVERE, null, ex); } } public void emailReport() { String report = MarkingProperties.reportPath() + "/" + MarkingProperties.attachmentFilePrefix() + "-" + student.getId() + ".pdf"; new SendReport().sendReport(student, report); } private void email() { save(); new Thread(new Runnable() { @Override public void run() { createReport(); emailReport(); } }).start(); } } 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.Window; 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.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 String id; private Student student; private final JPanel schedulePane; private final ResultDAO result = new ResultDAO(); private JLabel lblStudent; private JLabel lblAssessment; private String assessment; public MarkingFrame(Window parent, String assessment) { super(parent); setModal(true); this.assessment = assessment; // add scroll pane to the root JScrollPane scrollPane = new JScrollPane(); JPanel contentPane = new JPanel(); JPanel titlePane = new JPanel(); 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); } public void addCategory(String category, List<Criterion> criteria) { schedulePane.add(new CategoryPanel(category, criteria)); } private void save() { if (!result.isComplete()) { int res = JOptionPane.showConfirmDialog(MarkingFrame.this, "You haven't entered values for all criteria. Are you sure you want save?", "Incomplete", JOptionPane.YES_NO_OPTION); if (JOptionPane.YES_OPTION == res) { result.save(id); dispose(); } } else { result.save(id); 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.id = id; String idType = MarkingProperties.idType(); student = idType.equals("id") ? new ResultDAO().findStudentById(new Integer(id)) : new ResultDAO().findStudentByUserCode(id); lblStudent.setText(student.getName()); lblAssessment.setText(assessment); result.load(id); } public void display() { this.setPreferredSize(new Dimension(600, 980)); this.pack(); this.setVisible(true); } public void createReport() { try { new FeedbackReportGenerator(new ResultDAO().getResult(id), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix()).generate(student); } catch (Exception ex) { Logger.getLogger(MarkingFrame.class.getName()).log(Level.SEVERE, null, ex); } } public void emailReport() { String report = MarkingProperties.reportPath() + "/"+MarkingProperties.attachmentFilePrefix()+"-"+student.getId()+".pdf"; new SendReport().sendReport(student, report); } private void email() { save(); createReport(); emailReport(); } }

Ignore Space Show notes View

src/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.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.BoxLayout;
import javax.swing.JButton;
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 String id;
	private Student student;

private final JPanel schedulePane;
	private final ResultDAO result = new ResultDAO();

private final JLabel lblStudent;
	private final JLabel lblAssessment;
	private final SubmissionFrame parent;
	private final String assessment;

public MarkingFrame(SubmissionFrame parent, String assessment) {
		this.parent = parent;
//		super(parent);
//		setModal(true);

this.assessment = assessment;

// add scroll pane to the root
		JScrollPane scrollPane = new JScrollPane();
		JPanel contentPane = new JPanel();
		JPanel titlePane = new JPanel();

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

public void addCategory(String category, List<Criterion> criteria) {
		schedulePane.add(new CategoryPanel(category, criteria));
	}

private void save() {

if (!result.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) {
				result.save(id);
				parent.refresh(id);
				dispose();
			}
		} else {
			result.save(id);
			parent.refresh(id);
			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.id = id;

String idType = MarkingProperties.idType();
		student = idType.equals("id") ? new ResultDAO().findStudentById(new Integer(id)) : new ResultDAO().findStudentByUserCode(id);

lblStudent.setText(student.getName());
		lblAssessment.setText(assessment);
		result.load(id);
	}

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

public void createReport() {
		try {
			new FeedbackReportGenerator(new ResultDAO().getResult(id), MarkingProperties.reportPath(), MarkingProperties.attachmentFilePrefix()).generate(student);
		} catch (Exception ex) {
			Logger.getLogger(MarkingFrame.class.getName()).log(Level.SEVERE, null, ex);
		}
	}

public void emailReport() {

String report = MarkingProperties.reportPath() + "/" + MarkingProperties.attachmentFilePrefix() + "-" + student.getId() + ".pdf";

new SendReport().sendReport(student, report);
	}

private void email() {
		save();

new Thread(new Runnable() {
			@Override
			public void run() {
				createReport();
				emailReport();
			}
		}).start();

}

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.Window;
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.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 String id;
	private Student student;

private final JPanel schedulePane;
	private final ResultDAO result = new ResultDAO();

private JLabel lblStudent;
	private JLabel lblAssessment;
	private String assessment;

public MarkingFrame(Window parent, String assessment) {
		super(parent);
		setModal(true);