[gee-svn] SF.net SVN: gabel: [178] trunk/gee/war
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [178] trunk/gee/war
|
From: <al...@us...> - 2006-05-17 23:11:08
|
Revision: 178 Author: alllee Date: 2006-05-17 16:10:56 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=178&view=rev Log Message: ----------- converted consent.jsp to freemarker, improving validation and overall webwork usage. Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java trunk/gee/war/WEB-INF/classes/xwork.xml trunk/gee/war/consent.jsp trunk/gee/war/css/gee.css trunk/gee/war/includes/header.jsp trunk/gee/war/index.jsp trunk/gee/war/template.jsp Added Paths: ----------- trunk/gee/war/images/gee.png Modified: trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java 2006-05-17 23:10:56 UTC (rev 178) @@ -27,6 +27,7 @@ // are longs overkill? private Long id = Long.valueOf(-1); + private String studyNumber; private String description; private String deception; private String confidentiality; Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml 2006-05-17 23:10:56 UTC (rev 178) @@ -4,43 +4,10 @@ vim:sts=2:sw=2: --> <validators> - <field name="participantName"> - <field-validator type="requiredstring"> - <message>Please enter a name.</message> + <field name="participant"> + <field-validator type="visitor"> + <message/> </field-validator> </field> - <field name="participantAge"> - <field-validator type="int"> - <param name="min">18</param> - <message>You must be 18 or older.</message> - </field-validator> - </field> - - <!-- other sample validators. - <field name="bar2"> - <field-validator type="regex"> - <param name="regex">[0-9],[0-9]</param> - <message>The value of bar2 must be in the format "x, y", where x and y are between 0 and 9</message> - </field-validator> - </field> - <field name="date"> - <field-validator type="date"> - <param name="min">12/22/2002</param> - <param name="max">12/25/2002</param> - <message>The date must be between 12-22-2002 and 12-25-2002.</message> - </field-validator> - </field> - <field name="foo"> - <field-validator type="int"> - <param name="min">0</param> - <param name="max">100</param> - <message key="foo.range">Could not find foo.range!</message> - </field-validator> - </field> - <validator type="expression"> - <param name="expression"<foo < bar</param> - <message>Foo must be greater than Bar. Foo = ${foo}, Bar = ${bar}.</message> - </validator> - --> </validators> Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java 2006-05-17 23:10:56 UTC (rev 178) @@ -2,6 +2,7 @@ import edu.indiana.psych.gee.ConsentForm; import edu.indiana.psych.gee.Experiment; +import edu.indiana.psych.gee.bean.Participant; /** * $Id$ @@ -14,14 +15,16 @@ public class StartExperiment extends GeeAction { private String experimentName; - - private int participantAge; - private String participantName; + private Participant participant; private ConsentForm consentForm; - private String message; public String prepare() { - return SUCCESS; + consentForm = getExperiment().getConsentForm(); + if (consentForm == null) { + // no consent form available for this experiment.. just start? + getLogger().warn("No consent form available for this experiment: " + getExperiment()); + } + return INPUT; } public String start() { @@ -34,18 +37,11 @@ } } - public String getMessage() { - return message; - } - public Experiment getExperiment() { return getExperimentService().find(experimentName); } public ConsentForm getConsentForm() { - if (consentForm == null) { - consentForm = getExperiment().getConsentForm(); - } return consentForm; } @@ -57,20 +53,12 @@ this.experimentName = experimentName; } - public void setParticipantAge(int participantAge) { - this.participantAge = participantAge; + public Participant getParticipant() { + return participant; } - public int getParticipantAge() { - return participantAge; + public void setParticipant(Participant participant) { + this.participant = participant; } - public void setParticipantName(String participantName) { - this.participantName = participantName; - } - - public String getParticipantName() { - return participantName; - } - } Modified: trunk/gee/war/WEB-INF/classes/xwork.xml =================================================================== --- trunk/gee/war/WEB-INF/classes/xwork.xml 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/war/WEB-INF/classes/xwork.xml 2006-05-17 23:10:56 UTC (rev 178) @@ -37,17 +37,17 @@ <default-interceptor-ref name="geeDefaultStack"/> <!-- the start page lists all available experiments --> <action name="index" class="edu.indiana.psych.gee.action.ListExperiments"> - <result name="success" type="freemarker">index.jsp</result> + <result type="freemarker">index.jsp</result> </action> <action name="start" class="edu.indiana.psych.gee.action.StartExperiment" method="start"> - <result name="success" type="freemarker">startExperiment.jsp</result> - <result name="input">consent.jsp</result> + <result type="freemarker">startExperiment.jsp</result> + <result name="input" type="freemarker">consent.jsp</result> </action> <action name="consent" class="edu.indiana.psych.gee.action.StartExperiment" method="prepare"> <!-- FIXME: do not use a validating stack here --> <interceptor-ref name="basicStack"/> - <result name="success">consent.jsp</result> - <result name="input">consent.jsp</result> + <result type="freemarker">consent.jsp</result> + <result name="input" type="freemarker">consent.jsp</result> </action> </package> <include file="gee-ajax.xml"/> Modified: trunk/gee/war/consent.jsp =================================================================== --- trunk/gee/war/consent.jsp 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/war/consent.jsp 2006-05-17 23:10:56 UTC (rev 178) @@ -1,23 +1,18 @@ -<%@ taglib prefix="ww" uri="webwork" %> <head> -<title> Consent Form for [ <ww:property value="experimentName"/> ]</title> - <% - String commitDate = "$Date$"; - java.util.StringTokenizer toke = new java.util.StringTokenizer(commitDate, " "); - toke.nextToken(); - String lastModifiedDate = toke.nextToken(); - %> -<meta name="lastModifiedDate" content="<%= commitDate %>"/> +<title> Consent Form for ${experimentName}</title> +<#assign commitDate="$Date$"> +<#assign lastModified=commitDate?word_list[1]> +<meta name="lastModifiedDate" content="${commitDate}"/> </head> <TABLE BGCOLOR="#A4B5C5" CELLPADDING="4" CELLSPACING="0" WIDTH="100%" BORDER="0"> <TR> <TD WIDTH="100%"> - <H3><ww:property value="experimentName"/> consent form</H3> + <H3>${experimentName} consent form</H3> </TD> <TD ALIGN="right" VALIGN="top" BGCOLOR="#A4B5C5" WIDTH="70%" style="white-space: nowrap;"> <b>Study #04-9064</b><br/> - <small>Last Modified: <%= lastModifiedDate %></small> + <small>Last Modified: ${lastModified}</small> </TD> </TR> </TABLE> @@ -25,8 +20,7 @@ <TABLE CELLPADDING="4" CELLSPACING="2" BORDER="0"> <TR> <TD> - - <B>Forager</B><BR> + <B>${experimentName} consent form</B><BR> <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> </TABLE> @@ -131,24 +125,23 @@ <p style="font-weight: bolder; background-color: #FFE303;">I have read and understand the information presented above. I agree to participate in this study.</p> -<ww:form method="post" validate="true" action='start'> - <ww:select label="Age" name="participantAge" required="true" - list="#{'17':'Under 18', '18':'18-24', '25':'25-36', '37':'37-55', '55':'Over 55'}" - value="'18'"/> - <ww:textfield label="Name" name="participantName" required="true" /> - <ww:hidden name="experimentName"/> - <ww:submit/> -</ww:form> +<@ww.form method="post" action='start' validate='true'> + <@ww.select label="Age" name="participant.age" required="true" + list=["Under 18", "18-24", "25-36", "37-55", "Over 55"]/> + <@ww.textfield label="Name" name="participant.name" required="true" /> + <@ww.hidden name="experimentName"/> + <@ww.submit/> +</@ww.form> <hr /> <small> IRB Approved <br/> -<ww:text name="approval.date"> - <ww:param name="value" value="%{consentForm.irbDateApproved}"/> -</ww:text> +<@ww.text name="approval.date"> + <@ww.param name="value" value="%{consentForm.irbDateApproved}"/> +</@ww.text> <br/> -<ww:text name="approval.expiration.date"> - <ww:param name="value" value="%{consentForm.irbDateApprovalExpires}"/> -</ww:text> +<@ww.text name="approval.expiration.date"> + <@ww.param name="value" value="%{consentForm.irbDateApprovalExpires}"/> +</@ww.text> </small> Modified: trunk/gee/war/css/gee.css =================================================================== --- trunk/gee/war/css/gee.css 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/war/css/gee.css 2006-05-17 23:10:56 UTC (rev 178) @@ -5,6 +5,12 @@ font-family: helvetica, arial, sans-serif; } +.frame { margin: 5px 20px 5px 20px; font-size: 90%; } +.frame .content { margin: 0px; } + +.note { border: solid 1px #7099C5; background-color: #f0f0ff; } +.note .label { background-color: #7099C5; color: #ffffff; } + #Error { color: #802A2A; font-weight: bold; Added: trunk/gee/war/images/gee.png =================================================================== (Binary files differ) Property changes on: trunk/gee/war/images/gee.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/gee/war/includes/header.jsp =================================================================== --- trunk/gee/war/includes/header.jsp 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/war/includes/header.jsp 2006-05-17 23:10:56 UTC (rev 178) @@ -1 +1,23 @@ +<%@ taglib prefix="ww" uri="webwork" %> +<head> +<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> +</script> +<script type="text/javascript"> +_uacct = "UA-321755-2"; +urchinTracker(); +</script> +</head> +<TABLE BGCOLOR="#A4B5C5" CELLPADDING="4" CELLSPACING="0" WIDTH="100%" BORDER="0"> + <TR> + <TD><img src='images/gee.png'/><b>Group Experiments Environment</b></td> + </TR> +</TABLE> +<div class="frame note"> +<div class="label">Note</div> +<div class="content"> +This web application is still under development and may not function properly. +Please visit <a href='http://groups.psych.indiana.edu'>http://groups.psych.indiana.edu</a> to +try our experiments. Thanks! +</div> +</div> Modified: trunk/gee/war/index.jsp =================================================================== --- trunk/gee/war/index.jsp 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/war/index.jsp 2006-05-17 23:10:56 UTC (rev 178) @@ -2,16 +2,6 @@ <meta name="lastModifiedDate" content="$Date$"/> </head> -<TABLE BGCOLOR="#A4B5C5" CELLPADDING="4" CELLSPACING="0" WIDTH="100%" BORDER="0"> - <TR> - <TD WIDTH="100%"> - <H3>Group Experiments Environment</H3> - </TD> - <td> </td> - </TR><TR> - <td colspan="2"> </td> - </TR> -</TABLE> <I><center>Welcome to the Group Experiments Environment (GEE) project!</center></I> <hr/> <P> Modified: trunk/gee/war/template.jsp =================================================================== --- trunk/gee/war/template.jsp 2006-05-17 22:29:35 UTC (rev 177) +++ trunk/gee/war/template.jsp 2006-05-17 23:10:56 UTC (rev 178) @@ -11,8 +11,8 @@ <decorator:head /> </head> <body> + <div id="Content"> <%@ include file="/includes/header.jsp" %> - <div id="Content"> <decorator:body /> <%@ include file="/includes/footer.jsp" %> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
