Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <jc...@us...> - 2007-03-27 23:23:43
|
Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7993/web/five/drilldown Modified Files: drilldown.xhtml weightDD.xhtml Log Message: Fix data entry including dates and better layout in "drilldown" page, the summary page. Most of the changes are related to weight but this is really a template for observations in general. Index: drilldown.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/drilldown/drilldown.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** drilldown.xhtml 12 Mar 2007 08:46:38 -0000 1.2 --- drilldown.xhtml 27 Mar 2007 23:23:42 -0000 1.3 *************** *** 17,28 **** <ui:param name="act" value="#{trim.trim.act}"/> </ui:include> - <div class="help" id="#{menu.elementLabel}help3" style="display:none"> - <h1>Finalize</h1> - <p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. - The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will - mark this document as complete, actionable, and immutable.</p> - <p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact - that only you could have submitted the form.</p> - </div> </ui:composition> --- 17,20 ---- Index: weightDD.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/drilldown/weightDD.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** weightDD.xhtml 24 Mar 2007 15:27:25 -0000 1.3 --- weightDD.xhtml 27 Mar 2007 23:23:42 -0000 1.4 *************** *** 12,22 **** <body> <ui:composition> ! <div class="pagesm"> ! #{act.title.ST.value}<br/> ! Date of Observation: #{act.effectiveTime.TS[0]} <br/> ! Value: #{act.observation.value.PQS[0].value} #{act.observation.value.PQS[0].unit} <br/> ! Device: <br/> ! Clothing: <br/> ! </div> </ui:composition> </body> --- 12,28 ---- <body> <ui:composition> ! <h:outputText value="#{act.title.ST.value}"/><br/> ! <h:panelGrid columns="2" > ! <h:outputText value="Time of Observation: "/> ! <h:outputText value="#{act.effectiveTime.TS[0]}"> ! <f:converter converterId="TSDateConverter"/> ! </h:outputText> ! <h:outputText value="Value: "/> ! <h:outputText value="#{act.observation.value.PQS[0].value} #{act.observation.value.PQS[0].unit}"/> ! <h:outputText value="Device: "/> ! <h:outputText value="n/a"/> ! <h:outputText value="Clothing: "/> ! <h:outputText value="n/a"/> ! </h:panelGrid> </ui:composition> </body> |
|
From: John C. <jc...@us...> - 2007-03-27 23:23:43
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/rim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7993/src/org/tolven/web/rim Added Files: TSDateConverter.java Log Message: Fix data entry including dates and better layout in "drilldown" page, the summary page. Most of the changes are related to weight but this is really a template for observations in general. --- NEW FILE: TSDateConverter.java --- package org.tolven.web.rim; import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import org.tolven.trim.util.TrimFactory; public class TSDateConverter implements Converter { TrimFactory tf = new TrimFactory(); /** * Given a String containing a date string, return an HL7 TS datatype string * (non-Javadoc) * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String) */ public Object getAsObject(FacesContext ctx, UIComponent comp, String value) throws ConverterException { // System.out.println( "[getAsObject] Raw String: " + value); javax.faces.convert.DateTimeConverter dtc = new javax.faces.convert.DateTimeConverter(); Date date = (Date) dtc.getAsObject(ctx, comp, value); // System.out.println( "[getAsObject] Date: " + date); try { return tf.toTS(date); } catch (ParseException e) { // System.out.println( "[getAsObject] Exception: " + e.getMessage()); throw new ConverterException( "Nested Exception", e); } } /** * Given an HL7 TS datatype string (yyymmddhhmmss...) return a string containing date suitable for browsers */ public String getAsString(FacesContext ctx, UIComponent comp, Object value) throws ConverterException { try { // System.out.println( "[getAsString] Raw HL7: " + value); Date date = tf.toDate( (String) value); // System.out.println( "[getAsString] Date: " + date); javax.faces.convert.DateTimeConverter dtc = new javax.faces.convert.DateTimeConverter(); dtc.setTimeStyle("full"); dtc.setDateStyle("full"); return dtc.getAsString(ctx, comp, date); } catch (ParseException e) { // System.out.println( "[getAsString] Exception: " + e.getMessage()); throw new ConverterException( "Nested Exception", e); } } } |
|
From: John C. <jc...@us...> - 2007-03-27 23:23:43
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7993/src/org/tolven/web Modified Files: TRIMAction.java Log Message: Fix data entry including dates and better layout in "drilldown" page, the summary page. Most of the changes are related to weight but this is really a template for observations in general. Index: TRIMAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TRIMAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TRIMAction.java 20 Mar 2007 09:13:43 -0000 1.3 --- TRIMAction.java 27 Mar 2007 23:23:42 -0000 1.4 *************** *** 4,8 **** import javax.naming.NamingException; - import javax.xml.bind.JAXBException; import org.tolven.app.entity.MenuData; --- 4,7 ---- *************** *** 10,14 **** import org.tolven.doc.entity.DocXML; import org.tolven.trim.Trim; - import org.tolven.trim.util.TRIMException; public class TRIMAction extends MenuAction { --- 9,12 ---- *************** *** 29,33 **** if (md==null) return null; if (md.getDocumentId()==0) return null; ! System.out.println( "[getAct] MD.id=" + md.getId()); DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { --- 27,31 ---- if (md==null) return null; if (md.getDocumentId()==0) return null; ! // System.out.println( "[getAct] MD.id=" + md.getId()); DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { *************** *** 60,64 **** } if (!(doc instanceof DocXML)) { - System.out.println( ); throw new RuntimeException( "Document is not XML " + doc.getId() + " Class: " + doc.getClass().getName()); } --- 58,61 ---- |
|
From: John C. <jc...@us...> - 2007-03-27 23:23:43
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7993/web/wizard Modified Files: weight.xhtml datetime.xhtml wizTemplate.xhtml Log Message: Fix data entry including dates and better layout in "drilldown" page, the summary page. Most of the changes are related to weight but this is really a template for observations in general. Index: datetime.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/datetime.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** datetime.xhtml 24 Mar 2007 15:27:25 -0000 1.3 --- datetime.xhtml 27 Mar 2007 23:23:42 -0000 1.4 *************** *** 12,23 **** <body> <ui:composition> ! <h:inputText id="#{menu.elementLabel}gcsT" value="#{ts}" size="30"/><br/> ! <a href="javascript:addHours('#{menu.elementLabel}gcsT',-1);">-1h</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-10);">-10m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-1);">-1m</a> ! <a href="javascript:setNow('#{menu.elementLabel}gcsT');">now</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 1);">+1m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 10);">+10m</a> ! <a href="javascript:addHours('#{menu.elementLabel}gcsT', 1);">+1h</a> </ui:composition> </body> --- 12,28 ---- <body> <ui:composition> ! <input id="#{menu.elementLabel}form:#{id}vis" name="#{menu.elementLabel}form:#{id}vis" readonly="true" type="text" value="0" size="60"/><br/> ! <a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',-60);">-1h</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',-10);">-10m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}',-1);">-1m</a> ! <a href="javascript:setNow('#{menu.elementLabel}form:#{id}');">now</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}', 1);">+1m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}', 10);">+10m</a> ! <a href="javascript:addMinutes('#{menu.elementLabel}form:#{id}', 60);">+1h</a> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! showTime( "#{menu.elementLabel}form:#{id}" ); ! // ]]> ! </script> </ui:composition> </body> Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wizTemplate.xhtml 24 Mar 2007 15:27:25 -0000 1.9 --- wizTemplate.xhtml 27 Mar 2007 23:23:42 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- $('#{menu.elementLabel}form').setAttribute( 'tolvenid', '#{menu.element}' ); // $('#{menu.elementLabel}form').setAttribute( 'submitButton', '#{menu.elementLabel}submitButton' ); + wizUpload( '#{menu.elementLabel}form', null ); new Form.Observer( '#{menu.elementLabel}form', 1, wizUpload ); // alert( "Observer setup for: " + $('#{menu.elementLabel}form').getAttribute( 'tolvenid' ) ); Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/weight.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** weight.xhtml 24 Mar 2007 15:27:25 -0000 1.3 --- weight.xhtml 27 Mar 2007 23:23:42 -0000 1.4 *************** *** 20,24 **** [Tolven Page: #{trim.trim.page}] </div> ! <div class="help" id="#{menu.elementLabel}help1" style="display:none"> <h1>getting Started</h1> <p>Help provides additional information about each page</p> --- 20,24 ---- [Tolven Page: #{trim.trim.page}] </div> ! <div class="help" > <h1>getting Started</h1> <p>Help provides additional information about each page</p> *************** *** 30,41 **** <div class="step" title="Enter #{menu.menuDataItem.string01}" > <div class="pagesm"> - Test: #{menu.menuDataItem.string01} <br/> Date of observation: <br/> <ui:include src="/wizard/datetime.xhtml"> ! <ui:param name="ts" value="#{trim.trim.act.effectiveTime.TS[0]}"/> ! </ui:include><br/> ! #{menu.menuDataItem.string01} <h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/> </div> ! <div class="help" id="#{menu.elementLabel}help2" style="display:none"> <h1>Weight</h1> <p>Holding your breath doesn't help much.</p> --- 30,43 ---- <div class="step" title="Enter #{menu.menuDataItem.string01}" > <div class="pagesm"> Date of observation: <br/> <ui:include src="/wizard/datetime.xhtml"> ! <ui:param name="ts" value="#{trim.trim.act.effectiveTime}"/> ! <ui:param name="id" value="effective"/> ! </ui:include><br/><br/> ! #{menu.menuDataItem.string01} <br/> ! <h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/> ! <h:inputHidden id="effective" value="#{trim.trim.act.effectiveTime.TS[0]}"/> </div> ! <div class="help"> <h1>Weight</h1> <p>Holding your breath doesn't help much.</p> *************** *** 43,55 **** </div> <div class="step" title="Finalize" > ! <div id="#{menu.element}:drilldown"> ! Waiting for server... </div> </div> </c:if> <c:if test="#{menu.menuDataItem.status!='NEW'}"> ! <ui:include src="/five/drilldown/weightDD.xhtml"> ! <ui:param name="act" value="#{trim.trim.act}"/> ! </ui:include> </c:if> </ui:composition> --- 45,75 ---- </div> <div class="step" title="Finalize" > ! <div class="pagesm"> ! <div id="#{menu.element}:drilldown"> ! Waiting for server... ! </div> ! </div> ! <div class="help" > ! <h1>Finalize</h1> ! <p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. ! The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will ! mark this document as complete, actionable, and immutable.</p> ! <p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact ! that only you could have submitted the form.</p> </div> </div> </c:if> <c:if test="#{menu.menuDataItem.status!='NEW'}"> ! <div class="step" title="Complete" > ! <div class="pagesm"> ! <ui:include src="/five/drilldown/weightDD.xhtml"> ! <ui:param name="act" value="#{trim.trim.act}"/> ! </ui:include> ! </div> ! <div class="help"> ! <h1>Weight</h1> ! <p>I hope that this is OK because it's too late to change now.</p> ! </div> ! </div> </c:if> </ui:composition> |
|
From: John C. <jc...@us...> - 2007-03-27 23:23:43
|
Update of /cvsroot/tolven/tolvenWEB/web/styles In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7993/web/styles Modified Files: echr.css Log Message: Fix data entry including dates and better layout in "drilldown" page, the summary page. Most of the changes are related to weight but this is really a template for observations in general. Index: echr.css =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/styles/echr.css,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** echr.css 16 Feb 2007 04:19:11 -0000 1.6 --- echr.css 27 Mar 2007 23:23:42 -0000 1.7 *************** *** 293,296 **** --- 293,357 ---- } + .bar3:before { + content: "."; + display:block; + clear:both; + height: 0px; + visibility:hidden + } + + .bar3 { + COLOR: #333333; + BACKGROUND: #ffffff; + FONT-FAMILY: 'Lucide Grande', Verdana, Arial, sans-serif; + DISPLAY: block; + MARGIN: 0px 0px 0px 5px; + WIDTH: auto; + padding: 0px; + height: 33px; + } + .bar3 ul { + MARGIN: 0px; + PADDING: 0px; + } + + .bar3 li { + DISPLAY: block; + FLOAT: left; + padding: 0px; + } + + .bar3 li a { + PADDING-RIGHT: 0.75em; + DISPLAY: block; + PADDING-LEFT: 0.75em; + PADDING-BOTTOM: 8px; + MARGIN: 0px; + COLOR: #333333; + PADDING-TOP: 8px; + TEXT-DECORATION: none; + } + + .bar3 li a img { + border: 0px; + PADDING-RIGHT: 0px; + PADDING-LEFT: 0px; + PADDING-BOTTOM: 0px; + MARGIN: 0px; + PADDING-TOP: 0px; + width: 12px; + height: 12px; + } + + .bar3 li.active a:hover { + BACKGROUND: url(../images/bkgd_nav2_active.gif) no-repeat center bottom; COLOR: #191919 + } + .bar3 li a:hover { + PADDING-RIGHT: 0.75em; DISPLAY: block; PADDING-LEFT: 0.75em; BACKGROUND: #cccccc; PADDING-BOTTOM: 8px; MARGIN: 0px; COLOR: #4D4D4D; PADDING-TOP: 8px; TEXT-DECORATION: none + } + .bar3 li.active a { + BACKGROUND: url(../images/bkgd_nav2_active.gif) no-repeat center bottom; COLOR: #333333 + } + .wip { COLOR: #000000; |
|
From: John C. <jc...@us...> - 2007-03-27 23:23:35
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/rim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7980/src/org/tolven/web/rim Log Message: Directory /cvsroot/tolven/tolvenWEB/src/org/tolven/web/rim added to the repository |
|
From: John C. <jc...@us...> - 2007-03-27 23:21:41
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7182/web/five Modified Files: patients.xhtml Log Message: Show count of patients on patient list Index: patients.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/patients.xhtml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** patients.xhtml 26 Mar 2007 04:20:43 -0000 1.17 --- patients.xhtml 27 Mar 2007 23:21:40 -0000 1.18 *************** *** 34,39 **** {prefetchBuffer: true, tableClass: 'dataGrid', ! largeBufferSize: 4.0, ! nearLimitFactor: 0.7, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', --- 34,39 ---- {prefetchBuffer: true, tableClass: 'dataGrid', ! largeBufferSize: 5.0, ! nearLimitFactor: 0.4, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', |
|
From: John C. <jc...@us...> - 2007-03-27 22:15:43
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10934/web/WEB-INF Modified Files: faces-config.xml Log Message: Navigation updates applied. Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** faces-config.xml 24 Mar 2007 15:27:27 -0000 1.42 --- faces-config.xml 27 Mar 2007 22:15:42 -0000 1.43 *************** *** 127,131 **** </navigation-case> </navigation-rule> ! <navigation-rule> <description> --- 127,131 ---- </navigation-case> </navigation-rule> ! <navigation-rule> <description> *************** *** 137,151 **** <from-outcome>success</from-outcome> <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> ! <redirect/> ! </navigation-case> <navigation-case> <from-action>#{reg.addDemoUser}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{gen.createCHRPatients}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> </navigation-case> <navigation-case> --- 137,150 ---- <from-outcome>success</from-outcome> <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> ! </navigation-case> <navigation-case> <from-action>#{reg.addDemoUser}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{gen.createCHRPatients}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> </navigation-case> <navigation-case> *************** *** 158,164 **** <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> ! </navigation-case> </navigation-rule> ! <navigation-rule> <description> --- 157,163 ---- <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> ! </navigation-case> </navigation-rule> ! <navigation-rule> <description> *************** *** 179,183 **** <from-view-id>/manage/editUserProfile.xhtml</from-view-id> <navigation-case> ! <from-action>#{reg.updatePrefs}</from-action> <from-outcome>success</from-outcome> <to-view-id>/manage/editUserProfile.xhtml</to-view-id> --- 178,182 ---- <from-view-id>/manage/editUserProfile.xhtml</from-view-id> <navigation-case> ! <from-action>#{reg.sendTestMessage}</from-action> <from-outcome>success</from-outcome> <to-view-id>/manage/editUserProfile.xhtml</to-view-id> *************** *** 185,189 **** </navigation-case> <navigation-case> ! <from-action>#{reg.sendTestMessage}</from-action> <from-outcome>success</from-outcome> <to-view-id>/manage/editUserProfile.xhtml</to-view-id> --- 184,188 ---- </navigation-case> <navigation-case> ! <from-action>#{reg.updatePrefs}</from-action> <from-outcome>success</from-outcome> <to-view-id>/manage/editUserProfile.xhtml</to-view-id> *************** *** 193,204 **** <from-action>#{reg.updateAccount}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> </navigation-case> ! <navigation-case> <from-outcome>dispatch</from-outcome> <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> ! </navigation-case> </navigation-rule> --- 192,207 ---- <from-action>#{reg.updateAccount}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editUserProfile.xhtml</to-view-id> <redirect/> </navigation-case> ! <navigation-case> ! <from-outcome>error</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> ! </navigation-case> ! <navigation-case> <from-outcome>dispatch</from-outcome> <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> ! </navigation-case> </navigation-rule> |
|
From: John C. <jc...@us...> - 2007-03-26 04:20:44
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv903/web/five Modified Files: patients.xhtml Log Message: Don't show patient count on ePHR Index: patients.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/patients.xhtml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** patients.xhtml 26 Mar 2007 04:08:12 -0000 1.16 --- patients.xhtml 26 Mar 2007 04:20:43 -0000 1.17 *************** *** 36,40 **** largeBufferSize: 4.0, nearLimitFactor: 0.7, - onscroll: patientScroll, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', --- 36,39 ---- *************** *** 82,86 **** </table> </div> ! <br/>#{menu.menuDataCount} Patients<br/> <h:form id="patGen" onsubmit="return ajaxSubmit2(this);" rendered="false"> <h:outputText value="-"/> --- 81,87 ---- </table> </div> ! <c:if test="#{top.accountUser.account.accountType.knownType=='echr'}"> ! <br/>#{menu.menuDataCount} Patients<br/> ! </c:if> <h:form id="patGen" onsubmit="return ajaxSubmit2(this);" rendered="false"> <h:outputText value="-"/> |
|
From: John C. <jc...@us...> - 2007-03-26 04:08:18
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28304/web/five Modified Files: patients.xhtml Log Message: Show the number of patients on the patient list. Index: patients.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/patients.xhtml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** patients.xhtml 3 Feb 2007 19:04:48 -0000 1.15 --- patients.xhtml 26 Mar 2007 04:08:12 -0000 1.16 *************** *** 15,18 **** --- 15,19 ---- // <![CDATA[ prevPatFilterValue = ''; + function patientFilterChange(element, vax) { if (prevPatFilterValue==vax) return; *************** *** 35,38 **** --- 36,40 ---- largeBufferSize: 4.0, nearLimitFactor: 0.7, + onscroll: patientScroll, requestParameters: [{name: 'element', value: visiblePage}], loadingClass: 'dataGridLoading', *************** *** 80,83 **** --- 82,86 ---- </table> </div> + <br/>#{menu.menuDataCount} Patients<br/> <h:form id="patGen" onsubmit="return ajaxSubmit2(this);" rendered="false"> <h:outputText value="-"/> |
|
From: Joseph I. <jos...@us...> - 2007-03-26 04:04:19
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9781/jboss-config Modified Files: Tag: E_JI_MDBKeys invitation-queue-service.xml gen-queue-service.xml rule-queue-service.xml Log Message: Use the default SecurityConfig for queues Index: gen-queue-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/gen-queue-service.xml,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** gen-queue-service.xml 8 Mar 2007 04:18:49 -0000 1.2 --- gen-queue-service.xml 26 Mar 2007 03:23:41 -0000 1.2.4.1 *************** *** 8,16 **** xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <attribute name="SecurityConfig"> - <security> - <role name="guest" read="true" write="true"/> - </security> - </attribute> </mbean> </server> --- 8,11 ---- Index: invitation-queue-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/invitation-queue-service.xml,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** invitation-queue-service.xml 8 Mar 2007 04:18:49 -0000 1.2 --- invitation-queue-service.xml 26 Mar 2007 03:23:41 -0000 1.2.4.1 *************** *** 8,16 **** xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <attribute name="SecurityConfig"> - <security> - <role name="guest" read="true" write="true"/> - </security> - </attribute> </mbean> </server> --- 8,11 ---- Index: rule-queue-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/rule-queue-service.xml,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** rule-queue-service.xml 8 Mar 2007 04:18:49 -0000 1.2 --- rule-queue-service.xml 26 Mar 2007 03:23:41 -0000 1.2.4.1 *************** *** 8,16 **** xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <attribute name="SecurityConfig"> - <security> - <role name="guest" read="true" write="true"/> - </security> - </attribute> </mbean> </server> --- 8,11 ---- |
|
From: Joseph I. <jos...@us...> - 2007-03-26 04:04:19
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10220/src/org/tolven/security/auth Modified Files: Tag: E_JI_MDBKeys KeyLoginModule.java Log Message: When Roles don't exist, the new group for Roles needs to be added to the Subject as a Principal called Roles Index: KeyLoginModule.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/auth/KeyLoginModule.java,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** KeyLoginModule.java 20 Mar 2007 09:13:07 -0000 1.9 --- KeyLoginModule.java 26 Mar 2007 03:24:56 -0000 1.9.2.1 *************** *** 120,125 **** group = null; } ! if (group == null) group = new TolvenGroup("Roles"); // TODO: Currently we do not distinguish by role. When roles are supported in LDAP this code can be removed boolean allRolesExists = false; --- 120,127 ---- group = null; } ! if (group == null) { group = new TolvenGroup("Roles"); + subject.getPrincipals().add(group); + } // TODO: Currently we do not distinguish by role. When roles are supported in LDAP this code can be removed boolean allRolesExists = false; |
|
From: John C. <jc...@us...> - 2007-03-26 02:20:34
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15739/src/org/tolven/gen/model Modified Files: GenMedical.java Log Message: Fix typo - Dob should be Dod for date of death (as limit for repeating scenarios) Index: GenMedical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/GenMedical.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GenMedical.java 28 Feb 2007 06:58:17 -0000 1.4 --- GenMedical.java 26 Mar 2007 02:20:30 -0000 1.5 *************** *** 184,191 **** return dob; } public Date getDateOfDeath( ){ Date dod = null; if (vp!=null) { ! dod = vp.getDob(); } else if (mdPatient!=null) { // We'll have to guess at dod --- 184,192 ---- return dob; } + public Date getDateOfDeath( ){ Date dod = null; if (vp!=null) { ! dod = vp.getDod(); } else if (mdPatient!=null) { // We'll have to guess at dod |
|
From: John C. <jc...@us...> - 2007-03-25 13:52:25
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2588/src/org/tolven/web Modified Files: TopAction.java RegisterAction.java Log Message: User and Account preferences cleanup Index: TopAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** TopAction.java 20 Mar 2007 09:13:43 -0000 1.46 --- TopAction.java 25 Mar 2007 13:52:24 -0000 1.47 *************** *** 44,48 **** private String startPage; private long invitationId; - private String timeZone; private TolvenPerson tp; --- 44,47 ---- *************** *** 103,111 **** public AccountUser getAccountUser() { AccountUser accountUser = (AccountUser) getRequestAttribute("accountUser"); - // if (accountUser==null) { - // accountUser = activation.findAccountUser(getAccountUserId() ); - // HttpServletRequest request = (HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest(); - // request.setAttribute("accountUser", accountUser); - // } return accountUser; } --- 102,105 ---- *************** *** 249,253 **** /** ! * Get the default timezone for this user, the first non-null value is select: * <ol> * <li>The user's timezone if not null</li> --- 243,247 ---- /** ! * Get the default timezone for this user, the first non-null value is selected: * <ol> * <li>The user's timezone if not null</li> *************** *** 261,264 **** --- 255,259 ---- public String getTimeZone() throws IOException { if (null!=getAccountUser()) return getAccountUser().getTimeZone(); + String timeZone = null; TolvenUser user = activation.findTolvenUser(getSessionTolvenUserId()); if (timeZone==null && user!=null) timeZone = user.getTimeZone(); *************** *** 268,275 **** } - public void setTimeZone(String timeZone) { - this.timeZone = timeZone; - } - public String getAccountTimeZone() { if(getAccountUser() == null) { --- 263,266 ---- *************** *** 277,282 **** --- 268,304 ---- } else { return getAccountUser().getAccount().getTimeZone(); + } + } + + /** + * Get the default locale for this user, the first non-null value is selected: + * <ol> + * <li>The user's locale if not null</li> + * <li>The account's locale if not null</li> + * <li>From tolven.properties: tolven.locale</li> + * <li>From Java Locale.getDefault()</li> + * </ol> + * @return + * @throws IOException + */ + public String getLocale() throws IOException { + String locale = null; + if (getAccountUser()!=null) { + locale = getAccountUser().getUser().getLocale(); + if (locale==null) locale = getAccountUser().getAccount().getLocale(); + } + if (locale==null) locale = System.getProperty("tolven.locale"); + if (locale==null) locale = java.util.Locale.getDefault().toString(); + return locale; } + + public String getAccountLocale() { + if(getAccountUser() == null) { + return null; + } else { + return getAccountUser().getAccount().getLocale(); + } } + public String getAccountType() { if(getAccountUser() == null) { *************** *** 284,288 **** } else { return getAccountUser().getAccount().getAccountType().getKnownType(); ! } } --- 306,310 ---- } else { return getAccountUser().getAccount().getAccountType().getKnownType(); ! } } Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** RegisterAction.java 24 Mar 2007 15:27:27 -0000 1.48 --- RegisterAction.java 25 Mar 2007 13:52:24 -0000 1.49 *************** *** 89,92 **** --- 89,93 ---- private String accountTitle; private String accountTimeZone; + private String accountLocale; private String newAccountTitle; *************** *** 203,211 **** account.setTitle(getAccountTitle()); account.setTimeZone(getAccountTimeZone()); accountBean.updateAccount(account); // getTop().setAccountTitle(getAccountTitle()); // getTop().setAccountTimeZone(getAccount().getTimeZone()); - // Reset the timezone - getTop().setTimeZone(null); return "success"; } --- 204,211 ---- account.setTitle(getAccountTitle()); account.setTimeZone(getAccountTimeZone()); + account.setLocale(getAccountLocale()); accountBean.updateAccount(account); // getTop().setAccountTitle(getAccountTitle()); // getTop().setAccountTimeZone(getAccount().getTimeZone()); return "success"; } *************** *** 401,406 **** // And update the user object now, too if (user!=null) activation.updateUser( user ); - // Reset the timezone - getTop().setTimeZone(null); // Reset tolven person (so it picks up the new LDAP changes) getTop().setTp(null); --- 401,404 ---- *************** *** 648,651 **** --- 646,658 ---- } + public void setAccountLocale(String accountLocale) { + this.accountLocale = accountLocale; + } + + public String getAccountLocale() { + if (accountLocale==null) accountLocale = getAccount().getLocale(); + return accountLocale; + } + public void setAccountTitle(String accountTitle) { this.accountTitle = accountTitle; *************** *** 746,750 **** //Add "default" as en_US at the top of the list //The leading space is used so that it doesn't get messed up in the sorting. ! localesList.add(new SelectItem("en_US", " Use Default")); for (Locale userLocale : list) { String localeDesc; --- 753,757 ---- //Add "default" as en_US at the top of the list //The leading space is used so that it doesn't get messed up in the sorting. ! localesList.add(new SelectItem(null, " Use Default")); for (Locale userLocale : list) { String localeDesc; |
|
From: John C. <jc...@us...> - 2007-03-25 13:52:25
|
Update of /cvsroot/tolven/tolvenWEB/web/manage In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2588/web/manage Modified Files: editUserProfile.xhtml editAccountProfile.xhtml userPrefs.xhtml Removed Files: addSponsor.xhtml Log Message: User and Account preferences cleanup --- addSponsor.xhtml DELETED --- Index: userPrefs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/userPrefs.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** userPrefs.xhtml 24 Mar 2007 16:36:20 -0000 1.2 --- userPrefs.xhtml 25 Mar 2007 13:52:24 -0000 1.3 *************** *** 24,35 **** <h:outputText id="aTitle" value="#{reg.accountTitle}" /> ! <h:outputLabel for="aTZ" value="Account Timezone" /> <h:outputText value=":" /> ! <h:outputText id="aTZ" value="#{reg.accountTimeZone}" /> <h:outputLabel value="Account Locale" /> <h:outputText value=":" /> ! <h:outputText value="" rendered="#{locale!=null}" /> ! <h:outputText value="None selected (Using Default: en_US)" rendered="#{locale==null}" /> </h:panelGrid> --- 24,36 ---- <h:outputText id="aTitle" value="#{reg.accountTitle}" /> ! <h:outputLabel value="Account Timezone" /> <h:outputText value=":" /> ! <h:outputText value="#{reg.accountTimeZone}" rendered="#{reg.accountTimeZone!=null}"/> ! <h:outputText value="None selected (Using Default: #{top.timeZone})" rendered="#{reg.accountTimeZone==null}"/> <h:outputLabel value="Account Locale" /> <h:outputText value=":" /> ! <h:outputText value="#{reg.accountLocale}" rendered="#{reg.accountLocale!=null}" /> ! <h:outputText value="None selected (Using Default: #{top.locale})" rendered="#{reg.accountLocale==null}" /> </h:panelGrid> *************** *** 45,63 **** <h:outputText id="uTitle" value="#{reg.user.ldapUID}" /> ! <h:outputLabel for="uTZ" value="User Timezone" /> <h:outputText value=":" /> ! <h:outputText id="uTZ" value="#{top.timeZone}" /> <h:outputLabel value="User Locale" /> <h:outputText value=":" /> <h:outputText value="#{reg.user.locale}" rendered="#{reg.user.locale!=null}" /> ! <h:outputText value="None selected (Using Default: en_US)" rendered="#{reg.user.locale==null}" /> <h:outputLabel value="eMail Format" /> <h:outputText value=":" /> ! <h:selectOneRadio value="#{reg.user.emailFormat}" disabled="true"> ! <f:selectItem itemLabel="HTML" itemValue="html" /> ! <f:selectItem itemLabel="Text" itemValue="text" /> ! </h:selectOneRadio> </h:panelGrid> --- 46,63 ---- <h:outputText id="uTitle" value="#{reg.user.ldapUID}" /> ! <h:outputLabel value="User Timezone" /> <h:outputText value=":" /> ! <h:outputText value="#{reg.user.timeZone}" rendered="#{reg.user.timeZone!=null}"/> ! <h:outputText value="None selected (Using Default: #{top.timeZone})" rendered="#{reg.user.timeZone==null}" /> <h:outputLabel value="User Locale" /> <h:outputText value=":" /> <h:outputText value="#{reg.user.locale}" rendered="#{reg.user.locale!=null}" /> ! <h:outputText value="None selected (Using default: #{top.locale})" rendered="#{reg.user.locale==null}" /> <h:outputLabel value="eMail Format" /> <h:outputText value=":" /> ! <h:outputText value="#{reg.user.emailFormat}" rendered="#{reg.user.emailFormat!=null}" /> ! <h:outputText value="None selected (Using Default: Text)" rendered="#{reg.user.emailFormat==null}" /> </h:panelGrid> Index: editUserProfile.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editUserProfile.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editUserProfile.xhtml 24 Mar 2007 16:36:20 -0000 1.2 --- editUserProfile.xhtml 25 Mar 2007 13:52:24 -0000 1.3 *************** *** 43,46 **** --- 43,51 ---- <h:commandButton action="#{reg.sendTestMessage}" value="Send Test eMail"/> </h:panelGroup> + <h:outputLabel value="eMail Format" /> + <h:selectOneRadio value="#{reg.user.emailFormat}" > + <f:selectItem itemLabel="HTML" itemValue="html" /> + <f:selectItem itemLabel="Text" itemValue="text" /> + </h:selectOneRadio> <h:outputText value="User Timezone"/> <h:selectOneMenu value="#{reg.user.timeZone}" > *************** *** 76,84 **** <h:message for="userPassword2" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> - <h:outputLabel value="eMail Format" /> - <h:selectOneRadio value="#{reg.user.emailFormat}" > - <f:selectItem itemLabel="HTML" itemValue="html" /> - <f:selectItem itemLabel="Text" itemValue="text" /> - </h:selectOneRadio> </h:panelGrid> --- 81,84 ---- Index: editAccountProfile.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editAccountProfile.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editAccountProfile.xhtml 24 Mar 2007 16:36:20 -0000 1.2 --- editAccountProfile.xhtml 25 Mar 2007 13:52:24 -0000 1.3 *************** *** 25,29 **** </h:selectOneMenu> <h:outputLabel value="Account Locale" /> ! <h:selectOneMenu> <f:selectItems value="#{reg.localesList}" /> </h:selectOneMenu> --- 25,29 ---- </h:selectOneMenu> <h:outputLabel value="Account Locale" /> ! <h:selectOneMenu value="#{reg.accountLocale}" > <f:selectItems value="#{reg.localesList}" /> </h:selectOneMenu> |
|
From: John C. <jc...@us...> - 2007-03-25 04:21:11
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1504/src/org/tolven/doc/bean Modified Files: Evaluator.java Log Message: Set rollback only if message throws an exception - DB failures already set rollback only but non-DB failures didn't. Index: Evaluator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Evaluator.java 20 Mar 2007 09:13:07 -0000 1.11 --- Evaluator.java 25 Mar 2007 04:21:10 -0000 1.12 *************** *** 19,24 **** --- 19,26 ---- import javax.annotation.EJB; + import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; + import javax.ejb.MessageDrivenContext; import javax.jms.Message; import javax.jms.MessageListener; *************** *** 73,76 **** --- 75,81 ---- @EJB private XMLLocal xmlBean; @EJB private DocProtectionLocal docProtectionBean; + + @Resource MessageDrivenContext ctx; + private static final String CCRns = "urn:astm-org:CCR"; private static final String TRIMns = "urn:astm-org:trim:4.0"; *************** *** 83,86 **** --- 88,92 ---- msgId = msg.getJMSMessageID(); TolvenMessage tm = (TolvenMessage) ((ObjectMessage)msg).getObject(); + System.out.println("MsgID: " + msg.getJMSMessageID() + " Principal: " + ctx.getCallerPrincipal().getName()); // System.out.println( tm.getPayload()); if (CCRns.equals(tm.getXmlNS())) { *************** *** 99,102 **** --- 105,109 ---- // System.out.println( docCCR.getPatientActor().getPerson().getName().getCurrentName().getFamilyString()); } catch (Exception e) { + ctx.setRollbackOnly(); System.out.println( "Message " + msgId + " failed with error: " + e.getMessage()); e.printStackTrace(); |
|
From: John C. <jc...@us...> - 2007-03-25 04:21:11
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1504/src/org/tolven/gen/bean Modified Files: GenDriver.java Log Message: Set rollback only if message throws an exception - DB failures already set rollback only but non-DB failures didn't. Index: GenDriver.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenDriver.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GenDriver.java 21 Mar 2007 21:01:41 -0000 1.6 --- GenDriver.java 25 Mar 2007 04:21:10 -0000 1.7 *************** *** 21,24 **** --- 21,25 ---- import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; + import javax.ejb.MessageDrivenContext; import javax.jms.ConnectionFactory; import javax.jms.JMSException; *************** *** 71,74 **** --- 72,77 ---- @EJB private FamilyGeneratorLocal familyGen; + + @Resource MessageDrivenContext ctx; // private JAXBContext jc = null; *************** *** 91,95 **** if (((ObjectMessage)msg).getObject() instanceof GenControlCHRAccount ) { GenControlCHRAccount control = (GenControlCHRAccount) ((ObjectMessage)msg).getObject(); ! System.out.println("MsgID: " + msg.getJMSMessageID() + " "+ control); int count = 0; Queuer q = new Queuer(); --- 94,98 ---- if (((ObjectMessage)msg).getObject() instanceof GenControlCHRAccount ) { GenControlCHRAccount control = (GenControlCHRAccount) ((ObjectMessage)msg).getObject(); ! System.out.println("MsgID: " + msg.getJMSMessageID() + " "+ control + " Principal:" + ctx.getCallerPrincipal().getName()); int count = 0; Queuer q = new Queuer(); *************** *** 164,169 **** --- 167,174 ---- } } catch (JMSException e) { + ctx.setRollbackOnly(); e.printStackTrace(); } catch (Exception e) { + ctx.setRollbackOnly(); // TODO Auto-generated catch block e.printStackTrace(); |
|
From: Joseph I. <jos...@us...> - 2007-03-25 02:19:55
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18024/jboss-config Added Files: Tag: E_JI_MDBKeys destinations-service.xml Log Message: Removed the unused queues and topics from destinations-service.xml --- NEW FILE: destinations-service.xml --- <?xml version="1.0" encoding="UTF-8"?> <!-- Messaging Destinations deployment descriptor. $Id$ --> <server> <!-- The Dead Letter Queue. This destination is a dependency of an EJB MDB container. --> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=DLQ" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> </mbean> <!-- Example destinations. --> <!-- <mbean code="org.jboss.jms.server.destination.Topic" name="jboss.messaging.destination:service=Topic,name=testTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <attribute name="SecurityConfig"> <security> <role name="guest" read="true" write="true"/> <role name="publisher" read="true" write="true" create="false"/> <role name="durpublisher" read="true" write="true" create="true"/> </security> </attribute> </mbean> <mbean code="org.jboss.jms.server.destination.Topic" name="jboss.messaging.destination:service=Topic,name=securedTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <attribute name="SecurityConfig"> <security> <role name="publisher" read="true" write="true" create="false"/> </security> </attribute> </mbean> <mbean code="org.jboss.jms.server.destination.Topic" name="jboss.messaging.destination:service=Topic,name=testDurableTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <attribute name="SecurityConfig"> <security> <role name="guest" read="true" write="true"/> <role name="publisher" read="true" write="true" create="false"/> <role name="durpublisher" read="true" write="true" create="true"/> </security> </attribute> </mbean> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=testQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <attribute name="SecurityConfig"> <security> <role name="guest" read="true" write="true"/> <role name="publisher" read="true" write="true" create="false"/> <role name="noacc" read="false" write="false" create="false"/> </security> </attribute> </mbean> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=A" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> </mbean> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=B" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> </mbean> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=C" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> </mbean> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=D" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> </mbean> <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=ex" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> </mbean> <mbean code="org.jboss.jms.server.destination.Topic" name="jboss.messaging.destination:service=Queue,name=openTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <attribute name="SecurityConfig"> <security> <role name="guest" read="true" write="true" create="true"/> </security> </attribute> </mbean> --> </server> |
|
From: Joseph I. <jos...@us...> - 2007-03-25 02:19:55
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18024 Modified Files: Tag: E_JI_MDBKeys build.xml Log Message: Removed the unused queues and topics from destinations-service.xml Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.77 retrieving revision 1.77.2.1 diff -C2 -d -r1.77 -r1.77.2.1 *** build.xml 20 Mar 2007 09:13:56 -0000 1.77 --- build.xml 25 Mar 2007 02:19:55 -0000 1.77.2.1 *************** *** 42,46 **** <copy file="${tolven.home}/tolven/jboss-config/tomcat-root-index.jsp" tofile="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jbossweb-tomcat55.sar/ROOT.war/index.jsp" overwrite="true" preservelastmodified="true" /> <copy file="${tolven.home}/tolven/jboss-config/tomcat-root-web.xml" tofile="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF/web.xml" overwrite="true" preservelastmodified="true" /> ! <copy toDir="${deploy.location}/deploy/jmx-console.war/WEB-INF" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.home}/tolven/jboss-config/jmx-console"> <include name="web.xml"/> --- 42,47 ---- <copy file="${tolven.home}/tolven/jboss-config/tomcat-root-index.jsp" tofile="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jbossweb-tomcat55.sar/ROOT.war/index.jsp" overwrite="true" preservelastmodified="true" /> <copy file="${tolven.home}/tolven/jboss-config/tomcat-root-web.xml" tofile="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF/web.xml" overwrite="true" preservelastmodified="true" /> ! <copy file="${tolven.home}/tolven/jboss-config/destinations-service.xml" todir="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" /> ! <copy toDir="${deploy.location}/deploy/jmx-console.war/WEB-INF" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.home}/tolven/jboss-config/jmx-console"> <include name="web.xml"/> |
|
From: John C. <jc...@us...> - 2007-03-24 16:37:13
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1115/src/org/tolven/core/entity Modified Files: TolvenUser.java Account.java Log Message: Add eMailformat preference to TolvenUser Index: Account.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/Account.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Account.java 20 Jan 2007 19:23:17 -0000 1.17 --- Account.java 24 Mar 2007 16:37:08 -0000 1.18 *************** *** 60,64 **** @Column( name="USER_LOCALE", length=10) private String locale; ! @ManyToOne(fetch = FetchType.LAZY) private Account parent; --- 60,67 ---- @Column( name="USER_LOCALE", length=10) private String locale; ! ! @Column( name="EMAIL_FORMAT", length=10) ! private String emailFormat; ! @ManyToOne(fetch = FetchType.LAZY) private Account parent; *************** *** 216,219 **** --- 219,228 ---- return accountPublicKey != null; } + public String getEmailFormat() { + return emailFormat; + } + public void setEmailFormat(String emailFormat) { + this.emailFormat = emailFormat; + } Index: TolvenUser.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/TolvenUser.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TolvenUser.java 20 Jan 2007 08:10:19 -0000 1.16 --- TolvenUser.java 24 Mar 2007 16:37:08 -0000 1.17 *************** *** 82,85 **** --- 82,88 ---- private String locale; + @Column( name="EMAIL_FORMAT", length=10) + private String emailFormat; + @Column( name="DEMO_USER" ) private boolean demoUser; *************** *** 253,256 **** --- 256,267 ---- setPublicKey(publicKey); } + + public String getEmailFormat() { + return emailFormat; + } + + public void setEmailFormat(String emailFormat) { + this.emailFormat = emailFormat; + } } |
|
From: John C. <jc...@us...> - 2007-03-24 16:36:23
|
Update of /cvsroot/tolven/tolvenWEB/web/manage In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv727/web/manage Modified Files: editAccountProfile.xhtml userPrefs.xhtml editUserProfile.xhtml Log Message: 1. Return to application/cancel must have immediate=true attribute 2. Add emailFormat preference to TolvenUser. Index: userPrefs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/userPrefs.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** userPrefs.xhtml 24 Mar 2007 15:27:26 -0000 1.1 --- userPrefs.xhtml 24 Mar 2007 16:36:20 -0000 1.2 *************** *** 54,61 **** <h:outputText value="None selected (Using Default: en_US)" rendered="#{reg.user.locale==null}" /> </h:panelGrid> <h:commandLink value="Edit User Profile" action="editUser" /> </fieldset> ! <h:commandLink value="Return to Application" action="dispatch" /> </h:form> --- 54,68 ---- <h:outputText value="None selected (Using Default: en_US)" rendered="#{reg.user.locale==null}" /> + <h:outputLabel value="eMail Format" /> + <h:outputText value=":" /> + <h:selectOneRadio value="#{reg.user.emailFormat}" disabled="true"> + <f:selectItem itemLabel="HTML" itemValue="html" /> + <f:selectItem itemLabel="Text" itemValue="text" /> + </h:selectOneRadio> + </h:panelGrid> <h:commandLink value="Edit User Profile" action="editUser" /> </fieldset> ! <h:commandLink value="Return to Application" action="dispatch" immediate="true"/> </h:form> Index: editUserProfile.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editUserProfile.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editUserProfile.xhtml 24 Mar 2007 15:27:26 -0000 1.1 --- editUserProfile.xhtml 24 Mar 2007 16:36:20 -0000 1.2 *************** *** 76,83 **** <h:message for="userPassword2" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> </h:panelGrid> <h:commandButton action="#{reg.updatePrefs}" value="Update User Preferences"/> ! <h:commandLink value="Return to Application" action="dispatch" /> </h:form> --- 76,88 ---- <h:message for="userPassword2" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> + <h:outputLabel value="eMail Format" /> + <h:selectOneRadio value="#{reg.user.emailFormat}" > + <f:selectItem itemLabel="HTML" itemValue="html" /> + <f:selectItem itemLabel="Text" itemValue="text" /> + </h:selectOneRadio> </h:panelGrid> <h:commandButton action="#{reg.updatePrefs}" value="Update User Preferences"/> ! <h:commandLink value="Return to Application" action="dispatch" immediate="true"/> </h:form> Index: editAccountProfile.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editAccountProfile.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editAccountProfile.xhtml 24 Mar 2007 15:27:26 -0000 1.1 --- editAccountProfile.xhtml 24 Mar 2007 16:36:20 -0000 1.2 *************** *** 30,34 **** <h:commandButton action="#{reg.updateAccount}" value="Update Account" /> ! <h:commandLink value="Return to Application" action="dispatch" /> </h:panelGrid> </h:form> --- 30,34 ---- <h:commandButton action="#{reg.updateAccount}" value="Update Account" /> ! <h:commandLink value="Return to Application" action="dispatch" immediate="true"/> </h:panelGrid> </h:form> *************** *** 96,100 **** <h:inputSecret id="dummy" value="" size="0" style="display: none" /> </h:panelGrid> ! <h:commandLink value="Return to Application" action="dispatch" /> <h:messages for="accountAdmin:uid" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> --- 96,100 ---- <h:inputSecret id="dummy" value="" size="0" style="display: none" /> </h:panelGrid> ! <h:commandLink value="Return to Application" action="dispatch" immediate="true"/> <h:messages for="accountAdmin:uid" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> *************** *** 154,158 **** </h:outputLink> <h:outputText value=" | | " /> ! <h:commandLink value="Return to Application" action="dispatch" /> <h:messages for="acctAdmin:sponsorTitle" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> --- 154,158 ---- </h:outputLink> <h:outputText value=" | | " /> ! <h:commandLink value="Return to Application" action="dispatch" immediate="true"/> <h:messages for="acctAdmin:sponsorTitle" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:57
|
Update of /cvsroot/tolven/tolvenWEB/web/vestibule In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/vestibule Modified Files: selectAccount.xhtml password.xhtml createAccount.xhtml loggedOut.xhtml Log Message: Revised Account and User preferences pages Index: password.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/vestibule/password.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** password.xhtml 2 Mar 2007 00:11:48 -0000 1.7 --- password.xhtml 24 Mar 2007 15:27:25 -0000 1.8 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Password Verification</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Password Verification</title> *************** *** 31,34 **** --- 31,36 ---- <h:panelGroup> <h:inputSecret id="password" value="#{reg.oldUserPassword}" size="50"/> + <!-- Dummy field to enable form submittal by pressing Enter --> + <h:inputSecret id="dummy" value="" size="0" style="display: none" /> <h:message for="password"/> </h:panelGroup> Index: createAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/vestibule/createAccount.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** createAccount.xhtml 6 Feb 2007 05:02:35 -0000 1.1 --- createAccount.xhtml 24 Mar 2007 15:27:25 -0000 1.2 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: loggedOut.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/vestibule/loggedOut.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** loggedOut.xhtml 6 Feb 2007 05:02:35 -0000 1.1 --- loggedOut.xhtml 24 Mar 2007 15:27:25 -0000 1.2 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Logged out of Tolven</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Logged out of Tolven</title> Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/vestibule/selectAccount.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** selectAccount.xhtml 28 Feb 2007 07:07:47 -0000 1.3 --- selectAccount.xhtml 24 Mar 2007 15:27:25 -0000 1.4 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:35
|
Update of /cvsroot/tolven/tolvenWEB/web/public In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/public Modified Files: register.xhtml newDemoUser.xhtml Log Message: Revised Account and User preferences pages Index: register.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/public/register.xhtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** register.xhtml 31 Oct 2006 03:20:47 -0000 1.8 --- register.xhtml 24 Mar 2007 15:27:27 -0000 1.9 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Register new Tolven User</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Register new Tolven User</title> Index: newDemoUser.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/public/newDemoUser.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newDemoUser.xhtml 19 Oct 2006 01:50:14 -0000 1.4 --- newDemoUser.xhtml 24 Mar 2007 15:27:27 -0000 1.5 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Register new Tolven User</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Register new Tolven User</title> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:35
|
Update of /cvsroot/tolven/tolvenWEB/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web Modified Files: error.jsp loggedOut.xhtml Log Message: Revised Account and User preferences pages Index: loggedOut.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/loggedOut.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** loggedOut.xhtml 31 Jul 2006 02:09:27 -0000 1.2 --- loggedOut.xhtml 24 Mar 2007 15:27:27 -0000 1.3 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Logged out of Tolven</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Logged out of Tolven</title> Index: error.jsp =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/error.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** error.jsp 6 Mar 2007 17:00:55 -0000 1.1 --- error.jsp 24 Mar 2007 15:27:27 -0000 1.2 *************** *** 1,10 **** ! <?xml version="1.0" encoding="ISO-8859-1" ?> ! <%@ page language="java" contentType="text/html; charset=ISO-8859-1" ! pageEncoding="ISO-8859-1"%> <%@ page isErrorPage="true"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <title>Insert title here</title> </head> --- 1,10 ---- ! <?xml version="1.0" encoding="UTF-8" ?> ! <%@ page language="java" contentType="text/html; charset=UTF-8" ! pageEncoding="UTF-8"%> <%@ page isErrorPage="true"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>Insert title here</title> </head> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:35
|
Update of /cvsroot/tolven/tolvenWEB/web/manage In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/manage Modified Files: addSponsor.xhtml Added Files: editAccountProfile.xhtml deleteUser.xhtml userAccess.xhtml sponsoredUsers.xhtml userPrefs.xhtml adminAccess.xhtml editUserProfile.xhtml Removed Files: editProfile.xhtml controlAccess.xhtml adminAccount.xhtml Log Message: Revised Account and User preferences pages --- NEW FILE: deleteUser.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>My Home (Testing)</title> <meta http-equiv="pragma" content="no-cache"/> <meta http-equiv="cache-control" content="no-cache"/> <meta http-equiv="expires" content="0"/> </head> <body> <ui:composition template="/templates/baseTemplate.xhtml"> <ui:param name="pageTitle" value="Delete Tolven User"/> <ui:define name="bannerad"> </ui:define> <ui:define name="contextArea"> </ui:define> <ui:define name="pageBrand"> </ui:define> <ui:define name="body"> <p>Clicking the delete button below will delete your login credentials and log you out of Tolven for the last time. Other users with access to the same accounts you have access to will not be affected. If this is not what you intend to do, click Cancel to return to your home page. You may create a new login account but won't be able to access the same account information unless another user on that same account offers to share that information with you.</p> <h:form> <h:commandButton action="#{top.deleteUser}" value="Delete User"/> <h:commandButton action="cancel" value="Cancel" immediate="true"/> </h:form> </ui:define> </ui:composition> </body> </html> --- controlAccess.xhtml DELETED --- --- NEW FILE: sponsoredUsers.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>User Preferences</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="skin" value="echr"/> <ui:define name="content"> <h3>List of users sponsored by Account #{reg.account.id} #{reg.account.title}</h3> <h:dataTable value="#{reg.sponsoredUsers}" var="su" styleClass="activity"> <h:column> <f:facet name="header"> <h:outputText value="Reference Code"/> </f:facet> <h:outputText value="#{su.referenceCode}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="UID"/> </f:facet> <h:outputText value="#{su.uid}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Created"/> </f:facet> <h:outputText value="#{su.created}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Last Login"/> </f:facet> <h:outputText value="#{su.lastLogin}"/> </h:column> </h:dataTable> <h:form> <h:commandButton action="close" value="Close"/> </h:form> </ui:define> </ui:composition> </body> </html> --- editProfile.xhtml DELETED --- --- NEW FILE: userPrefs.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>User Preferences</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="skin" value="echr"/> <ui:define name="content"> <h3>Account #{reg.account.id} #{reg.account.title}</h3> <br/><br/> <h:form id="accountAdmin"> <fieldset> <legend>Account </legend> <h:panelGrid columns="3" cellpadding="5" rendered="#{top.accountUserId!=0}"> <h:outputLabel for="aTitle" value="Account Title" /> <h:outputText value=":" /> <h:outputText id="aTitle" value="#{reg.accountTitle}" /> <h:outputLabel for="aTZ" value="Account Timezone" /> <h:outputText value=":" /> <h:outputText id="aTZ" value="#{reg.accountTimeZone}" /> <h:outputLabel value="Account Locale" /> <h:outputText value=":" /> <h:outputText value="" rendered="#{locale!=null}" /> <h:outputText value="None selected (Using Default: en_US)" rendered="#{locale==null}" /> </h:panelGrid> <h:commandLink value="Edit Account Profile" action="editAccount" rendered="#{top.accountAdmin}"/> </fieldset> <fieldset> <legend>User </legend> <h:outputText value="This is a demo user" rendered="#{reg.user.demoUser}"/> <h:panelGrid columns="3" cellpadding="5" > <h:outputLabel for="uTitle" value="User Name" /> <h:outputText value=":" /> <h:outputText id="uTitle" value="#{reg.user.ldapUID}" /> <h:outputLabel for="uTZ" value="User Timezone" /> <h:outputText value=":" /> <h:outputText id="uTZ" value="#{top.timeZone}" /> <h:outputLabel value="User Locale" /> <h:outputText value=":" /> <h:outputText value="#{reg.user.locale}" rendered="#{reg.user.locale!=null}" /> <h:outputText value="None selected (Using Default: en_US)" rendered="#{reg.user.locale==null}" /> </h:panelGrid> <h:commandLink value="Edit User Profile" action="editUser" /> </fieldset> <h:commandLink value="Return to Application" action="dispatch" /> </h:form> </ui:define> </ui:composition> </body> </html> --- NEW FILE: adminAccess.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>User Preferences</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Script-Type" content="text/javascript" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="skin" value="echr"/> <ui:define name="content"> <script language="JavaScript" type="text/javascript"> // <![CDATA[ var checkedIndex; var totalCheckboxes; function getCheckboxStatus() { var dLForm = document.forms['defaultLogin']; var cb = new Array(50); var cbIndex = 0; checkedIndex = null; totalCheckboxes = 0; //Identify checkboxes in the form and form an array of boolean values of checkboxes for (var i = 0; i < dLForm.length; i++) { if(dLForm.elements[i].type == 'checkbox') { cb[cbIndex] = dLForm.elements[i].checked; cbIndex++; } } totalCheckboxes = cbIndex; //Identify the particular checked box for (var j=0; j < totalCheckboxes; j++) { if (cb[j] == true) { checkedIndex = j; } } } function uncheckOthers() { //Uncheck all other boxes except the recently checked one var dLForm = document.forms['defaultLogin']; for (var k=0; k < totalCheckboxes; k++) { if (k != checkedIndex && dLForm.elements[k].checked == true) { dLForm.elements[checkedIndex].checked = false; checkedIndex = k; } } dLForm.elements[checkedIndex] = true; } // ]]> </script> <h3>All accounts you are a member of</h3> <h:form id="defaultLogin"> <h:dataTable value="#{reg.userAccounts}" var="au" onmouseover="javascript:getCheckboxStatus();" > <h:column> <f:facet name="header"> <h:outputText value="Account Id"/> </f:facet> <h:outputText value="#{au.account.id}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Account Type"/> </f:facet> <h:outputText value="#{au.account.accountType.knownType}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Title"/> </f:facet> <h:outputText value="#{au.account.title}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Default Login"/> </f:facet> <h:selectBooleanCheckbox id="defaultLogin" value="#{au.defaultAccount}" onclick="javascript:uncheckOthers();" /> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Permission"/> </f:facet> <h:outputText value="admin" rendered="#{au.accountPermission}"/> </h:column> </h:dataTable> <br/><br/> <h:outputText value="[Id: #{reg.user.id}]"/> <br/><br/> <h:commandLink action="#{reg.updateAccount}" value="Update Default Login" /> <h:outputText value=" | | " /> <h:outputLink value="deleteUser.jsf" rendered="#{top.properties['tolven.ldap.deleteUser']}"> <h:outputText value="Delete User" /> </h:outputLink> </h:form> </ui:define> </ui:composition> </body> </html> --- NEW FILE: editUserProfile.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>User Preferences</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="skin" value="echr"/> <ui:define name="content"> <h3>User Preferences for #{reg.tp.uid}</h3> <h:outputText value="Profile Picture:" /> <br /> <h:form id="userPrefs"> <h:panelGroup rendered="#{reg.user.likeness!=null}"> <img src="xxx.tdoc?docId=#{reg.user.likeness.id}&width=100&height=100"/> <br /> <h:outputLink value="#{facesContext.externalContext.request.contextPath}/private/prefPhotos.jsf"> <h:outputText value="Change Picture" /> </h:outputLink> </h:panelGroup> <br /> <h:panelGroup rendered="#{reg.user.likeness==null}"> <h:outputLink value="#{facesContext.externalContext.request.contextPath}/private/prefPhotos.jsf"> <h:outputText value="Add Picture" /> </h:outputLink> </h:panelGroup> </h:form> <h:form id="register"> <h:panelGrid columns="2"> <h:outputText value="Email Address/User ID"/> <h:panelGroup> <h:panelGroup> <h:inputText id="uid" value="#{reg.tp.uid}" size="50" readonly="true"/> <h:message for="uid" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> <h:commandButton action="#{reg.sendTestMessage}" value="Send Test eMail"/> </h:panelGroup> <h:outputText value="User Timezone"/> <h:selectOneMenu value="#{reg.user.timeZone}" > <f:selectItems value="#{reg.timeZones}"/> </h:selectOneMenu> <h:outputLabel value="User Locale" /> <h:selectOneMenu value="#{reg.user.locale}" > <f:selectItems value="#{reg.localesList}" /> </h:selectOneMenu> <h:outputText value="First Name"/> <h:panelGroup> <h:inputText id="givenName" value="#{reg.tp.givenName}" size="50" required="true"/> <h:message for="givenName" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> <h:outputText value="Last Name"/> <h:panelGroup> <h:inputText id="sn" value="#{reg.tp.sn}" size="50" required="true"/> <h:message for="sn" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> <h:outputText value="Old Password"/> <h:panelGroup> <h:inputSecret id="oldUserPassword" value="#{reg.oldUserPassword}" size="50"/> <h:message for="oldUserPassword" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> <h:outputText value="New Password"/> <h:panelGroup> <h:inputSecret id="userPassword" value="#{reg.tp.userPassword}" size="50"/> <h:message for="userPassword" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> <h:outputText value="Repeat New Password"/> <h:panelGroup> <h:inputSecret id="userPassword2" value="#{reg.repeatUserPassword}" size="50"/> <h:message for="userPassword2" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> </h:panelGrid> <h:commandButton action="#{reg.updatePrefs}" value="Update User Preferences"/> <h:commandLink value="Return to Application" action="dispatch" /> </h:form> <script language="JavaScript" type="text/javascript"> // <![CDATA[ var checkedIndex; var totalCheckboxes; function getCheckboxStatus() { var dLForm = document.forms['defaultLogin']; var cb = new Array(50); var cbIndex = 0; checkedIndex = null; totalCheckboxes = 0; //Identify checkboxes in the form and form an array of boolean values of checkboxes for (var i = 0; i < dLForm.length; i++) { if(dLForm.elements[i].type == 'checkbox') { cb[cbIndex] = dLForm.elements[i].checked; cbIndex++; } } totalCheckboxes = cbIndex; //Identify the particular checked box for (var j=0; j < totalCheckboxes; j++) { if (cb[j] == true) { checkedIndex = j; } } } function uncheckOthers() { //Uncheck all other boxes except the recently checked one var dLForm = document.forms['defaultLogin']; for (var k=0; k < totalCheckboxes; k++) { if (k != checkedIndex && dLForm.elements[k].checked == true) { dLForm.elements[checkedIndex].checked = false; checkedIndex = k; } } dLForm.elements[checkedIndex] = true; } // ]]> </script> <h3>All accounts you are a member of</h3> <h:form id="defaultLogin"> <h:dataTable value="#{reg.userAccounts}" var="au" onmouseover="javascript:getCheckboxStatus();" > <h:column> <f:facet name="header"> <h:outputText value="Account Id"/> </f:facet> <h:outputText value="#{au.account.id}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Account Type"/> </f:facet> <h:outputText value="#{au.account.accountType.knownType}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Title"/> </f:facet> <h:outputText value="#{au.account.title}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Default Login" /> </f:facet> <h:selectBooleanCheckbox id="defaultLogin" value="#{au.defaultAccount}" onclick="javascript:uncheckOthers();" itemLabel=""/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Permission"/> </f:facet> <h:outputText value="admin" rendered="#{au.accountPermission}"/> </h:column> </h:dataTable> <br/><br/> <h:outputText value="[Id: #{reg.user.id}]"/> <br/><br/> <h:commandLink action="#{reg.updateAccount}" value="Update Default Login" /> <h:outputText value=" | | " /> <h:outputLink value="deleteUser.jsf" rendered="#{top.properties['tolven.ldap.deleteUser']}"> <h:outputText value="Delete User" /> </h:outputLink> </h:form> </ui:define> </ui:composition> </body> </html> Index: addSponsor.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/manage/addSponsor.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** addSponsor.xhtml 22 Feb 2007 09:23:19 -0000 1.3 --- addSponsor.xhtml 24 Mar 2007 15:27:26 -0000 1.4 *************** *** 7,11 **** <head> <title>User Preferences</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>User Preferences</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> *************** *** 14,52 **** <ui:param name="skin" value="echr"/> <ui:define name="content"> - <h3>Account sponsorships</h3> - <h:form id="accountAdmin"> - <p>Create a sponsorship and hand out the id to allow people to register for an account. People using this reference code will not be added to this account. However, - we will keep track of all of the users that ultimately use this reference code.</p> - <h:dataTable value="#{reg.sponsorships}" var="sp" styleClass="activity"> - <h:column> - <f:facet name="header"> - <h:outputText value="Title"/> - </f:facet> - <h:outputText value="#{sp.title}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Reference Code"/> - </f:facet> - <h:outputText value="#{sp.referenceCode}" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="URL"/> - </f:facet> - <h:outputText value="http://#{top.properties['tolven.invitation.host']}:#{top.properties['tolven.invitation.port']}#{top.properties['tolven.invitation.root']}/public/register.jsf?referenceCode=#{sp.referenceCode}" /> - </h:column> - </h:dataTable> - <h:panelGrid columns="2" > - <h:inputText id="sponsorTitle" value="#{reg.sponsorshipTitle}" size="50"/> - <h:commandButton action="#{reg.addSponsorship}" value="Add Sponsorship"/> - </h:panelGrid> - <h:outputLink value="../private/sponsoredUsers.jsf"> - <h:outputText value="List of sponsored users"/> - </h:outputLink> - <h:outputText value=" | | " /> - <h:commandLink value="Return to Application" action="dispatch" /> - <h:messages for="acctAdmin:sponsorTitle" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> - </h:form> </ui:define> </ui:composition> --- 14,17 ---- --- adminAccount.xhtml DELETED --- --- NEW FILE: editAccountProfile.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>User Preferences</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="skin" value="echr"/> <ui:define name="content"> <h3>Account Preferences for #{reg.account.id} #{reg.account.title}</h3> <h:form id="adminPrefs" rendered="#{top.accountAdmin}"> <h:panelGrid columns="2"> <h:outputText value="Account Title"/> <h:inputText value="#{reg.accountTitle}" size="50" /> <h:outputText value="Account Timezone"/> <h:selectOneMenu value="#{reg.accountTimeZone}" > <f:selectItems value="#{reg.timeZones}"/> </h:selectOneMenu> <h:outputLabel value="Account Locale" /> <h:selectOneMenu> <f:selectItems value="#{reg.localesList}" /> </h:selectOneMenu> <h:commandButton action="#{reg.updateAccount}" value="Update Account" /> <h:commandLink value="Return to Application" action="dispatch" /> </h:panelGrid> </h:form> <h3>List of users allowed to login to this account</h3> <h:form id="userAccess" rendered="#{top.accountAdmin}"> <h:dataTable value="#{reg.accountUsers}" var="au" styleClass="activity"> <!--h:column> <f:facet name="header"> <h:outputText value="Id"/> </f:facet> <h:outputText value="#{au.user.id}"/> </h:column--> <h:column> <f:facet name="header"> <h:outputText value="User Id"/> </f:facet> <h:outputText value="#{au.user.ldapUID}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Status"/> </f:facet> <h:outputText value="#{au.status}" rendered="#{au.id==top.accountUserId}"/> <h:selectOneMenu value="#{au.status}" rendered="#{au.id!=top.accountUserId}"> <f:selectItem itemValue="active" itemLabel="active"/> <f:selectItem itemValue="inactive" itemLabel="inactive"/> </h:selectOneMenu> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Effective"/> </f:facet> <h:outputText value="#{au.effectiveDate}"> <f:convertDateTime dateStyle="medium" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Expiration"/> </f:facet> <h:outputText value="#{au.expirationDate}"> <f:convertDateTime dateStyle="medium" timeZone="#{top.timeZone}"/> </h:outputText> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Authority"/> </f:facet> <h:outputText value="tbd"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Administrator?"/> </f:facet> <h:outputText value="me" rendered="#{au.id==top.accountUserId}"/> <h:selectBooleanCheckbox value="#{au.accountPermission}" rendered="#{au.id!=top.accountUserId}"/> </h:column> </h:dataTable> <h:panelGrid columns="3" rendered="#{reg.user.demoUser and top.accountAdmin}"> <h:outputText value="Add existing demo user to this account"/> <h:inputText id="uid" value="#{reg.newDemoUser}" size="20"/> <h:commandButton action="#{reg.addDemoUser}" value="Add"/> <!-- Dummy field to enable form submittal by pressing Enter --> <h:inputSecret id="dummy" value="" size="0" style="display: none" /> </h:panelGrid> <h:commandLink value="Return to Application" action="dispatch" /> <h:messages for="accountAdmin:uid" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> <h:panelGroup rendered="#{reg.account.accountType.knownType=='echr' and top.accountAdmin}"> <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3> <p>Generate random patients and add them to this account. The generator runs in the background and will take several minutes to run. The generator creates a lot of data. But you'll notice that it doesn't create the exact number of patient specified: The generator automatically discards people that haven't been born yet and some but not all people that are deceased. Also, the fact that pregnancies result in zero, one or more live births makes the number hard to hit exactly. </p> <h:form id="patGen" > <h:panelGrid columns="2"> <h:outputText value="Number of Patients to generate (maximum=#{top.properties['tolven.gen.patient.max']})"/> <h:inputText id="count" value="#{gen.numberToGenerate}" size="4"> <f:validateLongRange minimum="1" maximum="#{top.properties['tolven.gen.patient.max']}"/> </h:inputText> <h:outputText value="Patients began arriving in which year"/> <h:inputText id="startYear" value="#{gen.generateHistoryFrom}" size="4"/> </h:panelGrid> <h:commandButton id="patGenAction" action="#{gen.createCHRPatients}" value="Generate Patients"/> </h:form> <h:messages errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> <h3>Account sponsorships</h3> <h:form id="sponsorships" rendered="#{top.accountAdmin}"> <p>Create a sponsorship and hand out the id to allow people to register for an account. People using this reference code will not be added to this account. However, we will keep track of all of the users that ultimately use this reference code.</p> <h:dataTable value="#{reg.sponsorships}" var="sp" styleClass="activity"> <h:column> <f:facet name="header"> <h:outputText value="Title"/> </f:facet> <h:outputText value="#{sp.title}"/> </h:column> <h:column> <f:facet name="header"> <h:outputText value="Reference Code"/> </f:facet> <h:outputText value="#{sp.referenceCode}" /> </h:column> <h:column> <f:facet name="header"> <h:outputText value="URL"/> </f:facet> <h:outputText value="http://#{top.properties['tolven.invitation.host']}:#{top.properties['tolven.invitation.port']}#{top.properties['tolven.invitation.root']}/public/register.jsf?referenceCode=#{sp.referenceCode}" /> </h:column> </h:dataTable> <h:panelGrid columns="2" > <h:inputText id="sponsorTitle" value="#{reg.sponsorshipTitle}" size="50"/> <h:commandButton action="#{reg.addSponsorship}" value="Add Sponsorship"/> </h:panelGrid> <h:outputLink value="../manage/sponsoredUsers.jsf"> <h:outputText value="List of sponsored users"/> </h:outputLink> <h:outputText value=" | | " /> <h:commandLink value="Return to Application" action="dispatch" /> <h:messages for="acctAdmin:sponsorTitle" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> </ui:define> </ui:composition> </body> </html> --- NEW FILE: userAccess.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>User Preferences</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="skin" value="echr"/> <ui:define name="content"> </ui:define> </ui:composition> </body> </html> |
3 messages has been excluded from this view by a project administrator.
